Merge branch 'bug-77989/StudVW_Datepicker_check_modeltype'

Method returns the current study semester and the previous semesters of the same type (SS/WS).

application/config/abgabe.php

@@ -29,7 +29,7 @@ $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'] = [9];
-$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
+$config['beurteilung_link_fallback'] = 'cis/private/lehre/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';
@@ -38,8 +38,19 @@ $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';
+// TODO: check if these links change if the file changes and how to better retrieve the link?
+$config['SIGNATUR_INFO_LINK_GERMAN'] = 'https://cis.technikum-wien.at/cms/dms.php?id=214779'; 
+$config['SIGNATUR_INFO_LINK_ENGLISH'] = 'https://cis.technikum-wien.at/cms/dms.php?id=264256';
 
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
 
 $config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;
+
+$config['MULTIEDIT_TABLE'] = true;
+
+$config['STUDENT_EDIT_PROJEKTARBEIT_TITLE'] = true;
+
+$config['CONFETTI_ON_ENDUPLOAD'] = true;
+
+

application/config/studierendenantrag.php

@@ -168,3 +168,32 @@ $config['stgkz_blacklist_wiederholung'] = [];
  * @var array           An array of noten ids
  */
 $config['note_blacklist_wiederholung'] = [];
+
+/**
+ *  Enable/disable the Abmeldung StG process
+ *
+ * @var bool
+ */
+$config['abmeldung_stg_enabled'] = true;
+
+/**
+ *  Enable/disable the Abmeldung process
+ *
+ * @var bool
+ */
+$config['abmeldung_enabled'] = true;
+
+/**
+ *  Enable/disable the Unterbrecher process
+ *
+ * @var bool
+ */
+$config['unterbrechung_enabled'] = true;
+
+/**
+ *  Enable/disable the Wiederholer process
+ *
+ * @var bool
+ */
+$config['wiederholung_enabled'] = true;
+

application/controllers/api/frontend/v1/LvPlan.php

@@ -418,6 +418,10 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
 	{
+		if ($uid && $uid !== getAuthUID()) {
+			return [];
+		}
+
 		$this->load->config('calendar');
 
 		$tz = new DateTimeZone($this->config->item('timezone'));

application/controllers/api/frontend/v1/Phrasen.php

@@ -32,6 +32,8 @@ class Phrasen extends FHCAPI_Controller
 			'setLanguage' => self::PERM_ANONYMOUS,
 			'getLanguage' => self::PERM_ANONYMOUS,
 			'getAllLanguages' => self::PERM_ANONYMOUS,
+			'getPhrases' => self::PERM_ANONYMOUS,
+			'getTabulatorPhrases' => self::PERM_ANONYMOUS,
 		]);
 
 		$this->load->helper('hlp_language');
@@ -92,4 +94,59 @@ class Phrasen extends FHCAPI_Controller
 		$this->terminateWithSuccess($langs);
 	}
 
+	public function getPhrases()
+	{
+		$postParams = $this->getPostJSON();
+
+		$languages = $postParams->languages;
+		if (!$languages || !count($languages)) {
+			$this->load->model('system/Sprache_model', 'sprachenModel');
+			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
+			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
+			$languages = array_map(
+				function ($languageData) {
+					return $languageData->sprache;
+				},
+				$activeLanguagesData
+			);
+		}
+
+		$this->load->model('system/Phrase_model', 'phraseModel');
+		$phrasesGroupedByCategory = $postParams->phrasesGroupedByCategory;
+		$result = [];
+		foreach ($languages as $language) {
+			$phrases = $this->phraseModel->getPhrasesByCategoryAndPhrasesAndLanguage($phrasesGroupedByCategory, $language);
+			$result[$language] = $this->getDataOrTerminateWithError($phrases);
+		}
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getTabulatorPhrases()
+	{
+		$languages = json_decode($this->input->get('languages'));
+		if (!$languages || !count($languages)) {
+			$this->load->model('system/Sprache_model', 'sprachenModel');
+			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
+			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
+			$languages = array_map(
+				function ($languageData) {
+					return $languageData->sprache;
+				},
+				$activeLanguagesData
+			);
+		}
+
+		$this->load->model('system/Phrase_model', 'phraseModel');
+		$result = [];
+		foreach ($languages as $language) {
+			$tabulatorPhrases = $this->phraseModel->getPhrasesByCategoryAndLanguage(['tabulator'], $language);
+			$result[$language] = $this->getDataOrTerminateWithError($tabulatorPhrases);
+		}
+
+		header('Pragma: private');
+		header('Cache-Control: private, max-age=' . (60 * 60 * 24 * 30));
+		$this->terminateWithSuccess($result);
+	}
+
 }

application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram');
+		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
 		]);
 	}
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,6 +294,10 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
+		if($datum_von == '')
+			$datum_von = null;
+		if($datum_bis == '')
+			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

application/controllers/api/frontend/v1/stv/Abschlusspruefung.php

@@ -371,6 +371,9 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
+		$datum = $formData['datum'] == '' ? null : $formData['datum'];
+		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
+
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -382,8 +385,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $formData['datum'],
-				'sponsion' => $formData['sponsion'],
+				'datum' => $datum,
+				'sponsion' => $sponsion,
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -170,6 +170,8 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
+		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
+
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -180,7 +182,7 @@ class Dokumente extends FHCAPI_Controller
 				'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'),
+				'nachgereicht_am' => $nachgereicht_am,
 				'updateamum' => date('c'),
 				'updatevon' => $uid,
 			]

application/controllers/api/frontend/v1/stv/Konto.php

@@ -429,9 +429,12 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
+
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
+			if($data['buchungsdatum'] == '')
+				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

application/controllers/api/frontend/v1/stv/Mobility.php

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = $formData['von'] ?? null;
-		$bis = $formData['bis'] ?? 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;

application/controllers/api/frontend/v1/stv/Prestudent.php

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
 				)
 				{
 					$val = null;

application/controllers/api/frontend/v1/stv/Projektarbeit.php

@@ -90,6 +90,15 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
+		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+	
+	private function fetchProjektarbeitById($projektarbeit_id) {
+		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'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'
@@ -97,13 +106,10 @@ 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', 'LEFT');
-		$result = $this->ProjektarbeitModel->loadWhere(
+		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -132,7 +138,8 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-
+		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
+		
 		$this->terminateWithSuccess($data);
 	}
 
@@ -280,10 +287,7 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
-		$this->NoteModel->addOrder('notenwert', 'ASC');
-		$this->NoteModel->addOrder('bezeichnung', 'ASC');
-
-		$result = $this->NoteModel->load();
+		$result = $this->NoteModel->getAllActive();
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 

application/controllers/api/frontend/v1/stv/Pruefung.php

@@ -448,8 +448,10 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
+		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
+
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -459,7 +461,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $this->input->post('datum'),
+					'datum' => $datum,
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -472,7 +474,7 @@ class Pruefung extends FHCAPI_Controller
 				'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'),
+				'datum' => $datum,
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -520,7 +522,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $this->input->post('datum'),
+				'benotungsdatum' => $datum,
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -555,7 +557,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $this->input->post('datum'),
+			'benotungsdatum' => $datum,
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

application/controllers/api/frontend/v1/stv/Student.php

@@ -296,6 +296,10 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
+			else if ($prop == 'gebdatum')
+			{
+				$update_person[$prop] = ($val == '') ? null : $val;
+			}
 			else
 			{
 				$update_person[$prop] = $val;

application/controllers/api/frontend/v1/stv/Students.php

@@ -25,9 +25,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
-	private $allowedStgs = [];
-
-
 	public function __construct()
 	{
 		$permissions = [];
@@ -35,16 +32,17 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
-		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$this->allowedStgs) {
+		if (!$allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}
 
 		// Load Libraries
 		$this->load->library('PhrasesLib');
+		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -111,23 +109,19 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -135,16 +129,13 @@ class Students extends FHCAPI_Controller
 				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->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -164,10 +155,7 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -187,14 +175,12 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -202,16 +188,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -231,23 +214,18 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -255,16 +233,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -313,8 +288,6 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -331,38 +304,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
+		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
 
 		if ($orgform_kurzbz) {
-			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
 		}
 
 		switch ($filter) {
 			case "interessenten":
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				break;
 			case "bewerbungnichtabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
 				break;
 			case "bewerbungabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
-				$where['ps.bestaetigtam'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
 				break;
 			case "statusbestaetigt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -374,69 +347,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				
 				if ($stg->typ == 'm') {
-					$where['zgvmas_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgvmas_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
 				} elseif ($stg->typ == 'p') {
-					$where['zgvdoktor_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$where['zgvdoktor_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
 				} else {
-					$where['zgv_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgv_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgv_erfuellt', true);
 				}
 				break;
 			case "reihungstestangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
 				break;
 			case "bewerberrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = true;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', true);
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = false;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', false);
 				break;
 			case "aufgenommen":
-				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
 				break;
 			case "warteliste":
-				$where['ps.status_kurzbz'] = 'Wartender';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
 				break;
 			case "absage":
-				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$where['ps.status_kurzbz'] = 'Incoming';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
 				break;
 			case "absolvent":
-				$where['ps.status_kurzbz'] = 'Absolvent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
 				break;
 			case "diplomand":
-				$where['ps.status_kurzbz'] = 'Diplomand';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -444,9 +417,9 @@ class Students extends FHCAPI_Controller
 					 * 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;
+					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
 				} else {
-					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+					$this->studentlistlib->addWhere('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -457,21 +430,19 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz);
-		
-		$this->PrestudentModel->addSelect("
+		$this->studentlistlib->addSelect("
 			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();
+		$this->studentlistlib->addSelect("'' AS verband");
+		$this->studentlistlib->addSelect("'' AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -574,7 +545,6 @@ class Students extends FHCAPI_Controller
 		$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))
@@ -582,34 +552,29 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz, '');
+		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
+		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
 
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
-
-
-		$where = [];
+		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
 
 		if ($gruppe_kurzbz !== null) {
-			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
-			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
-			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
+			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
+			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
 		} else {
-			$where['v.studiengang_kz'] = $studiengang_kz;
+			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
 
 			if ($semester !== null)
-				$where['v.semester'] = $semester;
+				$this->studentlistlib->addWhere('v.semester', $semester);
 
 			if ($verband !== null)
-				$where['v.verband'] = $verband;
+				$this->studentlistlib->addWhere('v.verband', $verband);
 
 			if ($gruppe !== null)
-				$where['v.gruppe'] = $gruppe;
+				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->PrestudentModel->db->where(
+				$this->studentlistlib->addWhere(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -623,9 +588,10 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -652,11 +618,8 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -664,16 +627,15 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
+		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
 
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'tbl_prestudent.prestudent_id' => $prestudent_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -700,23 +662,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
-
 
+		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			's.student_uid' => $student_uid
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -744,21 +696,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addWhere('p.person_id', $person_id);
 
+		
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'p.person_id' => $person_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -790,29 +734,8 @@ class Students extends FHCAPI_Controller
 
 		$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(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  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') {
@@ -822,197 +745,38 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
+		$this->studentlistlib->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);
+
+
 		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);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
+			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}
 
-		$result = $this->PrestudentModel->load();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * @param string|null	$studiensemester_kurzbz
-	 * @param string		$type
-	 *
-	 * @return void
-	 */
-	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
-	{
-		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
-
-		$this->load->config('stv');
-
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$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');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
-		$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' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
-			$type
-		);
-		$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');
-
-		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");
-		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');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('foto');
-		$this->PrestudentModel->addSelect('foto_sperre');
-
-		// semester
-		// verband
-		// gruppe
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"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');
-		$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');
-		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
-		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect("
-			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			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');
-		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-
-		// priorisierung_relativ
-
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
-
-		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function addSelectPrioRel()
-	{
-		$this->PrestudentModel->addSelect("(
-			SELECT count(*)
-			FROM (
-				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
-				AND studiensemester_kurzbz = (
-					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id = tbl_prestudent.prestudent_id
-					AND status_kurzbz = 'Interessent'
-					LIMIT 1
-				)
-				AND status_kurzbz = 'Interessent'
-			) prest
-			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
-			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
-	}
-
 	/**
 	 * Adds additional filters to the query
 	 *

application/controllers/jobs/AbgabetoolJob.php

@@ -358,7 +358,8 @@ class AbgabetoolJob extends JOB_Controller
 		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
 
 			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
-
+			$hasContent = false;
+			
 			foreach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$assistenzRow = $tupel[1];
@@ -377,6 +378,7 @@ class AbgabetoolJob extends JOB_Controller
 				if(count($relevantAbgaben) == 0) {
 					continue;
 				}
+				$hasContent = true;
 
 				// Format the Student Name
 				$s = $relevantAbgaben[0];
@@ -447,7 +449,12 @@ class AbgabetoolJob extends JOB_Controller
 			}
 
 			$abgabenString .= '</div>';
-
+			
+			// skip send entirely
+			if (!$hasContent) { 
+				continue;
+			}
+			
 			// done with building the change list, now send it
 			$assistenzRow = $tupelArr[0][1];
 			$anrede = $assistenzRow->anrede;

application/controllers/jobs/AntragJob.php

@@ -40,6 +40,13 @@ class AntragJob extends JOB_Controller
 	 */
 	public function sendStglSammelmail()
 	{
+
+		if ($this->config->item('abmeldung_enabled') !== true &&
+			$this->config->item('abmeldung_stg_enabled') !== true &&
+			$this->config->item('unterbrechung_enabled') !== true &&
+			$this->config->item('wiederholung_enabled') !== true)
+			return $this->logError('Konnte Job nicht starten: Keine der Configs "abmeldung_stg_enabled", "abmeldung_enabled", "unterbrechung_enabled",  "wiederholung_enabled" auf true gesetzt');
+
 		$this->load->model('person/Person_model', 'PersonModel');
 
 		$this->logInfo('Start Job sendStglSammelmail');
@@ -47,25 +54,38 @@ class AntragJob extends JOB_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
 		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
-		$this->db->group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
 
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
+		if ($this->config->item('abmeldung_enabled') === true)
+		{
+			$this->db->group_start();
+			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+			$this->db->group_end();
+		}
 
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
+		if ($this->config->item('abmeldung_stg_enabled') === true)
+		{
+			$this->db->or_group_start();
+			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+			$this->db->group_end();
+		}
 
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
-		$this->db->group_end();
+		if ($this->config->item('unterbrechung_enabled') === true)
+		{
+			$this->db->or_group_start();
+			$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+			$this->db->group_end();
+		}
+
+		if ($this->config->item('wiederholung_enabled') === true)
+		{
+			$this->db->or_group_start();
+			$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+			$this->db->group_end();
+		}
 
 		$result =  $this->StudierendenantragModel->load();
 		if(isError($result))
@@ -206,6 +226,10 @@ class AntragJob extends JOB_Controller
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
+
+		if ($this->config->item('unterbrechung_enabled') !== true)
+			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_enabled" nicht auf true gesetzt');
+
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
 
 		if (!$modifier)
@@ -363,6 +387,13 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleWiederholerDeadline');
 
+		if ($this->config->item('wiederholung_enabled') !== true)
+		{
+			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
+			$this->logInfo('Ende Job handleWiederholerDeadline');
+			return;
+		}
+
 		$this->load->library('PrestudentLib');
 
 		$insertvon = $this->config->item('antrag_job_systemuser');
@@ -481,6 +512,13 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
 
+		if ($this->config->item('abmeldung_stg_enabled') !== true)
+		{
+			$this->logError('Config "abmeldung_stg_enabled" nicht auf true gesetzt');
+			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+			return;
+		}
+
 		$insertvon = $this->config->item('antrag_job_systemuser');
 		if (!$insertvon) {
 			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
@@ -614,6 +652,13 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer');
 
+		if ($this->config->item('wiederholung_enabled') !== true)
+		{
+			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
+			$this->logInfo('Ende Job sendAufforderungWiederholer');
+			return;
+		}
+
 		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');

application/controllers/lehre/Studierendenantrag.php

@@ -28,7 +28,9 @@ class Studierendenantrag extends FHC_Controller
 			'studierendenantrag'
 		]);
 
-        if (strtolower($this->router->method) === 'leitung')
+		$this->load->config('studierendenantrag');
+
+		if (strtolower($this->router->method) === 'leitung')
         	$this->_isAllowed([
         		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
         	]);
@@ -54,18 +56,27 @@ class Studierendenantrag extends FHC_Controller
 					'bezeichnungStg' => $antrag->bezeichnung,
 					'bezeichnungOrgform' => $antrag->orgform
 				);
-				
-				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
 
-				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
+				if ($this->config->item('wiederholung_enabled') === true)
+				{
+					$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+					if (getData($result) == 1)
+						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
+				}
 
-				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
+				if ($this->config->item('unterbrechung_enabled') === true)
+				{
+					$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+					if (getData($result) == 1)
+						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
+				}
+
+				if ($this->config->item('abmeldung_enabled') === true)
+				{
+					$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+					if (getData($result) == 1)
+						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
+				}
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
@@ -88,45 +99,59 @@ class Studierendenantrag extends FHC_Controller
 
 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
-			'stgL' => $stgL
+			'stgL' => $stgL,
+			'abmeldung_enabled' => $this->config->item('abmeldung_stg_enabled')
 		]);
 	}
 
 	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
 	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Abmeldung'
-		]);
+		if ($this->config->item('abmeldung_enabled') === true)
+		{
+			$this->load->view('lehre/Antrag/Create', [
+				'prestudent_id' => $prestudent_id,
+				'studierendenantrag_id' => $studierendenantrag_id,
+				'antrag_type' => 'Abmeldung'
+			]);
+		}
 	}
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
 
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'AbmeldungStgl'
-		]);
+		if ($this->config->item('abmeldung_stg_enabled') === true)
+		{
+			$this->load->view('lehre/Antrag/Create', [
+				'prestudent_id' => $prestudent_id,
+				'studierendenantrag_id' => $studierendenantrag_id,
+				'antrag_type' => 'AbmeldungStgl'
+			]);
+		}
 	}
 
 	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
 	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Unterbrechung'
-		]);
+		if ($this->config->item('unterbrechung_enabled') === true)
+		{
+			$this->load->view('lehre/Antrag/Create', [
+				'prestudent_id' => $prestudent_id,
+				'studierendenantrag_id' => $studierendenantrag_id,
+				'antrag_type' => 'Unterbrechung'
+			]);
+		}
+
 	}
 
 	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
 	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Wiederholung'
-		]);
+		if ($this->config->item('wiederholung_enabled') === true)
+		{
+			$this->load->view('lehre/Antrag/Create', [
+				'prestudent_id' => $prestudent_id,
+				'studierendenantrag_id' => $studierendenantrag_id,
+				'antrag_type' => 'Wiederholung'
+			]);
+		}
 	}
 
 	/**

application/libraries/AntragLib.php

@@ -1657,7 +1657,7 @@ class AntragLib
 
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
 		if (isError($result))
-		return $result;
+			return $result;
 
 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
@@ -1709,6 +1709,7 @@ class AntragLib
 		$result->statustyp = $antrag->statustyp;
 		$result->status_insertvon = $antrag->status_insertvon;
 		$result->grund = $antrag->grund;
+		$result->status_grund = $antrag->status_grund;
 		$result->studierendenantrag_id = $antrag->studierendenantrag_id;
 		$result->typ = $antrag->typ;
 		$result->datum = $antrag->datum;

application/libraries/ProfilLib.php

@@ -263,6 +263,59 @@ class ProfilLib{
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
 		}, $mailverteiler_res);
+
+		$this->ci->load->model("crm/Student_model", "StudentModel");
+		$this->ci->StudentModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_student.student_uid");
+		$this->ci->StudentModel->addJoin("tbl_person", "tbl_benutzer.person_id = tbl_person.person_id");
+		$this->ci->StudentModel->addJoin("tbl_studiengang", "tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz");
+		$this->ci->StudentModel->addSelect("matr_nr, semester, verband, gruppe, kurzbzlang");
+
+		$studentResult = $this->ci->StudentModel->loadWhere(["student_uid" => $uid]);
+		if (isError($studentResult)) {
+			return error(getData($studentResult));
+		}
+
+		$studentResultData = getData($studentResult);
+		$studentData = null;
+		if (is_array($studentResultData) && count($studentResultData)) {
+			$studentData = $studentResultData[0];
+		}
+
+		if ($studentData && $studentData->matr_nr) {
+			$this->ci->load->library("phrasesLib", ["profil"], "phrases");
+			$standardCourseVerteiler = trim($studentData->kurzbzlang) . "_STD";
+			$mailverteiler_res[] = [
+				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $standardCourseVerteiler,
+				"gruppe_kurzbz" => $standardCourseVerteiler,
+				"mailto" => "mailto:" . strtolower($standardCourseVerteiler) . "@" . DOMAIN,
+			];
+
+			$semesterVerteiler = trim($studentData->kurzbzlang) . trim($studentData->semester);
+			$mailverteiler_res[] = [
+				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $semesterVerteiler,
+				"gruppe_kurzbz" => $semesterVerteiler,
+				"mailto" => "mailto:" . strtolower($semesterVerteiler) . "@" . DOMAIN,
+			];
+
+			if ($studentData->verband && strlen(trim($studentData->verband))) {
+				$verbandVerteiler = $semesterVerteiler . trim($studentData->verband);
+				$mailverteiler_res[] = [
+					"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $verbandVerteiler,
+					"gruppe_kurzbz" => $verbandVerteiler,
+					"mailto" => "mailto:" . strtolower($verbandVerteiler) . "@" . DOMAIN,
+				];
+
+				if ($studentData->gruppe && strlen(trim($studentData->gruppe))) {
+					$gruppeVerteiler = $verbandVerteiler . trim($studentData->gruppe);
+					$mailverteiler_res[] = [
+						"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $gruppeVerteiler,
+						"gruppe_kurzbz" => $gruppeVerteiler,
+						"mailto" => "mailto:" . strtolower($gruppeVerteiler) . "@" . DOMAIN,
+					];
+				}
+			}
+		}
+
 		return $mailverteiler_res;
 	}
 

application/libraries/StundenplanLib.php

@@ -360,7 +360,10 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object = getData($ort_content_object)[0];
+				$ort_content_object_data = getData($ort_content_object);
+				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
+					? $ort_content_object_data[0]
+					: null;
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}

application/libraries/stv/StudentListLib.php

@@ -0,0 +1,363 @@
+<?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');
+
+/**
+ * This generates a list of students and or prestudents used for Studierendenverwaltung
+ */
+class StudentListLib
+{
+	private $_ci; // Code igniter instance
+
+	private $_allowedStgs = [];
+	private $_selects = [];
+	private $_joins = [];
+	
+	/**
+	 * Gets the CI instance, loads model and prepares default values
+	 *
+	 * @param array		$params
+	 *
+	 * @return void
+	 */
+	public function __construct($params = null)
+	{
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		if (isset($params['allowedStgs']))
+			$this->_allowedStgs = $params['allowedStgs'];
+
+		// Add default SELECTs
+		$this->addSelect("b.uid");
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+			$this->addSelect('tag_data_agg.tags');
+		$this->addSelect('titelpre');
+		$this->addSelect('nachname');
+		$this->addSelect('vorname');
+		$this->addSelect('wahlname');
+		$this->addSelect('vornamen');
+		$this->addSelect('titelpost');
+		$this->addSelect('ersatzkennzeichen');
+		$this->addSelect('gebdatum');
+		$this->addSelect('geschlecht');
+		$this->addSelect('foto');
+		$this->addSelect('foto_sperre');
+		$this->addSelect('v.semester');
+		$this->addSelect('v.verband');
+		$this->addSelect('v.gruppe');
+		$this->addSelect("statusofsemester"); // Will be replaced later
+		$this->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->addSelect('tbl_prestudent.studiengang_kz');
+		$this->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->addSelect("s.matrikelnr");
+		$this->addSelect('p.person_id');
+		$this->addSelect('pls.status_kurzbz AS status');
+		$this->addSelect('pls.datum AS status_datum');
+		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->_ci->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->addSelect('p.anmerkung AS anmerkungen');
+		$this->addSelect('tbl_prestudent.anmerkung');
+		$this->addSelect('pls.orgform_kurzbz');
+		$this->addSelect('aufmerksamdurch_kurzbz');
+		$this->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->addSelect('tbl_prestudent.dual');
+		$this->addSelect('p.matr_nr');
+		$this->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->addSelect('tbl_prestudent.prestudent_id');
+		$this->addSelect("(
+			SELECT count(*)
+			FROM (
+				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
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false); // TODO(chris): overwrite in fetchStudents
+		$this->addSelect('mentor');
+		$this->addSelect('b.aktiv AS bnaktiv');
+		$this->addSelect('unruly');
+		
+		// Add default JOINs
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_person p', 'person_id');
+		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); // TODO(chris): overwrite in fetchStudents
+		$this->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->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->addJoin("v", "", ""); // Will be replaced later
+		$this->addJoin("ps", "", ""); // Will be replaced later
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
+			$this->_ci->load->config('stv');
+			$tags = $this->_ci->config->item('stv_prestudent_tags');
+
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->_ci->PrestudentModel->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->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Adds a SELECT statement to the query.
+	 *
+	 * @param string|array	$select
+	 * @param boolean		$escape (optional)
+	 *
+	 * @return void
+	 */
+	public function addSelect($select, $escape = true)
+	{
+		if (is_array($select)) {
+			foreach ($select as $s)
+				$this->addSelect($s, $escape);
+			return;
+		}
+		$alias = $this->getAliasFromSelect($select);
+		$this->_selects[$alias] = [$select, $escape];
+	}
+
+	/**
+	 * Joins a table to the query.
+	 *
+	 * @param string		$table
+	 * @param string		$cond
+	 * @param string		$type (optional)
+	 * @param string		$position (optional)
+	 *
+	 * @return void
+	 */
+	public function addJoin($table, $cond, $type = '', $position = 'end')
+	{
+		$alias = $this->getAliasFromTable($table);
+
+		if ($position == 'end') {
+			return $this->_joins[$alias] = [$table, $cond, $type];
+		}
+
+		if ($position == 'start') {
+			return $this->_joins = [$alias => [$table, $cond, $type]] + $this->_joins;
+		}
+
+		if (substr($position, 0, 7) == 'before_') {
+			$ref = substr($position, 7);
+			$index = 0;
+		} elseif (substr($position, 0, 6) == 'after_') {
+			$ref = substr($position, 6);
+			$index = 1;
+		} else {
+			return $this->addJoin($table, $cond, $type);
+		}
+		if (!isset($this->_joins[$ref]))
+			return $this->addJoin($table, $cond, $type);
+
+		$key_indeces = array_flip(array_keys($this->_joins));
+		$index += $key_indeces[$ref];
+
+		if (!$index)
+			return $this->addJoin($table, $cond, $type, 'start');
+
+		$front_part = array_slice($this->_joins, 0, $index, true);
+		$back_part = array_slice($this->_joins, $index, null, true);
+
+		if (isset($front_part[$alias])) {
+			unset($front_part[$alias]);
+		}
+
+		$this->_joins = $front_part + [$alias => [$table, $cond, $type]] + $back_part;
+	}
+
+	/**
+	 * Adds a WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Adds a OR WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addOrWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->or_where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->or_where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Generates the query and executes it.
+	 *
+	 * @param string|null	$studiensemester_kurzbz
+	 *
+	 * @return stdClass		result of the query
+	 */
+	public function execute($studiensemester_kurzbz)
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+		$this->addSelect(
+			"public.get_rolle_prestudent(
+				public.tbl_prestudent.prestudent_id, 
+				" . $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) . "
+			)  AS statusofsemester"
+		);
+		$this->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			'LEFT'
+		);
+		$this->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->addWhere('tbl_prestudent.studiengang_kz', $this->_allowedStgs);
+
+		foreach ($this->_joins as $join)
+			$this->_ci->PrestudentModel->addJoin($join[0], $join[1], $join[2]);
+
+		foreach ($this->_selects as $select)
+			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
+
+		$this->_ci->PrestudentModel->addOrder('nachname');
+		$this->_ci->PrestudentModel->addOrder('vorname');
+
+		return $this->_ci->PrestudentModel->load();
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string		$select
+	 *
+	 * @return string
+	 */
+	final protected function getAliasFromSelect($select)
+	{
+		if (strpos($select, ' ') !== false) {
+			return trim(strrchr($select, ' '));
+		}
+
+		if (strpos($select, '.') !== false) {
+			return substr(strrchr($select, '.'), 1);
+		}
+
+		return $select;
+	}
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string|array	$table
+	 *
+	 * @return string|array
+	 */
+	final protected function getAliasFromTable($table)
+	{
+		if (strpos($table, ' ') !== false) {
+			return trim(strrchr($table, ' '));
+		}
+
+		return $table;
+	}
+}

application/models/education/Projektarbeit_model.php

@@ -187,7 +187,10 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabetyp.benotbar, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon
+					campus.tbl_paabgabe.insertvon,
+					campus.tbl_paabgabe.insertamum,
+					campus.tbl_paabgabe.updatevon,
+					campus.tbl_paabgabe.updateamum
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -207,7 +210,18 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon
+					campus.tbl_paabgabe.insertvon,
+					campus.tbl_paabgabe.updatevon,
+					campus.tbl_paabgabe.insertamum,
+					campus.tbl_paabgabe.updateamum,
+					(SELECT p.vorname || ' ' || p.nachname
+						FROM public.tbl_benutzer b
+						JOIN public.tbl_person p USING(person_id)
+						WHERE b.uid = campus.tbl_paabgabe.insertvon) AS insertvon_fullname,
+					(SELECT p.vorname || ' ' || p.nachname
+					FROM public.tbl_benutzer b
+						JOIN public.tbl_person p USING(person_id)
+						WHERE b.uid = campus.tbl_paabgabe.updatevon) AS updatevon_fullname
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id IN ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -240,7 +254,8 @@ class Projektarbeit_model extends DB_Model
 				 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 = ?";
+				AND projektarbeit_id = ?
+				AND lehre.tbl_projektbetreuer.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')";
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
@@ -294,34 +309,142 @@ class Projektarbeit_model extends DB_Model
 	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
 	 * used by the mitarbeiter cis4 abgabetool.
 	 */
-	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_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
-							  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 ')."
+	public function getMitarbeiterProjektarbeiten($person_id, $showAll){
+		$qry = "WITH secondary_betreuer AS (
+				SELECT DISTINCT ON (pb.projektarbeit_id)
+					pb.projektarbeit_id,
+					pb.person_id                  AS zweitbetreuer_person_id,
+					b.uid						  AS zweitbetreuer_benutzer_uid,
+					pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
+					ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
+					p.titelpre                    AS zweitbetreuer_titelpre,
+					p.vorname                     AS zweitbetreuer_vorname,
+					p.nachname                    AS zweitbetreuer_nachname,
+					p.titelpost                   AS zweitbetreuer_titelpost,
+					trim(
+							COALESCE(p.titelpre, '')  || ' ' ||
+							COALESCE(p.vorname, '')   || ' ' ||
+							COALESCE(p.nachname, '')  || ' ' ||
+							COALESCE(p.titelpost, '')
+					)                             AS zweitbetreuer_full_name
+				FROM lehre.tbl_projektbetreuer pb
+						 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
+						 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
+						 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
+				WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
+				ORDER BY pb.projektarbeit_id
+			),
+			primary_betreuer AS (
+				SELECT DISTINCT ON (pb.projektarbeit_id)
+				pb.projektarbeit_id,
+				pb.person_id                  AS betreuer_person_id,
+				pb.betreuerart_kurzbz         AS betreuer_betreuerart_kurzbz,
+				ba.beschreibung               AS betreuer_betreuerart_beschreibung,
+				p.titelpre                    AS betreuer_titelpre,
+				p.vorname                     AS betreuer_vorname,
+				p.nachname                    AS betreuer_nachname,
+				p.titelpost                   AS betreuer_titelpost,
+				trim(
+					COALESCE(p.titelpre, '')  || ' ' ||
+					COALESCE(p.vorname, '')   || ' ' ||
+					COALESCE(p.nachname, '')  || ' ' ||
+					COALESCE(p.titelpost, '')
+				)  							  AS betreuer_full_name
+				FROM lehre.tbl_projektbetreuer pb
+				JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
+				LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
+				LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
+				WHERE pb.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')
+				ORDER BY pb.projektarbeit_id
+		)
+	
+		SELECT
+			*
+		FROM
+			(SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id) 
+				 student_person.vorname, student_person.nachname, 
+					tbl_studiengang.typ, tbl_studiengang.kurzbz,
+					tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, 
+					tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
+					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
+		
+					lehre.tbl_projektarbeit.sprache,
+					 lehre.tbl_projektarbeit.seitenanzahl,
+					 lehre.tbl_projektarbeit.kontrollschlagwoerter,
+					 lehre.tbl_projektarbeit.schlagwoerter,
+					 lehre.tbl_projektarbeit.schlagwoerter_en,
+					 lehre.tbl_projektarbeit.abstract,
+					 lehre.tbl_projektarbeit.abstract_en,
+					 lehre.tbl_projektarbeit.insertamum,
+					 
+					 (
+						 SELECT orgform_kurzbz
+						 FROM public.tbl_prestudentstatus
+						 WHERE prestudent_id = (
+							 SELECT prestudent_id FROM public.tbl_student
+							 WHERE student_uid = student_benutzer.uid LIMIT 1
+						 )
+						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+						 LIMIT 1
+					 ) AS organisationsform,
+					 (
+						 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
+										 tbl_prestudentstatus.orgform_kurzbz,
+										 tbl_studiengang.orgform_kurzbz)
+						 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 = public.tbl_student.prestudent_id
+						 ORDER BY tbl_prestudentstatus.datum DESC
+						 LIMIT 1
+					 ) AS orgform,
+					 (
+						 SELECT status_kurzbz
+						 FROM public.tbl_prestudentstatus
+						 WHERE prestudent_id = public.tbl_student.prestudent_id
+						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+						 LIMIT 1
+					 ) AS studienstatus,
+		
+					pb.betreuer_person_id,
+					pb.betreuer_betreuerart_kurzbz,
+					pb.betreuer_betreuerart_beschreibung,
+					pb.betreuer_titelpre,
+					pb.betreuer_vorname,
+					pb.betreuer_nachname,
+					pb.betreuer_titelpost,
+					pb.betreuer_full_name,
+					
+					sb.zweitbetreuer_person_id,
+					sb.zweitbetreuer_benutzer_uid,
+					sb.zweitbetreuer_betreuerart_kurzbz,
+					sb.zweitbetreuer_betreuerart_beschreibung,
+					sb.zweitbetreuer_titelpre,
+					sb.zweitbetreuer_vorname,
+					sb.zweitbetreuer_nachname,
+					sb.zweitbetreuer_titelpost,
+					sb.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  primary_betreuer      pb               ON pb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
+					LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
+			WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+	    AND (pb.betreuer_person_id = ? OR sb.zweitbetreuer_person_id = ?)
+						".($showAll?'':' AND student_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 tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
 				ORDER BY nachname;";
 
-		return $this->execReadOnlyQuery($qry, array($uid));
+		return $this->execReadOnlyQuery($qry, array($person_id, $person_id));
 	}
 
 	/**
@@ -341,176 +464,257 @@ class Projektarbeit_model extends DB_Model
 	
 	
 	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
-				   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.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,
-				   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', 'Senatsmitglied')
-					   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', 'Senatsmitglied')
-					   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', 'Senatsmitglied')
-					   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,
-									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)
-						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'
-				     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 = ?";
+		$new_qry = "WITH secondary_betreuer AS (
+			SELECT DISTINCT ON (pb.projektarbeit_id)
+				pb.projektarbeit_id,
+				pb.person_id                  AS zweitbetreuer_person_id,
+				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
+				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
+				p.titelpre                    AS zweitbetreuer_titelpre,
+				p.vorname                     AS zweitbetreuer_vorname,
+				p.nachname                    AS zweitbetreuer_nachname,
+				p.titelpost                   AS zweitbetreuer_titelpost,
+				trim(
+						COALESCE(p.titelpre, '')  || ' ' ||
+						COALESCE(p.vorname, '')   || ' ' ||
+						COALESCE(p.nachname, '')  || ' ' ||
+						COALESCE(p.titelpost, '')
+				)                             AS zweitbetreuer_full_name
+			FROM lehre.tbl_projektbetreuer pb
+					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
+					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
+					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
+			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
+			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
+		)
 		
-			     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           
+		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,
+				 public.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,
+				 lehre.tbl_projektarbeit.seitenanzahl,
+				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter_en,
+				 lehre.tbl_projektarbeit.abstract,
+				 lehre.tbl_projektarbeit.abstract_en,
+				 lehre.tbl_projektarbeit.insertamum,
+				 lehre.tbl_projektarbeit.note,
+	
+				 sb.zweitbetreuer_person_id,
+				 sb.zweitbetreuer_betreuerart_kurzbz,
+				 sb.zweitbetreuer_betreuerart_beschreibung,
+				 sb.zweitbetreuer_full_name,
+				 sb.zweitbetreuer_titelpre,
+				 sb.zweitbetreuer_vorname,
+				 sb.zweitbetreuer_nachname,
+				 sb.zweitbetreuer_titelpost,
+	
+				 (
+					 SELECT orgform_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = (
+						 SELECT prestudent_id FROM public.tbl_student
+						 WHERE student_uid = student_benutzer.uid LIMIT 1
+					 )
+					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					 LIMIT 1
+				 ) AS organisationsform,
+				 (
+					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
+									 tbl_prestudentstatus.orgform_kurzbz,
+									 tbl_studiengang.orgform_kurzbz)
+					 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 = public.tbl_student.prestudent_id
+					 ORDER BY tbl_prestudentstatus.datum DESC
+					 LIMIT 1
+				 ) AS orgform,
+				 (
+					 SELECT status_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = public.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
+				  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
+				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
+	
+			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+			 	AND student_benutzer.aktiv
+			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
+																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
+					 )
+			 	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));
 	}
+
+	public function getProjektarbeitenForStudent($student_uid) {
+		$new_qry = "WITH secondary_betreuer AS (
+			SELECT DISTINCT ON (pb.projektarbeit_id)
+				pb.projektarbeit_id,
+				pb.person_id                  AS zweitbetreuer_person_id,
+				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
+				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
+				p.titelpre                    AS zweitbetreuer_titelpre,
+				p.vorname                     AS zweitbetreuer_vorname,
+				p.nachname                    AS zweitbetreuer_nachname,
+				p.titelpost                   AS zweitbetreuer_titelpost,
+				trim(
+						COALESCE(p.titelpre, '')  || ' ' ||
+						COALESCE(p.vorname, '')   || ' ' ||
+						COALESCE(p.nachname, '')  || ' ' ||
+						COALESCE(p.titelpost, '')
+				)                             AS zweitbetreuer_full_name
+			FROM lehre.tbl_projektbetreuer pb
+					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
+					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
+					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
+			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
+			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
+		)
+		
+		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,
+				 public.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,
+				 lehre.tbl_projektarbeit.seitenanzahl,
+				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter_en,
+				 lehre.tbl_projektarbeit.abstract,
+				 lehre.tbl_projektarbeit.abstract_en,
+				 lehre.tbl_projektarbeit.insertamum,
+				 lehre.tbl_projektarbeit.note,
+	
+				 sb.zweitbetreuer_person_id,
+				 sb.zweitbetreuer_betreuerart_kurzbz,
+				 sb.zweitbetreuer_betreuerart_beschreibung,
+				 sb.zweitbetreuer_full_name,
+				 sb.zweitbetreuer_titelpre,
+				 sb.zweitbetreuer_vorname,
+				 sb.zweitbetreuer_nachname,
+				 sb.zweitbetreuer_titelpost,
+	
+				 (
+					 SELECT orgform_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = (
+						 SELECT prestudent_id FROM public.tbl_student
+						 WHERE student_uid = student_benutzer.uid LIMIT 1
+					 )
+					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					 LIMIT 1
+				 ) AS organisationsform,
+				 (
+					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
+									 tbl_prestudentstatus.orgform_kurzbz,
+									 tbl_studiengang.orgform_kurzbz)
+					 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 = public.tbl_student.prestudent_id
+					 ORDER BY tbl_prestudentstatus.datum DESC
+					 LIMIT 1
+				 ) AS orgform,
+				 (
+					 SELECT status_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = public.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
+				  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
+				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
+	
+			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+			 	AND student_benutzer.aktiv
+			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
+																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
+					 )
+			 	AND public.tbl_student.student_uid = ?
+			 ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+		   ) as tmp";
+
+		return $this->execReadOnlyQuery($new_qry, array($student_uid));
+	}
 	
 	/**
 	 *

application/models/education/Studierendenantrag_model.php

@@ -149,6 +149,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.grund AS grund');
 		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
 		$this->addSelect('s.insertvon status_insertvon');
+		$this->addSelect('s.grund AS status_grund');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
 		$this->addSelect('p.unruly AS unruly');
 		$this->addSelect($this->dbTable . '.insertamum AS insertamum');
@@ -269,6 +270,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.grund');
 		$this->addSelect($this->dbTable . '.dms_id');
 		$this->addSelect('s.insertvon AS status_insertvon');
+		$this->addSelect('s.grund AS status_grund');
 		$this->addSelect(
 			"(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " .
 			$this->dbTable .

application/models/education/Studierendenantragstatus_model.php

@@ -50,7 +50,7 @@ class Studierendenantragstatus_model extends DB_Model
 		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
 
 		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
-
+		$this->addOrder($this->dbTable. '.insertamum', 'DESC');
 		return $this->loadWhere($where);
 	}
 

application/models/organisation/Studiensemester_model.php

@@ -122,6 +122,47 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query, array($studiensemester_kurzbz, $limit));
 	}
 
+
+	/**
+	 * Returns the current study semester and the previous semesters of the same type (SS/WS).
+	 *
+	 * Example:
+	 * - SS2026, limit 3:  SS2026, SS2025, SS2024
+	 * - WS2025, limit 2: WS2025, WS2024
+	 *
+	 * @param $studiensemester_kurzbz
+	 * @param $limit
+	 */
+	public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1)
+	{
+		$qry = '
+			SELECT 
+			    studiensemester_kurzbz,
+				start,
+				ende
+			FROM 
+			    public.tbl_studiensemester
+			WHERE 
+				SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2)
+			AND start <= (
+				SELECT start
+				FROM public.tbl_studiensemester
+				WHERE studiensemester_kurzbz = ?
+			)
+			ORDER BY 
+				start DESC
+			LIMIT ?
+		';
+
+		return $this->execQuery($qry,
+			[
+				$studiensemester_kurzbz,
+				$studiensemester_kurzbz,
+				$limit
+			]
+		);
+	}
+
 	/**
 	 * getNearest
 	 */

application/models/person/Benutzerfunktion_model.php

@@ -260,7 +260,6 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
-
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -296,7 +295,6 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/views/Cis/Abgabetool.php

@@ -38,7 +38,7 @@ $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) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 99%" 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 ?? '' ?>"

application/views/lehre/Antrag/Leitung/List.php

@@ -44,6 +44,7 @@ $this->load->view(
 			<studierendenantrag-leitung
 				:stg-a="<?= htmlspecialchars(json_encode(array_values($stgA))); ?>"
 				:stg-l="<?= htmlspecialchars(json_encode(array_values($stgL))); ?>"
+				:abmeldung_enabled="<?= htmlspecialchars(json_encode(($abmeldung_enabled))); ?>"
 				>
 			</studierendenantrag-leitung>
 

application/views/system/infocenter/infocenterData.php

@@ -315,22 +315,15 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT
+				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					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
-				)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,22 +24,15 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-				SELECT
+					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					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
-				)
+				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

cis/private/lehre/notenliste.xls.php

@@ -36,6 +36,7 @@ require_once('../../../include/notenschluessel.class.php');
 require_once('../../../include/Excel/excel.php');
 require_once('../../../include/phrasen.class.php');
 require_once('../../../include/pruefung.class.php');
+require_once('../../../include/benutzerberechtigung.class.php');
 
 $uid = get_uid();
 
@@ -44,7 +45,7 @@ $uid = get_uid();
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
-if(!check_lektor($uid))
+if (!check_lektor($uid))
 	die('Sie haben keine Berechtigung fuer diese Seite');
 
 if (!$db = new basis_db())
@@ -90,6 +91,21 @@ if(isset($_GET['lehreinheit_id']))
 else
 	$lehreinheit_id = '';
 
+// Permissions
+$berechtigung = new benutzerberechtigung();
+$berechtigung->getBerechtigungen($uid);
+
+// LV load
+$lvobj = new lehrveranstaltung($lvid);
+
+// Check permissions
+if (!$berechtigung->isBerechtigt('admin')
+	&& !$berechtigung->isBerechtigt('assistenz')
+	&& !$berechtigung->isBerechtigt('lehre', $lvobj->oe_kurzbz, 's')
+	&& !check_lektor_lehrveranstaltung($uid, $lvid, $stsem)
+)
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
 /*
  * Create Excel File
  */
@@ -143,8 +159,6 @@ else
 	// let's merge
 	$format_title->setAlign('merge');
 
-	$lvobj = new lehrveranstaltung($lvid);
-
 	$worksheet->write(0,0,$p->t('anwesenheitsliste/notenliste')." ".($sprache=='English'?$lvobj->bezeichnung_english:$lvobj->bezeichnung),$format_bold);
 
 	$stg_obj = new studiengang($stg);

cis/testtool/frage.php

@@ -80,9 +80,17 @@ echo '
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+	<link rel="stylesheet" href="../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css" />
 	<link rel="stylesheet" href="../../vendor/twbs/bootstrap3/dist/css/bootstrap.min.css" type="text/css"/>
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css" />
+	<style>
+		.ui-dialog-titlebar-close
+		{
+			visibility: hidden !important;
+		}
+	</style>
 	<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../vendor/twbs/bootstrap3/dist/js/bootstrap.min.js"></script>
 	<script language="Javascript" type="text/javascript">
 	//<![CDATA[
@@ -131,22 +139,78 @@ echo '
 		}
 	}
 
-	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
+	function GebietStarten(bezeichnung, stunde, minute, sekunde, gebiet_id)
 	{
-		var check = confirm(<?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?>+' '+stunde+'h '+minute+'m '+sekunde+'s');
-		if (check == true) {
-			var sprache_user = <?php echo "'".$sprache_user."'"?>;
-			document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
-		}
-		else {
-			return false;
+		let message = <?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?> + ' ' + stunde + 'h ' + minute + 'm ' + sekunde + 's';
+		let title = <?php echo "'".$p->t('testtool/startGebiet')."'"?>;
+		let abbrechen = <?php echo "'".$p->t('testtool/abbrechen')."'"?>;
+
+		if ($('#gebiet-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="gebiet-dialog" title="' + title + '">' +
+					'<p id="gebiet-dialog-msg">' + message + '</p>' +
+				'</div>'
+			);
 		}
+
+		$('#gebiet-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						document.location.href = 'frage.php?gebiet_id=' + gebiet_id + '&start=true';
+					}
+				},
+				{
+					text: abbrechen,
+					click: function() {
+						$(this).dialog('close');
+					}
+				}
+			]
+		});
 	}
 
+	let letzteFrageBestaetigt = false;
+
 	function letzteFrage()
 	{
-		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
-		return true;
+		if (letzteFrageBestaetigt)
+			return true;
+
+		let message = <?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>;
+
+		if ($('#fertig-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="fertig-dialog">' +
+					'<p>' + message + '</p>' +
+				'</div>'
+			);
+		}
+
+		$('#fertig-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						letzteFrageBestaetigt = true;
+						$('[name="submitantwort"]').click();
+					}
+				}
+			]
+		});
+
+		return false;
 	}
 
 	$(document).ready(function () {
@@ -647,7 +711,7 @@ if($frage->frage_id!='')
 	}
 
 	$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
-	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
+	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"return letzteFrage()\"":"").">";
 	echo '
 		<div class="row text-center">
 			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">

cis/testtool/gebietfertig.php

@@ -44,6 +44,27 @@ if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
 $sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
 $p = new phrasen($sprache_user);
 
+$showInfo = false;
+if (isset($_SESSION['alleGebiete']))
+{
+	$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+	$pruefling_id = $_SESSION['pruefling_id'];
+
+	$qry = "SELECT COUNT(DISTINCT gebiet_id)  as anzahl
+			FROM testtool.tbl_pruefling_frage
+			JOIN testtool.tbl_frage USING(frage_id)
+			WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+			AND pruefling_id = ". $pruefling_id ."
+	";
+
+	$result = $db->db_query($qry);
+	$anzahlGebiete = $db->db_fetch_object($result);
+
+
+	if ((int)$anzahlGebiete->anzahl === count($alleGebiete))
+		$showInfo = true;
+}
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -69,6 +90,7 @@ $p = new phrasen($sprache_user);
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/zeitAbgelaufen');?></h2>
+	<h3><?php echo ($showInfo ? ($p->t('testtool/alleGebietGestartet') . "<br />" . $p->t('testtool/alleGebieteGestartetInfo')) : ''); ?></h3>
 </center>
 </body>
 </html>

cis/testtool/login.php

@@ -142,7 +142,9 @@ if (isset($_REQUEST['prestudent']))
 		}
 		if ($reihungstest_id != '' && $rt->load($reihungstest_id))
 		{
-			if ($rt->freigeschaltet)
+			$pruefling_exist = new Pruefling();
+			$alreadyInRT = $pruefling_exist->personAlreadyInRT($ps->person_id, $rt->reihungstest_id, $ps->prestudent_id);
+			if ($rt->freigeschaltet && !$alreadyInRT)
 			{
 				// regenerate Session ID after Login
 				session_regenerate_id();
@@ -282,7 +284,14 @@ if (isset($_REQUEST['prestudent']))
 			}
 			else
 			{
-				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				if ($alreadyInRT)
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtRegistriert').'</div>';
+				}
+				else
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				}
 			}
 		}
 		else

cis/testtool/menu.php

@@ -187,6 +187,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 
 			$qry .= "
+				AND ps_status.bewerbung_abgeschicktamum IS NOT NULL
 
 		/* Order to get last semester when using distinct on */
 		ORDER BY
@@ -405,6 +406,29 @@ else if (isset($_SESSION['pruefling_id']))
 		echo '</table>';
 	}
 
+	if (isset($_SESSION['pruefling_id']) && !empty($_SESSION['alleGebiete']))
+	{
+		$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+		$pruefling_id = (int)$_SESSION['pruefling_id'];
+
+		$qry = "SELECT COUNT(DISTINCT gebiet_id) AS anzahl
+				FROM testtool.tbl_pruefling_frage
+					JOIN testtool.tbl_frage USING(frage_id)
+				WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+					AND pruefling_id = ". $pruefling_id;
+
+		$result_check = $db->db_query($qry);
+		$row_check = $db->db_fetch_object($result_check);
+
+		if ((int)$row_check->anzahl === count($alleGebiete))
+		{
+			echo '<tr><td>
+					<div class="alert alert-success small" style="margin-left: 20px; width: 170px; margin-top: 3px;" role="alert">
+						<strong>'.$p->t('testtool/alleGebietGestartet').'</strong>
+					</div>
+				</td></tr>';
+		}
+	}
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>

config/global.config-default.inc.php

@@ -373,4 +373,8 @@ define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 
 //enable tags in StudVW
 define('STV_TAGS_ENABLED', false);
+
+//student accounts grace period
+define('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD', '0 days');
+define('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES', serialize(array('NO_DEFINED_ROLE')));
 ?>

content/statistik/notenspiegel_erweitert.php

@@ -95,37 +95,37 @@ foreach ($result_student as $row)
 if ($uids == '')
 	die('Es befinden sich keine Studierende in diesem Semester');
 
-$qry = "SELECT 
-			lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-		FROM 
-			lehre.tbl_lehrveranstaltung 
-        WHERE 
-        	lehrveranstaltung_id IN 
-        	(
-				SELECT 
-					distinct lehrveranstaltung_id 
-				FROM 
-					campus.vw_student_lehrveranstaltung, public.tbl_studentlehrverband
-	        	WHERE 
-	        		tbl_studentlehrverband.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND 
-	        		tbl_studentlehrverband.semester=".$db->db_add_param($semester, FHC_INTEGER)." AND 
-	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-	        		uid=student_uid AND 
-	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz
+$qry = "SELECT
+		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+	FROM
+		lehre.tbl_lehrveranstaltung
+        WHERE
+		lehrveranstaltung_id IN (
+			SELECT
+				DISTINCT lehrveranstaltung_id
+			FROM
+				campus.vw_student_lehrveranstaltung
+				JOIN public.tbl_studentlehrverband ON(student_uid = uid)
+			WHERE
+				tbl_studentlehrverband.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
+				AND tbl_studentlehrverband.semester = ".$db->db_add_param($semester, FHC_INTEGER)."
+				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
 	        ) 
-	        AND studiengang_kz<>0
+	        AND studiengang_kz != 0
 	        AND zeugnis
-	    UNION
-	    SELECT
-	    	lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-	    FROM
-	    	lehre.tbl_lehrveranstaltung JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
-	    WHERE
-	    	tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-	    	tbl_zeugnisnote.student_uid in($uids) AND
-	    	tbl_zeugnisnote.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-	    	zeugnis
-		ORDER BY bezeichnung";
+	UNION
+	SELECT
+		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+	FROM
+	    lehre.tbl_lehrveranstaltung
+	    JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
+	WHERE
+	    tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
+	    AND tbl_zeugnisnote.student_uid IN ($uids)
+	    AND tbl_zeugnisnote.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+	    AND zeugnis
+    ORDER BY bezeichnung";
 
 if (!$result_lva = $db->db_query($qry))
 	die('Fehler beim Ermitteln der Lehrveranstaltungen');
@@ -338,6 +338,10 @@ if ($typ == 'xls')
 	}
 	$anzahl_lvspalten = $spalte - 2;
 
+	$worksheet->write($zeile, ++$spalte, 'ECTS Summe zugeteilt', $format_bold);
+	$maxlength[$spalte] = 20;
+	$worksheet->write($zeile, ++$spalte, 'ECTS Summe gewichtet', $format_bold);
+	$maxlength[$spalte] = 20;
 	$worksheet->write($zeile, ++$spalte, 'Notendurchschnitt', $format_bold);
 	$maxlength[$spalte] = 15;
 	$worksheet->write($zeile, ++$spalte, "Gewichteter\nNotendurchschnitt", $format_bold_wrap);
@@ -372,9 +376,12 @@ if ($typ == 'xls')
 		$worksheet->write($zeile, ++$spalte, $row_student->gruppe, $format_bold_left);
 		$worksheet->write($zeile, ++$spalte, $row_student->matrikelnr, $format_bold);
 
-		//Alle Zeugnisnoten des Studierenden holen
+		// Alle Zeugnisnoten des Studierenden holen
 		$noten = array();
-		$qry = "SELECT * FROM lehre.tbl_zeugnisnote WHERE student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
+		$qry = "SELECT lehrveranstaltung_id, note
+			FROM lehre.tbl_zeugnisnote
+			WHERE student_uid = ".$db->db_add_param($row_student->uid)."
+			AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$noten[$row->lehrveranstaltung_id] = $row->note;
@@ -382,15 +389,16 @@ if ($typ == 'xls')
 		//Zu jeder Lehrveranstaltungsnote Prüfungstyp (Anzahl der Antritte) holen
 		$pruefungstypen = array();
 		$qry = "SELECT tbl_lehrveranstaltung.lehrveranstaltung_id, pruefungstyp_kurzbz, sort, datum
-					FROM
-						lehre.tbl_pruefung
- 					JOIN
- 						lehre.tbl_lehreinheit using(lehreinheit_id)
- 					JOIN
- 						lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
- 					WHERE 
- 						student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
- 					ORDER BY lehrveranstaltung_id, sort, datum";
+			FROM
+				lehre.tbl_pruefung
+			JOIN
+				lehre.tbl_lehreinheit USING(lehreinheit_id)
+			JOIN
+				lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+			WHERE
+				student_uid = ".$db->db_add_param($row_student->uid)."
+				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+			ORDER BY lehrveranstaltung_id, sort, datum";
 		if ($result = $db->db_query($qry))
 		{
 			while ($row = $db->db_fetch_object($result))
@@ -399,15 +407,14 @@ if ($typ == 'xls')
 			}
 		}
 
-		//Alle LVs holen zu denen der Studierende zugeteilt ist
+		// Alle LVs holen zu denen der Studierende zugeteilt ist
 		$zugeteilte_lvs = array();
-		$qry = "SELECT distinct lehrveranstaltung_id
-					FROM 
-						campus.vw_student_lehrveranstaltung 
-					WHERE 
-						uid=".$db->db_add_param($row_student->uid)." AND 
-						studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
-
+		$qry = "SELECT DISTINCT lehrveranstaltung_id
+			FROM
+				campus.vw_student_lehrveranstaltung
+			WHERE
+				uid = ".$db->db_add_param($row_student->uid)."
+				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$zugeteilte_lvs[] = $row->lehrveranstaltung_id;
@@ -416,17 +423,20 @@ if ($typ == 'xls')
 		$summe = 0;
 		$rowcount = 0;
 		$summeects = 0;
+		$total_ects = 0;
 		$gewichtetenote = 0;
 
 		while ($rowcount < $db->db_num_rows($result_lva))
 		{
 			$row_lva = $db->db_fetch_object($result_lva, $rowcount);
 			$rowcount++;
+
 			//wenn es eine Note gibt
 			if (isset($noten[$row_lva->lehrveranstaltung_id]))
 			{
 				$note = $noten[$row_lva->lehrveranstaltung_id];
 				$format = 0;
+				$total_ects += $row_lva->ects;
 
 				//wenn für die LV der Studierende eine Nachprüfung hat (z.B. 2 Termin, kommissionelle...)
 				if (isset($pruefungstypen[$row_lva->lehrveranstaltung_id]))
@@ -472,6 +482,7 @@ if ($typ == 'xls')
 				//Keine Note fuer diese LV vorhanden
 				if (in_array($row_lva->lehrveranstaltung_id, $zugeteilte_lvs))
 				{
+					$total_ects += $row_lva->ects;
 					$worksheet->write($zeile, ++$spalte, '', $format_colored_nichteingetragen);
 				}
 				else
@@ -489,6 +500,8 @@ if ($typ == 'xls')
 		if ($summeects != 0)
 			$gewichtetenote /= $summeects;
 
+		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $total_ects), $format_number);
+		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $summeects), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $gewichtetenote), $format_number);
 		if ($gewichtetenote != 0)
@@ -529,6 +542,8 @@ if ($typ == 'xls')
 		$schnitt = $summe_schnitt / $anzahl_schnitt;
 	else
 		$schnitt = 0;
+	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
+	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
 	$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 	if ($anzahlgewichtet != 0)
 		$summegewichtet = $summegewichtet / $anzahlgewichtet;

include/benutzerberechtigung.class.php

@@ -340,6 +340,40 @@ class benutzerberechtigung extends basis_db
 		return true;
 	}
 
+	protected function hasPreStudentStatusInGracePeriod($uid)
+	{
+		$period = defined('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD')
+				? STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD
+				: '0 days';
+		$mapfunc = function($val) {
+			return $this->db_add_param($val);
+		};
+		$roles = defined('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES')
+				? implode(', ', array_map($mapfunc, unserialize(STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES)))
+				: "'NO_DEFINED_ROLE'";
+
+		$sql = <<<EOSQL
+			SELECT 
+				1
+			FROM
+				campus.vw_student vs 
+			WHERE
+				vs.uid = {$this->db_add_param($uid)}
+				AND
+				vs.aktiv = false
+				AND
+				public.get_rolle_prestudent(vs.prestudent_id, null) IN ({$roles})
+				AND
+				(vs.updateaktivam + INTERVAL {$this->db_add_param($period)})::date >= CURRENT_DATE
+EOSQL;
+		$result = $this->db_query($sql);
+		if($result && $this->db_num_rows($result) > 0)
+		{
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Laedt die Berechtigungen eines Users
 	 * @param $uid
@@ -355,7 +389,8 @@ class benutzerberechtigung extends basis_db
 			if($row = $this->db_fetch_object($result))
 			{
 				// Wenn die Person nicht aktiv ist dann hat diese auch keine Rechte
-				if($this->db_parse_bool($row->aktiv) == false)
+				if($this->db_parse_bool($row->aktiv) == false
+					&& $this->hasPreStudentStatusInGracePeriod($uid) === false)
 					return false;
 			}
 			else

include/pruefling.class.php

@@ -584,6 +584,32 @@ class pruefling extends basis_db
 		
 		$qry .= " LIMIT 1";
 
+		if($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) == 0)
+				return false;
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
+	public function personAlreadyInRT($person_id, $reihungstest_id, $prestudent_id)
+	{
+		$qry = "SELECT tbl_prestudent.prestudent_id
+				FROM public.tbl_rt_person
+					JOIN public.tbl_prestudent ON tbl_prestudent.person_id = tbl_rt_person.person_id
+					JOIN public.tbl_prestudentstatus ON tbl_prestudent.prestudent_id = tbl_prestudentstatus.prestudent_id AND status_kurzbz = 'Bewerber'
+						AND tbl_prestudentstatus.studienplan_id = tbl_rt_person.studienplan_id
+				WHERE tbl_rt_person.person_id = " . $this->db_add_param($person_id) . "
+					AND tbl_rt_person.rt_id = " . $this->db_add_param($reihungstest_id) . "
+					AND tbl_prestudent.prestudent_id != " . $this->db_add_param($prestudent_id) . "
+					AND get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) = 'Bewerber'
+				LIMIT 1";
+
 		if($result = $this->db_query($qry))
 		{
 			if ($this->db_num_rows($result) == 0)

locale/de-AT/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='Sie sind für den Reihungstest nicht registriert';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='Keine Antwort';
 $this->phrasen['testtool/speichernUndWeiter']='Speichern und weiter';
 $this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort.';
 $this->phrasen['testtool/zeitAbgelaufen']='Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet';
+$this->phrasen['testtool/alleGebietGestartet']='Sie haben alle Gebiete bearbeitet.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='Sie können sich nun ausloggen und den Browser schließen.';
 $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfragen';
 $this->phrasen['testtool/einleitung']='Einleitung';
 $this->phrasen['testtool/blaettern']='Blättern';
 $this->phrasen['testtool/demo']='Demobeispiel ansehen';
+$this->phrasen['testtool/abbrechen']='Abbrechen';
+$this->phrasen['testtool/startGebiet']='Gebiet starten';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Klicken Sie OK um dieses Gebiet zu starten. \nSie haben für die Bearbeitung ein Zeitlimit von';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Bitte zuerst anmelden!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Fehler beim generieren des Fragenpools';

locale/en-US/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='You are not registered for the placement test.';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='No Answer';
 $this->phrasen['testtool/speichernUndWeiter']='Save and next';
 $this->phrasen['testtool/alleFragenBeantwortet']='CONGRATULATIONS!\n\nYou have answered all the questions in the time allowed.\n Use the remaining time to check your answers or continue to the next section.';
 $this->phrasen['testtool/zeitAbgelaufen']='The time for this part has expired or you have answered all the questions.';
+$this->phrasen['testtool/alleGebietGestartet']='You have worked on all sections.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='You can now log out and close the browser.';
 $this->phrasen['testtool/spracheDerTestfragen']='Desired language of questions';
 $this->phrasen['testtool/einleitung']='Introduction';
 $this->phrasen['testtool/blaettern']='Browse';
 $this->phrasen['testtool/demo']='See an example';
+$this->phrasen['testtool/abbrechen']='Cancel';
+$this->phrasen['testtool/startGebiet']='Start the section';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Click OK to start this section. \nYou have a timelimit of';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Please log in first!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Error in generating the pool of questions.';

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "FHC-Core",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

public/css/Studentenverwaltung.css

@@ -277,3 +277,7 @@ html.fs_huge {
 }
 */
 /* slim ende */
+
+.fhc-xxl-modal {
+	min-width: 80vw;
+}

public/css/components/abgabetool/abgabe.css

@@ -305,4 +305,104 @@
 /* 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 */
-}
+}
+
+.tabulator-cell {
+	container-type: inline-size;
+}
+
+.tabulator-col-title {
+	container-type: inline-size;
+}
+
+@container (max-width: 100px) {
+	.full-text {
+		display: none !important;
+	}
+
+	.short-text {
+		display: inline-block !important;
+		width: 100%;
+	}
+}
+
+/*conditional tooltips fix*/
+.p-tooltip.custom-tooltip {
+	z-index: 8001 !important;
+}
+
+ /* Shrinks font and table rows for desktop users who have zoomed in their browser (150%+).
+   Does not affect mobile/touchscreen devices, which use touch input instead of a mouse. */
+@media (pointer: fine) and (min-resolution: 1.5dppx) {
+
+	html.abgabetool {
+		font-size: 0.5rem;
+	}
+
+	.abgabetool .tabulator-cell,
+	.abgabetool .tabulator-row {
+		 height: 20px;
+		 max-height: 20px;
+	 }
+	
+}
+
+/*confetti celebration on endupload - impossible to miss*/
+#confetti-container {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	pointer-events: none;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+.confetti-piece {
+	position: absolute;
+	opacity: 0;
+	will-change: top, transform, opacity;
+}
+
+/* Background Rain */
+@keyframes fallAndSpin {
+	0% {
+		top: var(--start-y);
+		transform: translate3d(0, 0, 0) rotateX(0deg) rotateY(0deg);
+		opacity: 1;
+	}
+	100% {
+		top: 105vh;
+		transform: translate3d(var(--drift), 0, 0) rotateX(720deg) rotateY(360deg);
+		opacity: 0.3;
+	}
+}
+
+/* Corner Cannons*/
+@keyframes cannonBlast {
+	0% {
+		transform: translate3d(0, 0, 0) scale(0.3) rotate(0deg);
+		opacity: 1;
+		animation-timing-function: cubic-bezier(0.1, 0.8, 0.2, 1);
+	}
+	30% {
+		transform: translate3d(var(--blast-x), var(--blast-y), 0) scale(1.2) rotate(270deg);
+		opacity: 1;
+		animation-timing-function: linear;
+	}
+	100% {
+		transform: translate3d(calc(var(--blast-x) * 1.4), 15vh, 0) scale(0.4) rotate(630deg);
+		opacity: 0;
+	}
+}
+
+.p-timeline-event-opposite {
+	flex: 0 0 90px;
+	max-width: 90px;
+}
+
+.p-timeline-event-content {
+	flex: 1 1 auto;
+	min-width: 0;
+}

public/js/api/factory/abgabe.js

@@ -77,6 +77,13 @@ export default {
 			}
 		};
 	},
+	patchProjektarbeitAbgabeMultiple(payload) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/patchProjektarbeitAbgabeMultiple',
+			params: payload
+		};
+	},
 	deleteProjektarbeitAbgabe(paabgabe_id) {
 		return {
 			method: 'post',
@@ -84,6 +91,13 @@ export default {
 			params: { paabgabe_id }
 		};
 	},
+	deleteProjektarbeitAbgabeMultiple(paabgabe_ids) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabeMultiple',
+			params: { paabgabe_ids }
+		};
+	},
 	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
 		return {
 			method: 'post',
@@ -139,6 +153,30 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getSignaturStatusForProjektarbeitAbgaben',
 			params: {paabgabe_ids, student_uid},
 
+		};
+	},
+	postStudentProjektarbeitTitel(projektarbeit_id, titel) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitTitel',
+			params: {projektarbeit_id, titel},
+
+		};
+	},
+	sendZweitbetreuerTokenMail(projektarbeit_id, betreuer_person_id, student_uid) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/sendZweitbetreuerTokenMail',
+			params: {projektarbeit_id, bperson_id: betreuer_person_id, student_uid},
+
+		};
+	},
+	fetchProjektarbeitenHistory(student_uid) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/fetchProjektarbeitenHistory',
+			params: {student_uid},
+
 		};
 	}
 };

public/js/api/factory/phrasen.js

@@ -41,5 +41,24 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/phrasen/getAllLanguages'
 		};
-	}
+	},
+	getPhrases(phrasesGroupedByCategory, languages = []) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/phrasen/getPhrases',
+			params: {
+				phrasesGroupedByCategory,
+				languages,
+			},
+		};
+	},
+	getTabulatorPhrases(languages = []) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/phrasen/getTabulatorPhrases',
+			params: {
+				languages: JSON.stringify(languages),
+			},
+		};
+	},
 };

public/js/apps/Abgabetool/Abgabetool.js

@@ -25,9 +25,6 @@ const app = Vue.createApp({
 		
 	},
 	computed: {
-		viewData() {
-			return { uid: this.uid}
-		},
 		student_uid_computed() {
 			return this.student_uid ?? this.uid
 		},
@@ -55,10 +52,10 @@ const app = Vue.createApp({
 	},
 	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>
-			<AbgabetoolAssistenz v-if="comp == 'AbgabetoolAssistenz'" :viewData="viewData" :stg_kz_prop="stg_kz_computed"></AbgabetoolAssistenz>
-			<DeadlineOverview v-if="comp == 'DeadlinesOverview'" :viewData="viewData"></DeadlineOverview>
+			<AbgabetoolStudent v-if="comp == 'AbgabetoolStudent'" :student_uid_prop="student_uid_computed"></AbgabetoolStudent>
+			<AbgabetoolMitarbeiter v-if="comp == 'AbgabetoolMitarbeiter'"></AbgabetoolMitarbeiter>
+			<AbgabetoolAssistenz v-if="comp == 'AbgabetoolAssistenz'" :stg_kz_prop="stg_kz_computed"></AbgabetoolAssistenz>
+			<DeadlineOverview v-if="comp == 'DeadlinesOverview'"></DeadlineOverview>
 		</template>
 	`
 });

public/js/apps/Cis/Cis.js

@@ -257,9 +257,14 @@ const app = Vue.createApp({
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
-			isMobile: Vue.computed(() => this.windowWidth < 767),
+			isMobile: Vue.computed(() => this.isMobile),
 		}	
 	},
+	computed: {
+		isMobile: function() {
+			return (this.windowWidth < 767);
+		}
+	},
 	methods: {
 		isInternalRoute(href) {
 			const internalBase = window.location.origin

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -433,6 +433,7 @@ export default {
 						:label="$p.t('wawi/ausgegebenam')"
 						name="ausgegebenam"
 						v-model="formData.ausgegebenam"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -449,6 +450,7 @@ export default {
 						:label="$p.t('wawi/retouram')"
 						name="retouram"
 						v-model="formData.retouram"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

public/js/components/Bootstrap/Modal.js

@@ -4,7 +4,9 @@ export default {
 	name: 'BootstrapModal',
 	data: () => ({
 		modal: null,
-		fullscreen: false
+		fullscreen: false,
+		expandBtnHovered: false,
+		expandBtnFocused: false,
 	}),
 	props: {
 		backdrop: {
@@ -70,6 +72,29 @@ export default {
 			this.$emit('toggleFullscreen')
 		}
 	},
+	computed: {
+		getExpandButtonStyles() {
+			const hovered = this.expandBtnHovered;
+			const focused = this.expandBtnFocused;
+			return `display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 1em;
+					height: 1em;
+					padding: 0;
+					border: 0;
+					background: transparent;
+					font-size: 1em;
+					opacity: 0.5;
+					color: inherit;
+					cursor: pointer;
+					line-height: 1;
+					transition: opacity 0.15s ease;
+					opacity: ${focused ? '1' : hovered ? '0.75' : '0.5'};
+					outline: ${focused ? '1px solid currentColor' : 'none'};
+					outline-offset: 2px;`
+		}	
+	},
 	mounted() {
 		if (this.$refs.modal)
 			this.modal = new bootstrap.Modal(this.$refs.modal, {
@@ -140,9 +165,13 @@ export default {
 					<div class="d-flex align-items-center ms-auto gap-2">
 						<button 
 							type="button" 
-							class="btn mb-1" 
+							:style="getExpandButtonStyles"
 							v-if="allowFullscreenExpand" 
 							@click="toggleFullscreen"
+							@mouseenter="expandBtnHovered = true"
+							@mouseleave="expandBtnHovered = false"
+							@focusin="expandBtnFocused = true"
+							@focusout="expandBtnFocused = false"
 							:aria-label="fullscreen ? 'Exit Fullscreen' : 'Enter Fullscreen'"
 						>
 							<i v-if="!fullscreen" class="fa-solid fa-expand"></i>

public/js/components/Calendar/LvPlan.js

@@ -194,6 +194,9 @@ export default {
 					v-else
 					:is="renderers[event.type]?.calendarEvent"
 					:event="event"
+					:timeSlotDisplayBehavior="
+						$props.mode.toLowerCase() === 'list' ? 'always' : 'default'
+					"
 				></component>
 			</div>
 		</template>

public/js/components/Calendar/Widget.js

@@ -97,6 +97,7 @@ export default {
 				<component
 					:is="renderers[event.type]?.calendarEvent"
 					:event="event"
+					:timeSlotDisplayBehavior="'always'"
 				></component>
 			</div>
 		</template>

public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js

@@ -2,6 +2,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";
+import {compareISODateValues, formatDateTime, formatISODate, getViennaTodayISO} from "./dateUtils.js";
+
 
 export const AbgabeMitarbeiterDetail = {
 	name: "AbgabeMitarbeiterDetail",
@@ -46,12 +48,7 @@ export const AbgabeMitarbeiterDetail = {
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
-			speedDialItems: [{
-				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
-				icon: "fa fa-plus",
-				command: this.openCreateNewAbgabeModal,
-				disabled: Vue.computed(() => !this.getAllowedToCreateNewTermin)
-			},
+			speedDialItems: [
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
 				icon: "fa fa-user-check",
@@ -81,6 +78,22 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
+		getSavedTerminInfoString(termin) {
+			const isUpdate = termin.updateamum != null;
+
+			const fullname = isUpdate
+				? termin.updatevon_fullname
+				: termin.insertvon_fullname;
+
+			const datetime = isUpdate
+				? termin.updateamum
+				: termin.insertamum;
+
+			return this.$p.t('ui/savedAtByV3', [formatDateTime(datetime), fullname])
+		},
+		terminIsInvalid(termin) {
+			return termin.note?.positiv == false && !termin.beurteilungsnotiz	
+		},
 		getNoteBezeichnung(termin){
 			if(termin.noteBackend?.bezeichnung) {
 				return termin.noteBackend?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
@@ -113,6 +126,8 @@ export const AbgabeMitarbeiterDetail = {
 					if(newTerminRes.note) {
 						newTerminRes.note = noteOpt
 						newTerminRes.noteBackend = noteOpt // certain UI elements should only reflect persisted state
+						termin.allowedToDelete = false
+						newTerminRes.allowedToDelete = false
 					}
 					newTerminRes.invertedFixtermin = !newTerminRes.fixtermin
 					const existingTerminRes = res.data[1]
@@ -132,13 +147,13 @@ export const AbgabeMitarbeiterDetail = {
 					} else {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
-
+						
 						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)
 					}
 					
-					this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
+					this.projektarbeit.abgabetermine.sort((a, b) => compareISODateValues(a.datum, b.datum))
 					
 					const index = this.projektarbeit.abgabetermine.findIndex(t => termin.paabgabe_id == t.paabgabe_id)
 					
@@ -159,7 +174,7 @@ export const AbgabeMitarbeiterDetail = {
 							'fixtermin': false,
 							'invertedFixtermin': true,
 							'kurzbz': '', // todo kurzbz textfield value vorschlag für qualgates
-							'datum': new Date().toISOString().split('T')[0],
+							'datum': getViennaTodayISO(),
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 							'beurteilungsnotiz': '',
 							'upload_allowed': false,
@@ -337,16 +352,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');
-
-			const month = padZero(date.getMonth() + 1); // Months are zero-based
-			const day = padZero(date.getDate());
-			const year = date.getFullYear();
-			
-			return `${day}.${month}.${year}`
+			return formatISODate(dateParam)
 		},
 		openCreateNewAbgabeModal() {
 			if(this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter') {
@@ -364,7 +370,7 @@ export const AbgabeMitarbeiterDetail = {
 					'fixtermin': false,
 					'invertedFixtermin': true,
 					'kurzbz': '',
-					'datum': new Date().toISOString().split('T')[0],
+					'datum': getViennaTodayISO(),
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 					'beurteilungsnotiz': '',
 					'upload_allowed': typ.upload_allowed_default,
@@ -398,7 +404,7 @@ export const AbgabeMitarbeiterDetail = {
 				'fixtermin': false,
 				'invertedFixtermin': true,
 				'kurzbz': '',
-				'datum': new Date().toISOString().split('T')[0],
+				'datum': getViennaTodayISO(),
 				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 				'beurteilungsnotiz': '',
 				'upload_allowed': false,
@@ -446,7 +452,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		getMessagePtStyle() {
-			// adjust outer spacing and internal padding to appear similar to doenload button in size
+			// adjust outer spacing and internal padding to appear similar to download button in size
 			return {
 				root: {
 					style: {
@@ -561,6 +567,12 @@ export const AbgabeMitarbeiterDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipBeurteilungsnotiz() {
+			return {
+				value: this.$p.t('abgabetool/c4beurteilungsnotizBeiNegNote'),
+				class: "custom-tooltip"
+			}
+		},
 		getProjektarbeitTitel() {
 			if(this.projektarbeit?.titel) return this.$capitalize(this.$p.t('abgabetool/c4titel')) + ': ' + this.projektarbeit.titel
 			
@@ -591,7 +603,7 @@ export const AbgabeMitarbeiterDetail = {
 				'fixtermin': false,
 				'invertedFixtermin': true,
 				'kurzbz': '',
-				'datum': new Date().toISOString().split('T')[0],
+				'datum': getViennaTodayISO(),
 				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 				'beurteilungsnotiz': '',
 				'upload_allowed': typ.upload_allowed_default,
@@ -627,6 +639,7 @@ export const AbgabeMitarbeiterDetail = {
 		dialogClass="bordered-modal modal-lg" 
 		:backdrop="true"
 		@hideBsModal="showAutomagicModalPhrase=false;"
+		bodyClass="px-4 py-4"
 	>
 		<template v-slot:title>
 			<div>
@@ -656,6 +669,7 @@ export const AbgabeMitarbeiterDetail = {
 							:enable-time-picker="false"
 							locale="de"
 							format="dd.MM.yyyy"
+							model-type="yyyy-MM-dd"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
@@ -806,6 +820,7 @@ export const AbgabeMitarbeiterDetail = {
 								:enable-time-picker="false"
 								locale="de"
 								format="dd.MM.yyyy"
+								model-type="yyyy-MM-dd"
 								:text-input="true"
 								auto-apply>
 							</VueDatePicker>
@@ -816,7 +831,7 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="col-12 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
-								:disabled="!termin.allowedToSave"
+								:disabled="!termin.allowedToSave || termin.abgabedatum !== null || termin.noteBackend"
 								:placeholder="getPlaceholderTermin(termin)"
 								v-model="termin.bezeichnung"
 								@change="handleChangeAbgabetyp(termin)"
@@ -851,8 +866,10 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
 						<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 class="col-12 col-md-9" v-tooltip.right="terminIsInvalid(termin) && getTooltipBeurteilungsnotiz">
+							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" 
+							:class="{ 'p-invalid': terminIsInvalid(termin) }"
+							 rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					
@@ -874,6 +891,7 @@ export const AbgabeMitarbeiterDetail = {
 											:disabled="true"
 											locale="de"
 											format="dd.MM.yyyy"
+											model-type="yyyy-MM-dd"
 											>
 										</VueDatePicker>
 									</div>
@@ -889,9 +907,6 @@ 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/c4noFileFound') }} </Message>-->
-<!--									</div>-->
 									
 								</div>						
 							</template>
@@ -904,10 +919,10 @@ export const AbgabeMitarbeiterDetail = {
 						<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">
+						<div class="col-12 col-md-5">
 							<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)">
+									<button v-if="termin.allowedToSave && !terminIsInvalid(termin)" 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>
@@ -932,6 +947,9 @@ export const AbgabeMitarbeiterDetail = {
 								</div>
 							</div>
 						</div>
+						<div class="col-12 col-md-4 align-content-center text-end text-muted small">
+							{{getSavedTerminInfoString(termin)}}
+						</div>
 					</div>
 				</AccordionTab>
 			</template>
@@ -944,7 +962,8 @@ export const AbgabeMitarbeiterDetail = {
 		<bs-modal 
 	 		ref="modalContainerZusatzdaten"
 	 		class="bootstrap-prompt"
-	 		dialogClass="bordered-modal modal-lg">
+	 		dialogClass="bordered-modal modal-lg"
+	 		bodyClass="px-4 py-4">
 			<template v-slot:title>
 				<div>
 					{{$capitalize( $p.t('abgabetool/c4enduploadZusatzdaten') )}}

public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js

@@ -3,6 +3,9 @@ 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 { formatISODate, getViennaTodayISO } from "./dateUtils.js";
+import { validateThesisTitle } from './titleValidation.js'
+
 
 export const AbgabeStudentDetail = {
 	name: "AbgabeStudentDetail",
@@ -20,7 +23,16 @@ export const AbgabeStudentDetail = {
 		VueDatePicker,
 		FhcOverlay
 	},
-	inject: ['notenOptions', 'isMobile', 'isViewMode', 'moodle_link'],
+	inject: [
+		'notenOptions',
+		'isMobile', 
+		'isViewMode', 
+		'moodle_link', 
+		'confetti_on_endupload',
+		'title_edit_allowed',
+		'siginfolink_german',
+		'siginfolink_english'
+	],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -31,12 +43,14 @@ export const AbgabeStudentDetail = {
 			default: false
 		}
 	},
+	emits: ['titel-updated'],
 	data() {
 		return {
 			loading: false,
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			editingTitel: '',
 			form: Vue.reactive({
 				sprache: '',
 				abstract: '',
@@ -49,9 +63,120 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	methods: {
+		confettiCannons() {
+			const container = document.getElementById('confetti-container');
+			if (!container) return;
+
+			const colors = ['#FFC107', '#FF5722', '#E91E63', '#00BCD4', '#4CAF50', '#9C27B0'];
+			const shapes = ['50%', '0%'];
+			const fragment = document.createDocumentFragment();
+
+			// Corner Cannons - Slowed Down)
+			const cannonCount = 150;
+
+			for (let i = 0; i < cannonCount; i++) {
+				const leftConfetti = document.createElement('div');
+				leftConfetti.classList.add('confetti-piece');
+				leftConfetti.style.left = '0px';
+				leftConfetti.style.top = '100%';
+
+				const rightConfetti = document.createElement('div');
+				rightConfetti.classList.add('confetti-piece');
+				rightConfetti.style.left = '100vw';
+				rightConfetti.style.top = '100%';
+
+				const colorL = colors[Math.floor(Math.random() * colors.length)];
+				const colorR = colors[Math.floor(Math.random() * colors.length)];
+				const shapeL = shapes[Math.floor(Math.random() * shapes.length)];
+				const shapeR = shapes[Math.floor(Math.random() * shapes.length)];
+
+				// Left Styles
+				leftConfetti.style.background = colorL;
+				leftConfetti.style.borderRadius = shapeL;
+				leftConfetti.style.width = `${Math.random() * 10 + 6}px`;
+				leftConfetti.style.height = `${Math.random() * 14 + 6}px`;
+				leftConfetti.style.setProperty('--blast-x', `${Math.random() * 50 + 10}vw`);
+				leftConfetti.style.setProperty('--blast-y', `-${Math.random() * 65 + 30}vh`);
+
+				// Right Styles
+				rightConfetti.style.background = colorR;
+				rightConfetti.style.borderRadius = shapeR;
+				rightConfetti.style.width = `${Math.random() * 10 + 6}px`;
+				rightConfetti.style.height = `${Math.random() * 14 + 6}px`;
+				rightConfetti.style.setProperty('--blast-x', `-${Math.random() * 50 + 10}vw`);
+				rightConfetti.style.setProperty('--blast-y', `-${Math.random() * 65 + 30}vh`);
+
+				// Increased durations to 3s - 5s for a floating gravity effect
+				const durationL = Math.random() * 2 + 3;
+				const durationR = Math.random() * 2 + 3;
+				const delayL = Math.random() * 0.2;
+				const delayR = Math.random() * 0.2;
+
+				leftConfetti.style.animation = `cannonBlast ${durationL}s linear ${delayL}s both`;
+				rightConfetti.style.animation = `cannonBlast ${durationR}s linear ${delayR}s both`;
+
+				fragment.appendChild(leftConfetti);
+				fragment.appendChild(rightConfetti);
+
+				setTimeout(() => leftConfetti.remove(), (delayL + durationL) * 1000);
+				setTimeout(() => rightConfetti.remove(), (delayR + durationR) * 1000);
+			}
+
+			container.appendChild(fragment);
+		},
+		openTitelEdit() {
+			this.editingTitel = this.projektarbeit.titel ?? '';
+			this.$refs.modalTitelEdit.show();
+		},
+		async saveTitel() {
+			
+			const validation = validateThesisTitle(this.editingTitel);
+
+			if (!validation.isValid) {
+				if (validation.error === 'empty') {
+					this.$fhcAlert.alertWarning(this.$p.t('abgabetool/c4emptyThesisTitle'))
+				} else if (validation.error === 'invalid_characters') {
+					this.$fhcAlert.alertWarning(this.$p.t('abgabetool/c4invalidCharactersThesisTitle'))
+
+				}
+				return false;
+			}
+
+			const confirmed = await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/c4confirmTitelSpeichern'),
+				acceptLabel: this.$capitalize(this.$p.t('ui/speichern')),
+				acceptClass: 'p-button-primary',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'p-button-secondary'
+			});
+
+			if (confirmed === false) return;
+
+			this.loading = true;
+			this.$api.call(
+				ApiAbgabe.postStudentProjektarbeitTitel(
+					this.projektarbeit.projektarbeit_id,
+					validation.cleanedTitle
+				)
+			).then(res => {
+				if (res.meta.status === 'success') {
+					this.projektarbeit.titel = res.data;
+					this.$emit('titel-updated', {
+						projektarbeit_id: this.projektarbeit.projektarbeit_id,
+						titel: res.data
+					});
+					this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4titelSavedSuccess')));
+					this.$refs.modalTitelEdit.hide();
+				} else {
+					this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4titelSaveError')));
+				}
+			}).finally(() => {
+				this.loading = false;
+			});
+		},
 		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) {
@@ -65,7 +190,7 @@ export const AbgabeStudentDetail = {
 				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningChooseFile')));
 				return false
 			}
-			
+
 			if(endupload) {
 				if(await this.$fhcAlert.confirm({
 					message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
@@ -77,16 +202,16 @@ export const AbgabeStudentDetail = {
 					return false
 				}
 			}
-			
+
 			return true;
 		},
 		async triggerEndupload() {
-			
+
 			if (!await this.validate(this.enduploadTermin, true))
 			{
 				return false;
 			}
-			
+
 			// post endabgabe
 			const formData = new FormData();
 			formData.append('paabgabetyp_kurzbz', this.enduploadTermin.paabgabetyp_kurzbz)
@@ -94,14 +219,14 @@ export const AbgabeStudentDetail = {
 			formData.append('paabgabe_id', this.enduploadTermin.paabgabe_id)
 			formData.append('student_uid', this.projektarbeit.student_uid)
 			formData.append('bperson_id', this.projektarbeit.bperson_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'])
-			
+
 			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
 				formData.append('file', this.enduploadTermin.file[i]);
 			}
@@ -109,39 +234,31 @@ export const AbgabeStudentDetail = {
 			this.$api.call(ApiAbgabe.postStudentProjektarbeitEndupload(formData))
 				.then(res => {
 					this.handleUploadRes(res, this.enduploadTermin)
+						if(this.confetti_on_endupload && res.meta.status == "success") {
+							this.confettiCannons()
+						}
 				}).finally(()=> {
-					this.loading = false
+				this.loading = false
 			})
-			
+
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
 			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))
 		},
 		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}`
+			return formatISODate(dateParam)
 		},
 		async upload(termin) {
 
-			// only do this on endupload
 			if (! await this.validate(termin))
 			{
 				return false;
 			}
-			
+
 			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'end') {
-				// open endupload form modal for further inputs
 				this.enduploadTermin = termin
 				this.$refs.modalContainerEnduploadZusatzdaten.show()
 			} else {
@@ -151,7 +268,7 @@ export const AbgabeStudentDetail = {
 				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]);
 				}
@@ -161,7 +278,7 @@ export const AbgabeStudentDetail = {
 					.then(res => {
 						this.handleUploadRes(res, termin)
 					}).finally(()=> {
-						this.loading = false
+					this.loading = false
 				})
 			}
 		},
@@ -169,21 +286,18 @@ export const AbgabeStudentDetail = {
 			if(res.meta.status == "success") {
 				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];
+				termin.abgabedatum = getViennaTodayISO();
 				if(res?.data?.signatur !== undefined) {
 					termin.signatur = res.data.signatur
 				}
-				
+
 			} else {
 				this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4fileUploadErrorv3')))
 			}
-			
+
 			if(res.meta.signaturInfo) {
 				this.$fhcAlert.alertInfo(res.meta.signaturInfo)
 			}
-			
-			
 		},
 		getOptionLabel(option) {
 			return option.sprache
@@ -195,7 +309,6 @@ export const AbgabeStudentDetail = {
 	},
 	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 ?? ''
@@ -203,15 +316,22 @@ export const AbgabeStudentDetail = {
 			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
 			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
 			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
-			
 		}
 	},
 	computed: {
+		getSignaturInfoLink() {
+			if(this.$p.user_language.value == 'German' && this.siginfolink_german) return this.siginfolink_german
+			else if (this.$p.user_language.value == 'English' && this.siginfolink_english) return this.siginfolink_english
+		},
+		getSignaturInfoAvailable() {
+			if(this.$p.user_language.value == 'German' && this.siginfolink_german) return true
+			else if (this.$p.user_language.value == 'English' && this.siginfolink_english) return true
+			else return false
+		},
 		getMoodleLink() {
-			return this.moodle_link + this.projektarbeit.studiengang_kz	
+			return this.moodle_link + this.projektarbeit.studiengang_kz
 		},
 		getMessagePtStyle() {
-			// adjust outer spacing and internal padding to appear similar to doenload button in size
 			return {
 				root: {
 					style: {
@@ -244,102 +364,84 @@ export const AbgabeStudentDetail = {
 			})
 			return qgatefound
 		},
+		isTitelEditAllowed() {
+			return this.title_edit_allowed && !this.isViewMode && !this.projektarbeit?.note;
+		},
 		getTooltipVerspaetet() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerspaetet')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerspaetet')), class: "custom-tooltip" }
 		},
 		getTooltipVerpasst() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerpasst')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerpasst')), class: "custom-tooltip" }
 		},
 		getTooltipAbzugeben() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbzugeben')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbzugeben')), class: "custom-tooltip" }
 		},
 		getTooltipStandard() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandardv2')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandardv2')), class: "custom-tooltip" }
 		},
 		getTooltipAbgegeben() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgegeben')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgegeben')), class: "custom-tooltip" }
 		},
 		getTooltipFixtermin() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipFixtermin')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipFixtermin')), class: "custom-tooltip" }
 		},
 		getTooltipAbgabeDetected() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')), class: "custom-tooltip" }
 		},
 		getTooltipNotAllowedToUpload() {
 			if(this.isViewMode) {
-				return {
-					value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedInViewMode')),
-					class: "custom-tooltip"
-				}
+				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"
-				}
+				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegularv2')), class: "custom-tooltip" }
 			}
 		},
 		getTooltipBeurteilungerforderlich() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')), class: "custom-tooltip" }
 		},
 		getTooltipBestanden() {
-			return {
-				value: this.$p.t('abgabetool/c4tooltipBestanden'),
-				class: "custom-tooltip"
-			}
+			return { value: this.$p.t('abgabetool/c4tooltipBestanden'), class: "custom-tooltip" }
 		},
 		getTooltipNichtBestanden() {
-			return {
-				value: this.$p.t('abgabetool/c4tooltipNichtBestanden'),
-				class: "custom-tooltip"
-			}
+			return { value: this.$p.t('abgabetool/c4tooltipNichtBestanden'), class: "custom-tooltip" }
 		},
-	},
-	created() {
-		
-	},
-	mounted() {
-
 	},
 	template: `
 		<FhcOverlay :active="loading"></FhcOverlay>
 
 		<div v-if="projektarbeit">
 		
-			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
+			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereichv2') )}}</h5>
 			<div class="row">
 				<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/c4betreuerv2') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
+					<p>{{$capitalize( $p.t('person/student') ) }}: {{projektarbeit?.student}}</p>
+
+					<p class="d-flex align-items-center gap-2 mb-2" style="min-width: 0;">
+						<span
+							:title="projektarbeit.titel"
+							style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 480px;"
+						>{{$capitalize( $p.t('abgabetool/c4titel') ) }}: {{projektarbeit?.titel}}</span>
+						<button
+							v-if="isTitelEditAllowed"
+							class="btn btn-sm btn-outline-secondary border-0 p-1"
+							v-tooltip.right="{ value: $capitalize($p.t('abgabetool/c4titelBearbeiten')), class: 'custom-tooltip' }"
+							@click="openTitelEdit"
+						>
+							<i class="fa-solid fa-pen"></i>
+						</button>
+					</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') }} 
-						<a :href="getMoodleLink" target="_blank">Moodle</a>
-					</p>
+					<div class="row">
+						<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 
+							<a :href="getMoodleLink" target="_blank">Moodle</a>
+						</p>
+					</div>
+					
+					<div class="row" v-if="getSignaturInfoAvailable">
+						<a :href="getSignaturInfoLink" target="_blank">{{$p.t('abgabetool/c4signaturinfo')}} <i class="fa-solid fa-circle-info"></i></a>
+					</div>
 				</div>
 			</div>
 			
@@ -357,7 +459,6 @@ export const AbgabeStudentDetail = {
 									<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>
@@ -408,8 +509,6 @@ export const AbgabeStudentDetail = {
 									</div>
 								</template>
 							</Inplace>
-
-						
 						</div>
 						
 						<div class="row mt-2">
@@ -430,7 +529,7 @@ export const AbgabeStudentDetail = {
 								</VueDatePicker>
 							</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">
@@ -466,7 +565,7 @@ export const AbgabeStudentDetail = {
 							<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
 								<div class="row">
-									<div style="width:100px; align-content: center;">
+									<div style="width:100px; align-content: end;">
 										<h6>{{ termin.abgabedatum?.split("-").reverse().join(".") }}</h6>
 									</div>
 									
@@ -481,9 +580,6 @@ export const AbgabeStudentDetail = {
 											<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>-->
 									</template>
 								</div>					
 							</template>
@@ -542,25 +638,66 @@ export const AbgabeStudentDetail = {
 				<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
 			</div>
 			
-		 </div>
-	 	
+		</div>
+
+		<div v-if="confetti_on_endupload" id="confetti-container"></div>
+
+		<bs-modal
+			ref="modalTitelEdit"
+			class="bootstrap-prompt"
+			dialogClass="bordered-modal"
+			bodyClass="px-4 py-4"
+		>
+			<template v-slot:title>
+				{{$capitalize( $p.t('abgabetool/c4titelBearbeiten') )}}
+			</template>
+			<template v-slot:default>
+				<div class="mb-2">
+					<label class="form-label fw-bold">
+						{{$capitalize( $p.t('abgabetool/c4titel') )}}
+					</label>
+					<Textarea 
+						v-model="editingTitel" 
+						rows="2" 
+						maxlength="1024" 
+						class="form-control w-100"
+						@keydown.enter.prevent="saveTitel"
+					/>
+					<div class="form-text text-end">{{ editingTitel.length }} / 1024</div>
+				</div>
+			</template>
+			<template v-slot:footer>
+				<button
+					class="btn btn-secondary"
+					@click="$refs.modalTitelEdit.hide()"
+				>
+					{{$capitalize( $p.t('abgabetool/c4Cancel') )}}
+				</button>
+				<button
+					class="btn btn-primary"
+					:disabled="!editingTitel.trim()"
+					@click="saveTitel"
+				>
+					<i class="fa-solid fa-floppy-disk me-1"></i>
+					{{$capitalize( $p.t('ui/speichern') )}}
+				</button>
+			</template>
+		</bs-modal>
+
 	 	<bs-modal 
 	 		ref="modalContainerEnduploadZusatzdaten"
 	 		class="bootstrap-prompt"
-	 		dialogClass="bordered-modal modal-lg">
+	 		dialogClass="bordered-modal modal-lg"
+	 		bodyClass="px-4 py-4">
 			<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>
@@ -576,15 +713,6 @@ export const AbgabeStudentDetail = {
 					</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">
@@ -631,7 +759,6 @@ export const AbgabeStudentDetail = {
 						<div class="col-9"></div>
 						<div class="col-2"><p>{{$capitalize( $p.t('abgabetool/c4gelesenUndAkzeptiert') )}}</p></div>
 						<div class="col-1">
-							
 							<Checkbox 
 								v-model="eidAkzeptiert" 
 								:binary="true" 
@@ -647,8 +774,8 @@ export const AbgabeStudentDetail = {
 				<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>
-	 	
     `,
 };
 

public/js/components/Cis/Abgabetool/AbgabeStudentTimeline.js

@@ -0,0 +1,251 @@
+import AbgabeterminStatusLegende from "./StatusLegende.js";
+import {formatDateTime} from "./dateUtils.js";
+
+export const AbgabeStudentTimeline = {
+	name: "AbgabeStudentTimeline",
+	components: {
+		AbgabeterminStatusLegende,
+		Timeline: primevue.timeline,
+	},
+	props: {
+		projekte: { type: Array, default: () => [] },
+		notenOptions: { type: Array, default: () => [] },
+		formatDateFn: { type: Function, required: true }
+	},
+	data() {
+		return {
+			legendExpanded: false,
+			expandedProjects: {}
+		}
+	},
+	computed: {
+		student() {
+			return this.projekte?.[0] ?? null
+		}
+	},
+	watch: {
+		projekte: {
+			immediate: true,
+			handler(val) {
+				// open all projects by default whenever the student changes
+				const state = {}
+				val?.forEach(p => { state[p.projektarbeit_id] = true })
+				this.expandedProjects = state
+				this.legendExpanded = false
+			}
+		}
+	},
+	methods: {
+		getNoteBezeichnung(projektarbeit) {
+			if(projektarbeit.note && this.notenOptions) {
+				const noteOpt = this.notenOptions.find(opt => opt.note == projektarbeit.note)
+				return noteOpt?.bezeichnung
+			} else {
+				return ''
+			}
+		},
+		getSavedTerminInfoString(termin) {
+			const isUpdate = termin.updateamum != null;
+
+			const fullname = isUpdate
+				? termin.updatevon_fullname
+				: termin.insertvon_fullname;
+
+			const datetime = isUpdate
+				? termin.updateamum
+				: termin.insertamum;
+
+			return this.$p.t('ui/savedAtByV3', [formatDateTime(datetime), fullname])
+		},
+		getItemBezeichnung(item) {
+			if (!item?.bezeichnung) return ''
+			return item.bezeichnung?.bezeichnung ?? item.bezeichnung
+		},
+		getItemNote(item) {
+			if (!item?.note) return ''
+			if (item.note?.bezeichnung) return item.note.bezeichnung
+			return this.notenOptions?.find(n => n.note == item.note)?.bezeichnung ?? String(item.note)
+		},
+		getIconClass(dateStyle) {
+			return ({
+				verspaetet:              'fa-solid fa-triangle-exclamation',
+				verpasst:                'fa-solid fa-calendar-xmark',
+				abzugeben:               'fa-solid fa-hourglass-half',
+				standard:                'fa-solid fa-clock',
+				abgegeben:               'fa-solid fa-paperclip',
+				beurteilungerforderlich: 'fa-solid fa-list-check',
+				bestanden:               'fa-solid fa-check',
+				nichtbestanden:          'fa-solid fa-circle-exclamation',
+			})[dateStyle] ?? ''
+		},
+		getBetreuerLabel(projekt) {
+			return projekt.erstbetreuer_full_name
+				|| (projekt.betreuer_vorname ? `${projekt.betreuer_vorname} ${projekt.betreuer_nachname}`.trim() : null)
+		},
+		toggleProject(id) {
+			this.expandedProjects[id] = !this.expandedProjects[id]
+		}
+	},
+	template: `
+	<div v-if="student">
+
+		<div class="d-flex align-items-baseline gap-2 mb-3 pb-2 border-bottom">
+			<span class="fw-bold fs-6">{{ student.student_vorname }} {{ student.student_nachname }}</span>
+			<span class="text-muted small">{{ student.student_uid }}</span>
+			<span v-if="student.matrikelnr" class="text-muted small ms-auto">{{ student.matrikelnr }}</span>
+		</div>
+
+		<div v-for="projekt in projekte" :key="projekt.projektarbeit_id" class="mb-2">
+
+			<button
+				class="btn btn-sm w-100 text-start d-flex align-items-center gap-2 rounded bg-light border-0 py-2 px-3"
+				@click="toggleProject(projekt.projektarbeit_id)"
+			>
+				<i
+					:class="expandedProjects[projekt.projektarbeit_id] ? 'fa-solid fa-chevron-down' : 'fa-solid fa-chevron-right'"
+					style="width: 12px; flex-shrink: 0;"
+				></i>
+				<span class="fw-semibold text-truncate flex-grow-1" :title="projekt.titel">
+					{{ projekt.titel || projekt.projekttyp_kurzbz || projekt.projektarbeit_id }}
+				</span>
+				
+				<span
+					v-if="projekt.note"
+					class="small fw-semibold mx-2 flex-shrink-0"
+				>
+					{{ getNoteBezeichnung(projekt) }}
+				</span>
+				
+				<span class="text-muted small me-1 flex-shrink-0">{{ projekt.studiensemester_kurzbz }}</span>
+				<span class="badge bg-secondary flex-shrink-0">{{ projekt.abgabetermine?.length ?? 0 }}</span>
+			</button>
+
+			<div v-show="expandedProjects[projekt.projektarbeit_id]" class="px-2 pt-1">
+
+				<div v-if="getBetreuerLabel(projekt)" class="text-muted small px-1 mb-2">
+					{{ projekt.betreuerart || $capitalize($p.t('abgabetool/c4erstbetreuerv2')) }}:
+					{{ getBetreuerLabel(projekt) }}
+				</div>
+
+				<Timeline :value="projekt.abgabetermine" align="right">
+
+					<template #marker="slotProps">
+						<!-- padding:0 overrides the 34px accordion left-padding from the -header CSS class -->
+						<div
+							:class="slotProps.item.dateStyle + '-header'"
+							style="height: 26px; width: 26px; padding: 0; border-radius: 4px; display: flex; align-items: center; justify-content: center; flex-shrink: 0;"
+						>
+							<i :class="getIconClass(slotProps.item.dateStyle)" style="font-size: 0.75rem;"></i>
+						</div>
+					</template>
+
+					<template #opposite="slotProps">
+						<div class="text-end small text-nowrap text-muted">
+							{{ formatDateFn(slotProps.item.datum) }}
+						</div>
+					</template>
+					
+					<template #content="slotProps">
+						<div class="small pb-1">
+
+							<div class="d-flex align-items-center gap-1 fw-semibold">
+							
+								<div
+									:class="slotProps.item.dateStyle + '-header'"
+									style="height:20px;width:20px;padding:0;border-radius:3px;display:flex;align-items:center;justify-content:center;flex-shrink:0;"
+								>
+									<i :class="getIconClass(slotProps.item.dateStyle)" style="font-size:.65rem;"></i>
+								</div>
+							
+								<span>
+									{{ getItemBezeichnung(slotProps.item) }}
+								</span>
+							
+								<i
+									v-if="slotProps.item.fixtermin"
+									class="fa-solid fa-lock text-muted"
+									title="Fixtermin"
+								></i>
+							
+								<i
+									v-if="slotProps.item.abgabedatum"
+									class="fa-solid fa-file text-muted"
+									:title="$capitalize($p.t('abgabetool/c4abgabedatum'))"
+								></i>
+							
+								<div class="flex-grow-1 text-end">
+									<span
+										v-if="slotProps.item.noteBackend?.bezeichnung"
+										class="fw-bold"
+									>
+										{{ slotProps.item.noteBackend?.positiv
+											? $capitalize($p.t('abgabetool/c4positivBenotet'))
+											: $capitalize($p.t('abgabetool/c4negativBenotet'))
+										}}
+									</span>
+							
+									<span
+										v-else-if="slotProps.item.bezeichnung?.benotbar"
+										class="fw-bold text-muted"
+									>
+										{{ $capitalize($p.t('abgabetool/c4notYetGraded')) }}
+									</span>
+								</div>
+							</div>
+					
+							<div
+								v-if="slotProps.item.kurzbz"
+								class="text-muted fst-italic ms-4"
+							>
+								{{ slotProps.item.kurzbz }}
+							</div>
+							
+							<div
+								v-if="slotProps.item.abgabedatum"
+								class="small text-muted ms-4"
+							>
+								{{ $capitalize($p.t('abgabetool/c4abgabedatum')) }}:
+								{{ formatDateFn(slotProps.item.abgabedatum) }}
+							</div>
+							
+							<div
+								v-if="slotProps.item.beurteilungsnotiz"
+								class="small ms-4 mt-1 text-muted"
+							>
+								{{ slotProps.item.beurteilungsnotiz }}
+							</div>
+							
+							<div
+								v-if="slotProps.item.insertamum"
+								class="small text-muted ms-4 mt-1"
+								style="font-size: .72rem;"
+							>
+								<i class="fa-solid fa-clock-rotate-left me-1"></i>
+								{{ getSavedTerminInfoString(slotProps.item) }}
+							</div>
+					
+						</div>
+					</template>
+
+				</Timeline>
+			</div>
+		</div>
+
+		<div class="mt-3 border-top pt-2">
+			<button
+				class="btn btn-link btn-sm p-0 text-muted text-decoration-none d-flex align-items-center gap-1"
+				@click="legendExpanded = !legendExpanded"
+			>
+				<i :class="legendExpanded ? 'fa-solid fa-chevron-down' : 'fa-solid fa-chevron-right'" style="font-size: 0.7rem;"></i>
+				Legende
+			</button>
+			<div v-show="legendExpanded" class="mt-2">
+				<AbgabeterminStatusLegende />
+			</div>
+		</div>
+
+	</div>
+	`
+}
+
+export default AbgabeStudentTimeline;

public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js

@@ -5,8 +5,9 @@ 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';
+import { dateFilter } from '../../../tabulator/filters/DatesManual.js';
 import {splitMailsHelper} from "../../../helpers/EmailHelpers.js";
+import { formatISODate, getViennaTodayISO, toViennaDate } from "./dateUtils.js";
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -33,7 +34,12 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
-			tableData: null,
+			filteredRows: null,
+			count: 0,
+			filteredcount: 0,
+			selectedcount: 0,
+			qgate1FilterSelected: [],
+			qgate2FilterSelected: [],
 			abgabetypenBetreuer: null,
 			detailIsFullscreen: false,
 			phrasenPromise: null,
@@ -48,7 +54,7 @@ export const AbgabetoolMitarbeiter = {
 			allowedNotenOptions: null,
 			notenOptionsNonFinal: null,
 			serienTermin: Vue.reactive({
-				datum: new Date(),
+				datum: getViennaTodayISO(),
 				bezeichnung: {
 					paabgabetyp_kurzbz: 'zwischen',
 					bezeichnung: 'Zwischenabgabe'
@@ -70,7 +76,7 @@ export const AbgabetoolMitarbeiter = {
 			abgabeTableOptions: {
 				minHeight: 250,
 				index: 'projektarbeit_id',
-				layout: 'fitDataStretch',
+				layout: 'fitData',
 				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
@@ -128,38 +134,82 @@ export const AbgabetoolMitarbeiter = {
 							handleClick: this.selectAllHandler
 						},
 						width: 50,
-						cssClass: 'sticky-col'
+						cssClass: 'sticky-col',
+						visible: true
 					},
-					{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/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/c4betreuerartv2'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), field: 'prevTermin',
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, headerFilter: false, headerSort: false, width: 140, minWidth: 50, visible: true, tooltip: false, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, minWidth: 140, visible: false,tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100,visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100,visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 150, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgformv2'))), field: 'orgform', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 50, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, minWidth: 100,visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 50, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true, visible: false, sorter: this.notenSorter, minWidth: 200, formatter: this.centeredTextFormatter},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, visible: true, minWidth: 100},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, width: 500, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerv2'))), field: 'betreuer_full_name', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerTitelPre'))), field: 'betreuer_titelpre', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerVorname'))), field: 'betreuer_vorname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerNachname'))), field: 'betreuer_nachname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerTitelPost'))), field: 'betreuer_titelpost', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerv2'))), field: 'zweitbetreuer_full_name', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerTitelPre'))), field: 'zweitbetreuer_titelpre', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerVorname'))), field: 'zweitbetreuer_vorname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerNachname'))), field: 'zweitbetreuer_nachname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerTitelPost'))), field: 'zweitbetreuer_titelpost', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerartv2'))), field: 'betreuerart_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))),
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
+						tooltip: this.toolTipFuncPrevTermin,
+						field: 'prevTermin', formatter: this.abgabeterminFormatter, width: 250, visible: 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: 250, tooltip: false},
+						tooltip: this.toolTipFuncNextTermin,
+						formatter: this.abgabeterminFormatter, width: 250, visible: true},
 					{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},
+						headerFilter: this.qgateHeaderFilterEditor,
+						headerFilterFunc: this.qgateHeaderFilterFunc,
+						headerFilterParams: {},
+						field: 'qgate1Status',
+						formatter: this.centeredTextFormatter,
+						titleFormatter: this.shortLongTitleFormatter,
+						titleFormatterParams: {
+							shortForm: 'QG1'
+						},
+						width: 50,
+						tooltip: (e, cell) => {
+							const data = cell.getData();
+							return data.qgate1Status
+						}
+					},
 					{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}
+						headerFilter: this.qgateHeaderFilterEditor,
+						headerFilterFunc: this.qgateHeaderFilterFunc,
+						headerFilterParams: {},
+						field: 'qgate2Status',
+						formatter: this.centeredTextFormatter,
+						titleFormatter: this.shortLongTitleFormatter,
+						titleFormatterParams: {
+							shortForm: 'QG2'
+						},
+						width: 50,
+						tooltip: (e, cell) => {
+							const data = cell.getData();
+							return data.qgate2Status
+						}
+					}
 				],
 				persistence: false,
-				persistenceID: 'abgabeTableBetreuer2026-02-26'
+				persistenceID: 'abgabeTableBetreuer2026-05-26'
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -190,11 +240,388 @@ export const AbgabetoolMitarbeiter = {
 					})
 					
 					this.selectedData = data
+					this.selectedcount = data.length;
+				}
+			},
+			{
+				event: 'dataFiltered',
+				handler: (filters, rows) => {
+					this.filteredRows = rows;
+					this.filteredcount = rows.length;
+
+					if (!this.selectedData.length) return;
+
+					const visibleData = new Set(rows.map(r => r.getData()));
+					const filteredOut = this.selectedData.filter(sd => !visibleData.has(sd));
+
+					if (!filteredOut.length) return;
+
+					const filteredOutSet = new Set(filteredOut);
+					this.$refs.abgabeTable.tabulator.getSelectedRows()
+						.filter(r => filteredOutSet.has(r.getData()))
+						.forEach(r => r.deselect());
 				}
 			}
 			]};
 	},
 	methods: {
+		notenSorter(a, b, aRow, bRow, column, dir, sorterParams) {
+			const aData = aRow.getData()
+			const bData = bRow.getData()
+			return aData.note - bData.note
+		},
+		async openBenotung(type, link) {
+			if(type === 'new') {
+				window.open(link, '_blank')
+			} else if(type === 'old') {
+				if(await this.$fhcAlert.confirm({
+					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')),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				window.open(link, '_blank')
+			} else {
+				// 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
+				}
+			}
+		},
+		formAction(cell) {
+			
+			const actionButtons = document.createElement('div');
+			actionButtons.className = "d-flex gap-3";
+			actionButtons.style.display = "flex";
+			actionButtons.style.alignItems = "stretch";
+			actionButtons.style.justifyContent = "start";
+			actionButtons.style.height = "100%";
+
+			const val = cell.getValue();
+			const data = cell.getRow().getData()
+			
+			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
+				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) => {
+					e.stopPropagation();
+					e.stopImmediatePropagation();
+					clickHandler();
+				});
+				return btn;
+			};
+
+			actionButtons.append(
+				createButton('fa fa-folder-open', 'abgabetool/c4details', () => this.setDetailComponent(val)),
+			);
+			
+			if(data.isCurrent && data.abgabetermine?.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null) && data.beurteilungLinkNew) {
+				actionButtons.append(createButton('fa fa-user-check', 'abgabetool/c4benoten', () => this.openBenotung('new', data.beurteilungLinkNew)))
+			} else if(data.abgabetermine?.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null) && data.beurteilungLinkOld) {
+				actionButtons.append(createButton('fa fa-user-check', 'abgabetool/c4benoten', () => this.openBenotung('old', data.beurteilungLinkOld)))
+			}
+			
+			if(this.checkForZweitbetreuerTokenMailAvailability(data)) {
+				actionButtons.append(createButton('fa fa-envelope-open-text', 'abgabetool/c4zweitBegutachterTokenMailSenden', () => this.sendZweitbetreuerToken(data)))
+
+			}
+			
+			return actionButtons;
+		},
+		checkForZweitbetreuerTokenMailAvailability(data) {
+			const hasEndabgabeWithUpload = !!data.abgabetermine.find(termin => termin.abgabedatum !== null && termin.paabgabetyp_kurzbz == 'end')
+			const hasZweitbetreuerWithoutBenutzerUid = data.zweitbetreuer_person_id !== null && data.zweitbetreuer_benutzer_uid === null
+			
+			return hasEndabgabeWithUpload && hasZweitbetreuerWithoutBenutzerUid
+		},
+		sendZweitbetreuerToken(data) {
+
+			this.$api.call(ApiAbgabe.sendZweitbetreuerTokenMail(data.projektarbeit_id, data.betreuer_person_id, data.student_uid))
+				.then(res => {
+					if(res.meta.status == 'success') this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/c4zweitBegutachterTokenMailSuccess'))
+				})
+		},
+		getDateStyleHtml(dateStyle) {
+			const iconMap = {
+				'verspaetet':              '<i class="fa-solid fa-triangle-exclamation"></i>',
+				'verpasst':                '<i class="fa-solid fa-calendar-xmark"></i>',
+				'abzugeben':               '<i class="fa-solid fa-hourglass-half"></i>',
+				'standard':                '<i class="fa-solid fa-clock"></i>',
+				'abgegeben':               '<i class="fa-solid fa-paperclip"></i>',
+				'beurteilungerforderlich': '<i class="fa-solid fa-list-check"></i>',
+				'bestanden':               '<i class="fa-solid fa-check"></i>',
+				'nichtbestanden':          '<i class="fa-solid fa-circle-exclamation"></i>',
+			};
+			return iconMap[dateStyle] ?? '';
+		},
+		statusHeaderFilterEditor(cell, onRendered, success, cancel, editorParams) {
+			const options = [
+				{ label: this.$p.t('abgabetool/c4positivBenotet'),    value: 'bestanden',              dateStyle: 'bestanden' },
+				{ label: this.$p.t('abgabetool/c4negativBenotet'),    value: 'nichtbestanden',         dateStyle: 'nichtbestanden' },
+				{ label: this.$p.t('abgabetool/c4tooltipVerspaetet'), value: 'verspaetet',             dateStyle: 'verspaetet' },
+				{ label: this.$p.t('abgabetool/c4tooltipVerpasst'),   value: 'verpasst',               dateStyle: 'verpasst' },
+				{ label: this.$p.t('abgabetool/c4tooltipAbzugeben'),  value: 'abzugeben',              dateStyle: 'abzugeben' },
+				{ label: this.$p.t('abgabetool/c4tooltipAbgegeben'),  value: 'abgegeben',              dateStyle: 'abgegeben' },
+				{ label: this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich'), value: 'beurteilungerforderlich', dateStyle: 'beurteilungerforderlich' },
+				{ label: this.$p.t('abgabetool/c4tooltipStandardv2'), value: 'standard',               dateStyle: 'standard' },
+			];
+
+			const field = cell.getField();
+			const stateKey = field + 'FilterSelected'; // e.g. dateStyleFilterSelected
+			let selected = [...(this[stateKey] || [])];
+
+			const wrapper = document.createElement('div');
+			wrapper.style.cssText = 'position: relative; width: 100%;';
+
+			const display = document.createElement('input');
+			display.readOnly = true;
+			display.placeholder = '';
+			display.style.cssText = 'padding: 4px; width: 100%; box-sizing: border-box; cursor: default; border: 1px solid; outline: none; background: #fff; appearance: none; caret-color: transparent;';
+
+			const dropdown = document.createElement('div');
+			dropdown.style.cssText = 'display: none; position: fixed; background: #fff; border: 1px solid; z-index: 9999; min-width: 220px; box-shadow: 0 2px 6px rgba(0,0,0,0.15);';
+
+			const updateDisplay = () => {
+				display.value = options
+					.filter(o => selected.includes(o.value))
+					.map(o => o.label)
+					.join(', ');
+			};
+
+			options.forEach(opt => {
+				const row = document.createElement('label');
+				row.style.cssText = 'display: flex; align-items: center; gap: 0; cursor: pointer; white-space: nowrap; padding-right: 8px;';
+				row.addEventListener('mousedown', e => e.preventDefault());
+
+				const cb = document.createElement('input');
+				cb.type = 'checkbox';
+				cb.value = opt.value;
+				cb.checked = selected.includes(opt.value);
+				cb.style.cssText = 'margin: 0 6px;';
+				cb.addEventListener('change', () => {
+					selected = cb.checked
+						? [...selected, opt.value]
+						: selected.filter(v => v !== opt.value);
+					this[stateKey] = [...selected];
+					updateDisplay();
+					success([...selected]);
+				});
+
+				// icon badge — same look as cell
+				const badge = document.createElement('div');
+				badge.className = opt.dateStyle + '-header';
+				badge.style.cssText = `min-width: 36px; height: 36px; display: flex; align-items: center; 
+				justify-content: center; flex-shrink: 0; padding: 0px 17px 0px 17px;`;
+				badge.innerHTML = this.getDateStyleHtml(opt.dateStyle);
+
+				const labelText = document.createElement('span');
+				labelText.textContent = opt.label;
+				labelText.style.cssText = 'margin-left: 6px;';
+
+				row.appendChild(cb);
+				row.appendChild(badge);
+				row.appendChild(labelText);
+				dropdown.appendChild(row);
+			});
+
+			updateDisplay();
+
+			display.addEventListener('click', () => {
+				if (dropdown.style.display === 'none') {
+					const rect = display.getBoundingClientRect();
+					dropdown.style.top = rect.bottom + 'px';
+					dropdown.style.left = rect.left + 'px';
+					dropdown.style.display = 'block';
+				} else {
+					dropdown.style.display = 'none';
+				}
+			});
+
+			display.addEventListener('blur', () => {
+				setTimeout(() => { dropdown.style.display = 'none'; }, 150);
+			});
+
+			document.body.appendChild(dropdown);
+			wrapper.appendChild(display);
+			cell.getElement().addEventListener('remove', () => dropdown.remove());
+			onRendered(() => display.focus());
+
+			return wrapper;
+		},
+		statusHeaderFilterFunc(filterVal, rowVal, rowData, filterParams) {
+			if (!filterVal || !filterVal.length) return true;
+			// rowVal is the raw dateStyle string on the flat table
+			return filterVal.some(val => val === rowVal);
+		},
+		qgateHeaderFilterEditor(cell, onRendered, success, cancel, editorParams) {
+
+			const options = [
+				{ label: '[+] ' + this.$p.t('abgabetool/c4positivBenotet'), value: 'positive' },
+				{ label: '[-] ' + this.$p.t('abgabetool/c4negativBenotet'), value: 'negative' },
+				{ label: '[~] ' + this.$p.t('abgabetool/c4notYetGraded'), value: 'not_graded' },
+				{ label: '[?] ' + this.$p.t('abgabetool/c4notSubmitted'), value: 'not_submitted' },
+				{ label: '[o] ' + this.$p.t('abgabetool/c4notHappenedYet'), value: 'not_happened' },
+				{ label: '[--] ' + this.$p.t('abgabetool/c4keinTerminVorhanden'), value: 'no_termin' },
+			];
+
+			const field = cell.getField();
+			const stateKey = field === 'qgate1Status' ? 'qgate1FilterSelected' : 'qgate2FilterSelected';
+			let selected = [...(this[stateKey] || [])]; // restore persistence state
+
+			const wrapper = document.createElement('div');
+			wrapper.style.cssText = 'position: relative; width: 100%;';
+
+			const display = document.createElement('input');
+			display.readOnly = true;
+			display.placeholder = '';
+			display.style.cssText = 'padding: 4px; width: 100%; box-sizing: border-box; cursor: default; border: 1px solid; outline: none; background: #fff; appearance: none; caret-color: transparent;';
+
+			const dropdown = document.createElement('div');
+			dropdown.style.cssText = 'display: none; position: fixed; background: #fff; border: 1px solid; z-index: 9999; min-width: 180px; box-shadow: 0 2px 6px rgba(0,0,0,0.15);';
+
+			options.forEach(opt => {
+				const row = document.createElement('label');
+				row.style.cssText = 'display: flex; align-items: center; gap: 6px; padding: 4px 8px; cursor: pointer; white-space: nowrap;';
+				row.addEventListener('mousedown', e => e.preventDefault());
+
+				const cb = document.createElement('input');
+				cb.type = 'checkbox';
+				cb.value = opt.value;
+				cb.checked = selected.includes(opt.value); // sync with persistence
+				cb.addEventListener('change', () => {
+					if (cb.checked) {
+						selected.push(opt.value);
+					} else {
+						selected = selected.filter(v => v !== opt.value);
+					}
+					this[stateKey] = [...selected]; // sync with persistence
+					display.value = options.filter(o => selected.includes(o.value)).map(o => o.label).join(', ');
+					success([...selected]);
+				});
+
+				row.appendChild(cb);
+				row.appendChild(document.createTextNode(opt.label));
+				dropdown.appendChild(row);
+			});
+
+			display.value = options.filter(o => selected.includes(o.value)).map(o => o.label).join(', ');
+
+			display.addEventListener('click', () => {
+				if (dropdown.style.display === 'none') {
+					const rect = display.getBoundingClientRect();
+					dropdown.style.top = rect.bottom + 'px';
+					dropdown.style.left = rect.left + 'px';
+					dropdown.style.display = 'block';
+				} else {
+					dropdown.style.display = 'none';
+				}
+			});
+
+			display.addEventListener('blur', () => {
+				setTimeout(() => { dropdown.style.display = 'none'; }, 150);
+			});
+
+			document.body.appendChild(dropdown);
+			wrapper.appendChild(display);
+
+			cell.getElement().addEventListener('remove', () => dropdown.remove());
+
+			onRendered(() => display.focus());
+
+			return wrapper;
+		},
+		qgateHeaderFilterFunc(filterVal, rowVal, rowData, filterParams) {
+			if (!filterVal || !filterVal.length) return true;
+
+			const matches = (val) => {
+				switch (val) {
+					case 'positive':     return rowVal === this.$p.t('abgabetool/c4positivBenotet');
+					case 'negative':     return rowVal === this.$p.t('abgabetool/c4negativBenotet');
+					case 'not_graded':   return rowVal === this.$p.t('abgabetool/c4notYetGraded');
+					case 'not_submitted':return rowVal === this.$p.t('abgabetool/c4notSubmitted');
+					case 'not_happened': return rowVal === this.$p.t('abgabetool/c4notHappenedYet');
+					case 'no_termin':    return rowVal === this.$p.t('abgabetool/c4keinTerminVorhanden');
+					default:             return true;
+				}
+			};
+
+			// OR logic — row passes if it matches any selected filter
+			return filterVal.some(val => matches(val));
+		},
+		shortLongTitleFormatter(cell, formatterParams, onRendered) {
+			const longForm = cell.getValue()
+			const shortForm = formatterParams?.shortForm
+
+			if(longForm && shortForm) {
+				return `<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>`
+			} else {
+				return `<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>`
+			}
+
+		},
+		toolTipFuncPrevTermin(e, cell, onRendered) {
+			const data = cell.getData();
+			return this.mapDateStyleToTabulatorTooltip(data.prevTermin.dateStyle);
+		},
+		toolTipFuncNextTermin(e, cell, onRendered) {
+			const data = cell.getData();
+			return this.mapDateStyleToTabulatorTooltip(data.nextTermin.dateStyle);
+		},
+		mapDateStyleToTabulatorTooltip(dateStyleString) {
+			switch(dateStyleString) {
+				case 'bestanden':
+					return this.$p.t('abgabetool/c4tooltipBestanden')
+					break;
+				case 'nichtbestanden':
+					return this.$p.t('abgabetool/c4tooltipNichtBestanden')
+					break;
+				case 'beurteilungerforderlich':
+					return this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')
+					break;
+				case 'verspaetet':
+					return this.$p.t('abgabetool/c4tooltipVerspaetet')
+					break;
+				case 'abgegeben':
+					return this.$p.t('abgabetool/c4tooltipAbgegeben')
+					break;
+				case 'verpasst':
+					return this.$p.t('abgabetool/c4tooltipVerpasst')
+					break;
+				case 'abzugeben':
+					return this.$p.t('abgabetool/c4tooltipAbzugeben')
+					break;
+				case 'standard':
+					return this.$p.t('abgabetool/c4tooltipStandardv2')
+					break;
+				default: return ''
+			}
+		},
 		handlePaUpdated(projektarbeit) {
 			this.checkAbgabetermineProjektarbeit(projektarbeit)
 			this.$refs.abgabeTable.tabulator.redraw(true)
@@ -207,7 +634,7 @@ export const AbgabetoolMitarbeiter = {
 			})
 			const uniqueRecipients = [...new Set(recipientList)];
 			const subject = ""; // empty subject line 
-			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
+			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, null, this.$fhcAlert, this.$p)
 		},
 		getQGateStatusList() {
 			return [
@@ -247,7 +674,7 @@ export const AbgabetoolMitarbeiter = {
 				if (val instanceof Date) {
 					dt = luxon.DateTime.fromJSDate(val);
 				} else if (typeof val === "string") {
-					dt = luxon.DateTime.fromISO(val);
+					dt = toViennaDate(val);
 				} else { // fallback
 					dt = luxon.DateTime.fromMillis(Number(val));
 				}
@@ -376,6 +803,9 @@ export const AbgabetoolMitarbeiter = {
 					}
 					this.stateRestored = true
 
+					// ensure that the filterCollapseables thingy has the correct values
+					this.$refs.abgabeTable.setSelectedFields();
+					
 				}
 
 			});
@@ -441,6 +871,32 @@ export const AbgabetoolMitarbeiter = {
 					projekt.qgate2StatusRank = 1
 				}
 			})
+			
+			// set shorthand statuscode once real status has been determined
+			projekt.qgate1StatusShort = this.mapRankToShortStatus(projekt.qgate1StatusRank)
+			projekt.qgate2StatusShort = this.mapRankToShortStatus(projekt.qgate2StatusRank)
+		},
+		mapRankToShortStatus(rank) {
+			switch(rank){
+				case 0: // kein termin vorhanden
+					return '--'
+					break;
+				case 1: // noch nicht stattgefunden
+					return 'o'
+					break;
+				case 2: // noch nicht abgegeben
+					return '?'
+					break;
+				case 3: // noch nicht benotet
+					return '~'
+					break;
+				case 4: // negativ benotet
+					return '-'
+					break;
+				case 5: // positiv benotet
+					return '+'
+					break;
+			}
 		},
 		checkAbgabetermineProjektarbeit(projekt) {
 			const now = luxon.DateTime.now()
@@ -450,7 +906,7 @@ export const AbgabetoolMitarbeiter = {
 				// while already looping through each termin, calculate datestyle beforehand
 				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 
-				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
+				const date = toViennaDate(termin.datum).endOf('day')
 				termin.luxonDate = date
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
 
@@ -472,7 +928,7 @@ export const AbgabetoolMitarbeiter = {
 			// seperate check for quality gates
 			this.checkQualityGateStatus(projekt)
 		},
-		abgabterminFormatter(cell) {
+		abgabeterminFormatter(cell) {
 			const val = cell.getValue()
 
 			if(val) {
@@ -504,14 +960,15 @@ export const AbgabetoolMitarbeiter = {
 						break
 				}
 
-				const bezeichnung = val.bezeichnung?.bezeichnung ?? val.bezeichnung
+				const typKurzbz = val.paabgabetyp_kurzbz ?? val.bezeichnung?.paabgabetyp_kurzbz
+				const bezeichnung = this.$p.t('abgabetool/c4paatyp' + typKurzbz)
 
 				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 class=' + val.dateStyle + "-header" + ' style="min-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>' +
+						'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">'+bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
 					'</div>'+
 					'</div>'
 
@@ -535,16 +992,19 @@ export const AbgabetoolMitarbeiter = {
 		},
 		selectAllHandler(e, cell) {
 			const table = cell.getTable();
-			const rows = table.getRows();
+			const rows = this.filteredRows ?? table.getRows();
 
 			// custom select all logic
 			const allowed = rows.filter(r => r.getData().selectable);
+			// since betreuerpage acctually has logic behind selectable flag, it is important to go over allowed only here
 			const selected = allowed.every(r => r.isSelected());
 
-			if(selected) {
+			if(selected){
 				allowed.forEach(r => r.deselect());
+				e.target.checked = false;
 			} else {
 				allowed.forEach(r => r.select());
+				e.target.checked = true;
 			}
 
 			// stop built-in handler
@@ -555,18 +1015,10 @@ export const AbgabetoolMitarbeiter = {
 			this.detailIsFullscreen = !this.detailIsFullscreen
 		},
 		getOptionLabelAbgabetyp(option){
-			return option.bezeichnung
+			return this.$p.t('abgabetool/c4paatyp' + option.paabgabetyp_kurzbz)
 		},
 		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}`;
+			return formatISODate(dateParam);
 		},
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -579,6 +1031,8 @@ export const AbgabetoolMitarbeiter = {
 		},
 		selectionCheck(row) {
 			const data = row.getData()
+			
+			// zweitbetreuer cant select projektarbeiten for serientermine
 			if(data?.betreuerart_kurzbz == 'Zweitbegutachter') return false
 			return true
 		},
@@ -602,7 +1056,7 @@ export const AbgabetoolMitarbeiter = {
 		addSeries() {
 			this.saving = true
 			this.$api.call(ApiAbgabe.postSerientermin(
-				this.serienTermin.datum.toISOString(),
+				this.serienTermin.datum,
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
@@ -700,7 +1154,7 @@ export const AbgabetoolMitarbeiter = {
 				termin.allowedToSave = paIsBenotet ? false : true
 				
 				// lektoren are not allowed to delete deadlines with existing submissions
-				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum && !termin.note
 				
 				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 
@@ -717,28 +1171,37 @@ export const AbgabetoolMitarbeiter = {
 			
 		},
 		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>'
+			const longForm = cell.getValue()
+			if(!longForm) return
+			const data = cell.getData()
+			const entry = Object.entries(data).find(entry => entry[1] == longForm)
+
+			// shortFormKey must have same keyname as longForm but with 'Short' appended 
+			const shortForm = data[entry[0]+'Short']
+
+			if(shortForm && longForm) {
+				return `<div style="display: flex; justify-content: start; align-items: center; height: 100%; width: 100%;">
+				<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>
+				</div>`;
+			} else {
+				return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+					'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">'+longForm+'</p></div>'
+			}
 		},
 		detailFormatter(cell) {
-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+			return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
 				'<a><i class="fa fa-folder-open" 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%">' +
-				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
+			return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+				'<a style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">'+val+'</a></div>'
 		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
@@ -753,15 +1216,19 @@ 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.projektarbeiten = data[0]?.retval?.map(projekt => {
 				this.checkAbgabetermineProjektarbeit(projekt)
 				projekt.selectable = projekt.betreuerart_kurzbz !== 'Zweitbegutachter'
 
+				if(this.notenOptions && projekt.note) {
+					const opt = this.notenOptions.find(n => n.note == projekt.note)
+					// TODO: mehrsprachig englisch -> nevermind the english field in
+					// notenoption->bezeichnung_mehrsprachig is ALWAYS german
+					projekt.note_bez = opt?.bezeichnung
+				}
+				
 				return {
 					...projekt,
 					details: {
@@ -777,9 +1244,10 @@ export const AbgabetoolMitarbeiter = {
 					titel: projekt.titel
 				}
 			})
+			this.count = this.projektarbeiten.length
 			
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-			this.$refs.abgabeTable.tabulator.setData(this.tableData);
+			this.$refs.abgabeTable.tabulator.setData(this.projektarbeiten);
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.$api.call(ApiAbgabe.getMitarbeiterProjektarbeiten(all))
@@ -828,9 +1296,20 @@ export const AbgabetoolMitarbeiter = {
 			}
 
 			this.serienTermin.upload_allowed = newVal.upload_allowed_default
-		},
+		}
 	},
 	computed: {
+		countsToHTML() {
+			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>';
+		},
 		emailItems() {
 			const menu = []
 
@@ -859,6 +1338,8 @@ export const AbgabetoolMitarbeiter = {
 		}
 	},
 	created() {
+		document.documentElement.classList.add('abgabetool');
+		
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 		// fetch config to avoid hard coded links
@@ -900,12 +1381,16 @@ export const AbgabetoolMitarbeiter = {
 	mounted() {
 		this.setupMounted()
 	},
+	beforeUnmount() {
+		document.documentElement.classList.remove('abgabetool');
+	},
 	template: `
 	<template v-if="phrasenResolved">
 		<FhcOverlay :active="loading || saving"></FhcOverlay>
 
 		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
-			dialogClass="modal-lg">
+			dialogClass="modal-lg"
+			bodyClass="px-4 py-4">
 			<template v-slot:title>
 				<div>
 					{{ $p.t('abgabetool/neueTerminserie') }}
@@ -925,6 +1410,7 @@ export const AbgabetoolMitarbeiter = {
 							:enable-time-picker="false"
 							locale="de"
 							format="dd.MM.yyyy"
+							model-type="yyyy-MM-dd"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
@@ -972,7 +1458,8 @@ export const AbgabetoolMitarbeiter = {
 		
 		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
 			dialogClass="modal-xl" :allowFullscreenExpand="true"
-			@toggle-fullscreen="handleToggleFullscreenDetail">
+			@toggle-fullscreen="handleToggleFullscreenDetail"
+			bodyClass="px-4 py-4">
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4abgabeMitarbeiterDetailTitle')}}
@@ -991,12 +1478,13 @@ export const AbgabetoolMitarbeiter = {
 		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
 		<div id="abgabetable" style="max-height:40vw;">
 		
-			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<h2>{{$p.t('abgabetool/abgabetoolTitleBetreuer')}}</h2>
 			<hr>
 			<core-filter-cmpt
 				:title="''"  
 				@uuidDefined="handleUuidDefined"
 				ref="abgabeTable"
+				:description="countsToHTML"
 				:newBtnShow="true"
 				:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
 				:newBtnDisabled="!selectedData.length"

public/js/components/Cis/Abgabetool/AbgabetoolStudent.js

@@ -1,15 +1,17 @@
 import AbgabeDetail from "./AbgabeStudentDetail.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
 import BsModal from "../../Bootstrap/Modal.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass} from "./getDateStyleClass.js";
-import ApiAuthinfo from "../../../api/factory/authinfo.js";
+import { validateThesisTitle } from './titleValidation.js'
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
+		Textarea: primevue.textarea,
 		BsModal,
 		AbgabeDetail,
 		FhcOverlay
@@ -18,7 +20,11 @@ export const AbgabetoolStudent = {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions),
 			isViewMode: Vue.computed(() => this.isViewMode),
-			moodle_link: Vue.computed(() => this.moodle_link)
+			moodle_link: Vue.computed(() => this.moodle_link),
+			title_edit_allowed: Vue.computed(() => this.title_edit_allowed),
+			confetti_on_endupload: Vue.computed(() => this.confetti_on_endupload),
+			siginfolink_german: Vue.computed(() => this.siginfolink_german),
+			siginfolink_english: Vue.computed(() => this.siginfolink_english)
 		}
 	},
 	props: {
@@ -39,6 +45,12 @@ export const AbgabetoolStudent = {
 			selectedProjektarbeit: null,
 			moodle_link: null,
 			uid: null,
+			title_edit_allowed: null,
+			confetti_on_endupload: null,
+			siginfolink_german: null,
+			siginfolink_english: null,
+			editingTitel: '',
+			editingProjektarbeit: null
 		};
 	},
 	computed: {
@@ -50,10 +62,67 @@ export const AbgabetoolStudent = {
 		}
 	},
 	methods: {
+		openTitelEdit(projektarbeit, event) {
+			// stop the click from toggling the accordion tab
+			event.stopPropagation();
+			this.editingProjektarbeit = projektarbeit;
+			this.editingTitel = projektarbeit.titel ?? '';
+			this.$refs.modalTitelEdit.show();
+		},
+		async saveTitel() {
+			const validation = validateThesisTitle(this.editingTitel);
+
+			if (!validation.isValid) {
+				if (validation.error === 'empty') {
+					this.$fhcAlert.alertWarning(this.$p.t('abgabetool/c4emptyThesisTitle'))
+				} else if (validation.error === 'invalid_characters') {
+					this.$fhcAlert.alertWarning(this.$p.t('abgabetool/c4invalidCharactersThesisTitle'))
+
+				}
+				return false;
+			}
+
+			const confirmed = await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/c4confirmTitelSpeichern'),
+				acceptLabel: this.$capitalize(this.$p.t('ui/speichern')),
+				acceptClass: 'p-button-primary',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'p-button-secondary'
+			});
+
+			if (confirmed === false) return;
+
+			this.loading = true;
+			this.$api.call(
+				ApiAbgabe.postStudentProjektarbeitTitel(
+					this.editingProjektarbeit.projektarbeit_id,
+					validation.cleanedTitle
+				)
+			).then(res => {
+				if (res.meta.status === 'success') {
+					// update the local list entry in-place so the accordion header reflects it immediately
+					this.editingProjektarbeit.titel = res.data;
+					// keep the open detail modal in sync if it happens to be showing this projektarbeit
+					if (this.selectedProjektarbeit?.projektarbeit_id === this.editingProjektarbeit.projektarbeit_id) {
+						this.selectedProjektarbeit.titel = res.data;
+					}
+					this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4titelSavedSuccess')));
+					this.$refs.modalTitelEdit.hide();
+				} else {
+					this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4titelSaveError')));
+				}
+			}).finally(() => {
+				this.loading = false;
+			});
+		},
+		handleTitelUpdated(projektarbeit_id, titel) {
+			const pa = this.projektarbeiten?.find(p => p.projektarbeit_id === projektarbeit_id);
+			if (pa) pa.titel = titel;
+		},
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
 			let qgate2Passed = false
-			
+
 			termine.forEach(t => {
 				const noteOption = this.notenOptions?.find(opt => opt.note == t.note)
 				if(noteOption && noteOption.positiv) {
@@ -70,7 +139,7 @@ export const AbgabetoolStudent = {
 		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
@@ -111,47 +180,35 @@ 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
-					
+
 					if(termin.paabgabetyp_kurzbz == 'end') {
-						// old assumed production logic when qgates are required
-						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesStrict(pa.abgabetermine)
-						
 						const inTime = termin.fixtermin ? !this.isPastDate(termin.datum) : true
 						termin.allowedToUpload = inTime && this.checkQualityGatesOptional(pa.abgabetermine)
-
-
-						// development purposes
-						// termin.allowedToUpload = this.checkQualityGatesStrict(pa.abgabetermine)
-						// termin.allowedToUpload = true
-
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
 					} else {
-						// this could confuse people since we should dont show people this flag
-						termin.allowedToUpload = termin.upload_allowed 
+						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 = getDateStyleClass(termin, this.notenOptions)
 				})
-				
+
 				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = this.student_uid
-				
+
 				this.selectedProjektarbeit = pa
 
 				this.$refs.modalContainerAbgabeDetail.show()
-				
+
 			}).finally(()=>{this.loading=false})
 		},
 		centeredTextFormatter(cell) {
@@ -173,8 +230,8 @@ export const AbgabetoolStudent = {
 		},
 		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>'
+			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()
@@ -184,19 +241,17 @@ export const AbgabetoolStudent = {
 			} else return '-'
 		},
 		buildMailToLink(projekt) {
-			// 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]
 			const projektarbeiten = data[0] ?? null
 			if(!projektarbeiten) return
 			this.projektarbeiten = projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
-				
+
 				return {
 					...projekt,
 					details: {
@@ -230,16 +285,14 @@ export const AbgabetoolStudent = {
 					.then(res => {
 						resolve(res)
 					})
-			})	
+			})
 		},
 		async setupMounted() {
 			this.loadProjektarbeiten()
 		},
 		getAccTabHeaderForProjektarbeit(projektarbeit) {
 			let title = ''
-			
 			title += projektarbeit.titel ?? this.$p.t('abgabetool/keinTitel')
-			
 			return title
 		},
 		getMailLink(projektarbeit) {
@@ -247,6 +300,31 @@ export const AbgabetoolStudent = {
 				return 'mailto:'+projektarbeit.email
 			} else return ''
 		},
+		getZweitbetreuerMailLink(projektarbeit) {
+			if(projektarbeit.zweitbetreuer_mail) {
+				return 'mailto:'+projektarbeit.zweitbetreuer_mail
+			} else return ''
+		},
+		hasZweitbetreuer(projektarbeit) {
+			return !!(projektarbeit.zweitbetreuer_person_id || projektarbeit.zweitbetreuer)
+		},
+		getErstbetreuerEmailLabel(projektarbeit) {
+			// with only one betreuer keep the generic label; with multiple betreuer
+			// distinguish the email rows by their betreuungsart bezeichnung
+			if(!this.hasZweitbetreuer(projektarbeit)) {
+				return this.$capitalize(this.$p.t('abgabetool/c4betreuerEmailKontaktv2'))
+			}
+			const art = projektarbeit.betreuerart_kurzbz
+				? this.$p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz)
+				: this.$p.t('abgabetool/c4betreuerv2')
+			return this.$capitalize(this.$p.t('abgabetool/c4emailBetreuungsart', [art]))
+		},
+		getZweitbetreuerEmailLabel(projektarbeit) {
+			const art = projektarbeit.zweitbetreuer_betreuerart_kurzbz
+				? this.$p.t('abgabetool/c4betrart' + projektarbeit.zweitbetreuer_betreuerart_kurzbz)
+				: ''
+			return this.$capitalize(this.$p.t('abgabetool/c4emailBetreuungsart', [art]))
+		},
 		getNoteBezeichnung(projektarbeit) {
 			if(projektarbeit.note && this.notenOptions) {
 				const noteOpt = this.notenOptions.find(opt => opt.note == projektarbeit.note)
@@ -266,12 +344,15 @@ export const AbgabetoolStudent = {
 			this.uid = authIdResponse.data.uid;
 		},
 	},
+	watch: {},
 	async created() {
+		// make sure zoom media query doesnt spill ever to other CIS4 sites
+		document.documentElement.classList.add('abgabetool');
+		
 		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 => {
 			if(res.meta.status == 'success') {
 				this.notenOptions = res.data[0]
@@ -284,16 +365,18 @@ 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
+			this.title_edit_allowed = res.data?.title_edit_allowed
+			this.confetti_on_endupload = res.data?.confetti_on_endupload
+			this.siginfolink_german = res.data?.siginfolink_german
+			this.siginfolink_english = res.data?.siginfolink_english
 		}).catch(e => {
 			this.loading = false
 		})
@@ -303,26 +386,73 @@ export const AbgabetoolStudent = {
 	mounted() {
 		this.setupMounted()
 	},
+	beforeUnmount() {
+		document.documentElement.classList.remove('abgabetool');
+	},
 	template: `
 <template v-if="phrasenResolved">
 	<FhcOverlay :active="loading"></FhcOverlay>
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
-		dialogClass="modal-xl" :allowFullscreenExpand="true">
+		dialogClass="modal-xl" :allowFullscreenExpand="true" bodyClass="px-4 py-4">
 		<template v-slot:title>
 			<div>
 				{{$capitalize( $p.t('abgabetool/c4abgabeStudentDetailTitle') )}}
 			</div>
 		</template>
 		<template v-slot:default>
-			<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+			<AbgabeDetail
+				:projektarbeit="selectedProjektarbeit"
+				@titel-updated="handleTitelUpdated"
+			></AbgabeDetail>
+		</template>
+	</bs-modal>
+	<bs-modal
+		ref="modalTitelEdit"
+		class="bootstrap-prompt"
+		dialogClass="bordered-modal"
+		 bodyClass="px-4 py-4"
+	>
+		<template v-slot:title>
+			{{$capitalize( $p.t('abgabetool/c4titelBearbeiten') )}}
+		</template>
+		<template v-slot:default>
+			<div class="mb-2">
+				<label class="form-label fw-bold">
+					{{$capitalize( $p.t('abgabetool/c4titel') )}}
+				</label>
+				<Textarea 
+					v-model="editingTitel" 
+					rows="2" 
+					maxlength="1024" 
+					class="form-control w-100"
+					@keydown.enter.prevent="saveTitel"
+				/>
+				<div class="form-text text-end">{{ editingTitel.length }} / 1024</div>
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button
+				class="btn btn-secondary"
+				@click="$refs.modalTitelEdit.hide()"
+			>
+				{{$capitalize( $p.t('abgabetool/c4Cancel') )}}
+			</button>
+			<button
+				class="btn btn-primary"
+				:disabled="!editingTitel.trim()"
+				@click="saveTitel"
+			>
+				<i class="fa-solid fa-floppy-disk me-1"></i>
+				{{$capitalize( $p.t('ui/speichern') )}}
+			</button>
 		</template>
 	</bs-modal>
 	
 	<h2>{{$capitalize( $p.t('abgabetool/abgabetoolTitle') )}}</h2>
 	<hr>
 	
-	<div v-if="projektarbeiten === null">
+	<div v-if="projektarbeiten === null || projektarbeiten?.length == 0">
 		{{$capitalize( $p.t('abgabetool/c4abgabeStudentNoProjectsFound') )}}
 	</div>
 	
@@ -332,8 +462,12 @@ export const AbgabetoolStudent = {
 				
 				<template #header>
 					<div class="d-flex row w-100">
-						<div class="text-start" :class="projektarbeit.note != null ? 'col-6' : 'col-12'">
-							<span>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
+						<div class="text-start" :class="projektarbeit.note != null ? 'col-6' : 'col-12'"
+							style="min-width: 0;">
+							<span
+								:title="getAccTabHeaderForProjektarbeit(projektarbeit)"
+								style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 600px;"
+							>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
 						</div>
 						<div class="col-6 text-end">
 							<span>{{getNoteBezeichnung(projektarbeit)}}</span>
@@ -382,7 +516,7 @@ export const AbgabetoolStudent = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuerEmailKontaktv2') )}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{ getErstbetreuerEmailLabel(projektarbeit) }}</div>
 					<div class="col-8 col-md-9">
 						<a :href="getMailLink(projektarbeit)"><i class="fa fa-envelope" style="color:#00649C"></i></a>
 					</div>
@@ -393,18 +527,46 @@ export const AbgabetoolStudent = {
 						{{ projektarbeit.zweitbetreuer?.first }}
 					</div>
 				</div>
+				<div v-if="projektarbeit.zweitbetreuer_person_id || projektarbeit.zweitbetreuer" class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ getZweitbetreuerEmailLabel(projektarbeit) }}</div>
+					<div class="col-8 col-md-9">
+						<a v-if="projektarbeit.zweitbetreuer_mail" :href="getZweitbetreuerMailLink(projektarbeit)"><i class="fa fa-envelope" style="color:#00649C"></i></a>
+						<span v-else>-</span>
+					</div>
+				</div>
 				<div class="row mt-2">
 					<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">{{$capitalize( $p.t('abgabetool/c4titel') )}}</div>
-					<div class="col-8 col-md-9">
-						{{ projektarbeit.titel }}	
+					<div class="col-8 col-md-9 d-flex align-items-center gap-2" style="min-width: 0;">
+						<span
+							:title="projektarbeit.titel"
+							style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"
+						>{{ projektarbeit.titel }}</span>
+						<button
+							v-if="title_edit_allowed && !isViewMode && projektarbeit.note == null"
+							class="btn btn-sm btn-outline-secondary border-0 p-1"
+							v-tooltip.right="{ value: $capitalize($p.t('abgabetool/c4titelBearbeiten')), class: 'custom-tooltip' }"
+							@click="openTitelEdit(projektarbeit, $event)"
+						>
+							<i class="fa-solid fa-pen"></i>
+						</button>
 					</div>
 				</div>
+				
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
+
+					<div class="col-8 col-md-9">
+						<span>{{getNoteBezeichnung(projektarbeit)}}</span>					
+					</div>
+					
+				</div>
 			</AccordionTab>
 		</template>
 	</Accordion>

public/js/components/Cis/Abgabetool/dateUtils.js

@@ -0,0 +1,33 @@
+const zone = 'Europe/Vienna';
+
+export function getViennaTodayISO() {
+	return luxon.DateTime.now().setZone(zone).toISODate();
+}
+
+export function formatISODate(dateParam) {
+	if (!dateParam) return '';
+
+	const date = luxon.DateTime.fromISO(String(dateParam), { zone });
+	return date.isValid ? date.toFormat('dd.MM.yyyy') : '';
+}
+
+export function formatDateTime(dateParam) {
+	if (!dateParam) return '';
+
+	const date = luxon.DateTime.fromSQL(dateParam);
+	return date.isValid ? date.toFormat("dd.MM.yyyy HH:mm") : '';
+}
+
+export function toViennaDate(dateParam) {
+	if (!dateParam) return null;
+
+	return luxon.DateTime.fromISO(String(dateParam), { zone });
+}
+
+export function compareISODateValues(a, b) {
+	if (!a && !b) return 0;
+	if (!a) return 1;
+	if (!b) return -1;
+
+	return String(a).localeCompare(String(b));
+}

public/js/components/Cis/Abgabetool/getDateStyleClass.js

@@ -1,8 +1,8 @@
 
 const zone = 'Europe/Vienna';
-const today = luxon.DateTime.now().setZone(zone);
 
 export function getDateStyleClass(termin, notenOptions) {
+	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;
@@ -28,10 +28,11 @@ export function getDateStyleClass(termin, notenOptions) {
 
 		// no submission yet
 		if (datum < today) return 'verpasst';
-		if (termin.diffindays <= 12) return 'abzugeben';
-		return 'standard';
+		
 	}
 
-	// GENERIC STATUS
-	return datum < today ? 'verpasst' : 'standard';
-}
+	// GENERIC STATUS — applies to all termine
+	if (datum < today) return 'verpasst';
+	if (termin.diffindays <= 12) return 'abzugeben';
+	return 'standard';
+}

public/js/components/Cis/Abgabetool/titleValidation.js

@@ -0,0 +1,25 @@
+/**
+ * Validates the thesis title on the frontend
+ * @param {string} title - The raw input from the title field
+ * @returns {object} Validation result containing status and cleaned title
+ */
+export function validateThesisTitle(title) {
+	if (!title) {
+		return { isValid: false, error: 'empty' };
+	}
+
+	// Replicate strip_tags / trim
+	const cleanedTitle = title.replace(/<\/?[^>]+(>|$)/g, "").trim();
+
+	if (cleanedTitle === '') {
+		return { isValid: false, error: 'empty' };
+	}
+
+	// Replicate the emoji/pictograph rejection
+	const emojiRegex = /\p{Extended_Pictographic}/u;
+	if (emojiRegex.test(cleanedTitle)) {
+		return { isValid: false, error: 'invalid_characters' };
+	}
+
+	return { isValid: true, cleanedTitle: cleanedTitle };
+}

public/js/components/Cis/LvPlan/OtherLvPlan.js

@@ -64,6 +64,9 @@ export default {
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
+			// do not show download links in otherLvPlan Mode
+			return false;
+
 			if (
 				!this.studiensemester_start ||
 				!this.studiensemester_ende ||

public/js/components/Cis/LvPlan/StgOrg.js

@@ -72,6 +72,9 @@ export default {
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
+			// do not show download links in StgOrg Mode
+			return false;
+
 			if (
 				!this.studiensemester_start ||
 				!this.studiensemester_ende ||
@@ -319,6 +322,10 @@ export default {
 				this.loadListGroup();
 			}
 		}
+
+		if (this.formData.stgkz) {
+			this.loadLvPlan();
+		}
 	},
 	template: `
 	<div class="cis-lvplan-stg-org d-flex flex-column h-100">

public/js/components/Cis/LvPlan/StgOrg_DEPR.js

@@ -1,187 +0,0 @@
-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: 'LvPlanStgOrg',
-	inject: {
-		cisRoot: {
-			from: 'cisRoot'
-		},
-	},
-	components: {
-		FhcCalendar,
-	},
-	props: {
-		viewData: Object,
-		propsViewData: Object
-	},
-	data() {
-		return {
-			studiensemester_kurzbz: null,
-			studiensemester_start: null,
-			studiensemester_ende: null,
-			uid: null,
-			isMitarbeiter: false,
-			isStudent: false,
-			listStg: [],
-			currentStgBezeichnung: 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;
-
-			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)
-				.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=' + type
-				+ '&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: "StgOrgLvPlan",
-				params: {
-					mode,
-					focus_date,
-					stgkz: this.propsViewData.stgkz,
-					sem: this.propsViewData.sem,
-					verband: this.propsViewData.verband,
-					gruppe: this.propsViewData.gruppe,
-				}
-			});
-		},
-		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.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
-				//local for test
-				/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
-			];
-		},
-		backToDropdown(){
-			this.$router.push({
-				name: "OverviewLvPlan",
-			});
-		}
-	},
-	created(){
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
-
-		if(this.propsViewData.stgkz) {
-			this.$api
-				.call(ApiLvPlan.getStudiengaenge())
-				.then(result => {
-					const currentStg = result.data.find(
-						item => item.studiengang_kz == this.propsViewData.stgkz
-					);
-					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	template: `
-	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
-		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
-		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
-			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
-			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
-			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
-			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
-		</p>
-		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
-
-		<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>
-	`,
-};

public/js/components/Cis/Profil/MitarbeiterProfil.js

@@ -36,7 +36,6 @@ export default {
 		return {
 			showModal: false,
 			editDataFilter: null,
-			arePhrasesPreloaded: false,
 			// tabulator options
 			funktionen_table_options: {
 				persistenceID: "filterTableMaProfilFunktionen",
@@ -49,6 +48,7 @@ export default {
 				responsiveLayoutCollapseUseFormatters: false,
 				responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
 				responsiveLayoutCollapseStartOpen: false,
+				locale: true,
 				columns: [
 					{
 						title:
@@ -63,7 +63,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+						title: "placeholder",
+						titlePhrase: "ui/bezeichnung",
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
@@ -71,7 +72,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+						title: "placeholder",
+						titlePhrase: "lehre/organisationseinheit",
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
@@ -79,7 +81,8 @@ export default {
 						responsive: 1,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+						title: "placeholder",
+						titlePhrase: "global/gueltigVon",
 						field: "Gültig_von",
 						headerFilterFunc: 'dates',
 						headerFilter: dateFilter,
@@ -91,7 +94,8 @@ export default {
 						responsive: 4,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+						title: "placeholder",
+						titlePhrase: "global/gueltigBis",
 						field: "Gültig_bis",
 						headerFilterFunc: 'dates',
 						headerFilter: dateFilter,
@@ -103,7 +107,8 @@ export default {
 						responsive: 3,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+						title: "placeholder",
+						titlePhrase: "profil/wochenstunden",
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
@@ -124,6 +129,7 @@ export default {
 				responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
 				data: [{betriebsmittel: "", Nummer: "", Ausgegeben_am: ""}],
 				responsiveLayoutCollapseStartOpen: false,
+				locale: true,
 				columns: [
 					{
 						title:
@@ -138,7 +144,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: "placeholder",
+						titlePhrase: "profil/entlehnteBetriebsmittel",
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
@@ -146,7 +153,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/inventarnummer')),
+						title: "placeholder",
+						titlePhrase: "profil/inventarnummer",
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -155,7 +163,8 @@ export default {
 						responsive: 2,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
+						title: "placeholder",
+						titlePhrase: "profil/ausgabedatum",
 						field: "Ausgegeben_am",
 						headerFilterFunc: 'dates',
 						headerFilter: dateFilter,
@@ -230,10 +239,6 @@ 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",
@@ -316,10 +321,6 @@ export default {
 	},
 
 	created() {
-		// preload phrasen
-		this.$p.loadCategory(["ui","lehre","global","profil"]).then(() => {
-			this.arePhrasesPreloaded = true;
-		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 	},
@@ -330,16 +331,13 @@ export default {
 		'data.mittel'(newVal) {
 			if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setData(newVal);
 		},
-		'language.value'(newVal) {
-			this.setTableColumnTitles()
-		}
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
     <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 ">
-            <!-- Bearbeiten Button -->
+		<div class="d-md-none col-12">
+			<!-- Bearbeiten Button -->
             <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
                     <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
@@ -352,9 +350,9 @@ export default {
                     </button>
                 </div>
             </div>
+			<!-- MOBILE PROFIL UPDATES -->
             <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
-                    <!-- MOBILE PROFIL UPDATES -->
                     <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates" ></fetch-profil-updates>
                 </div>
             </div>
@@ -367,30 +365,42 @@ export default {
             <!-- ROW WITH THE PROFIL INFORMATION -->
             <div class="row mb-4">
                 <div  class="col-lg-12 col-xl-6 ">
+					<!-- PROFIL INFORMATION -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- PROFIL INFORMATION -->
                             <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
+					<!-- CALENDAR SYNC OPTIONS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div class="row mb-4 d-md-none">
+            		    <div class="col">
+							<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+            		    </div>
+					</div>
+					<!-- MITARBEITER INFO -->
                     <div class="row mb-4">
                         <div  class=" col-lg-12">
-                            <!-- MITARBEITER INFO -->
                             <role-information :title="$p.t('profil','mitarbeiterInformation')" :data="roleInformation"></role-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                 </div>
                 <div  class="col-xl-6 col-lg-12 ">
+					<!-- EMAILS -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- EMAILS -->
                             <profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
                         </div>
                     </div>
+					<!-- PRIVATE KONTAKTE-->
                     <div class="row mb-4 ">
                         <div class="col">
-                            <!-- PRIVATE KONTAKTE-->
                             <div class="card">
                                 <div class="card-header">
                                     <div class="row">
@@ -412,9 +422,9 @@ export default {
                             </div>
                         </div>
                     </div>
+					<!-- PRIVATE ADRESSEN-->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- PRIVATE ADRESSEN-->
                             <div class="card">
                                 <div class="card-header">
                                     <div class="row">
@@ -439,10 +449,9 @@ export default {
                 </div>
             </div  >
             <div class="row">
+				<!-- FUNKTIONEN TABELLE -->
                 <div class="col-12 mb-4" >
-                    <!-- FUNKTIONEN TABELLE -->
                     <core-filter-cmpt
-						v-if="arePhrasesPreloaded"
                     	@tableBuilt="funktionenTableBuilt"
 						:title="$p.t('person','funktionen')"
 						ref="funktionenTable"
@@ -451,10 +460,9 @@ export default {
 						:sideMenu="false"
                      />
                 </div>
+				<!-- BETRIEBSMITTEL TABELLE -->
                 <div class="col-12 mb-4" >
-                    <!-- BETRIEBSMITTEL TABELLE -->
                     <core-filter-cmpt
-						v-if="arePhrasesPreloaded"
                     	@tableBuilt="betriebsmittelTableBuilt"
 						:title="$p.t('profil','entlehnteBetriebsmittel')"
 						ref="betriebsmittelTable"
@@ -467,11 +475,6 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
-				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
-				</div>
-			</div>
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
@@ -485,29 +488,36 @@ export default {
                     </button>
                 </div>
             </div>
-            <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
-                <div class="col mb-3">
-                    <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                </div>
-            </div>
-            <div class="row mb-3" >
-                <div class="col-12">
-                    <!-- AUSWEIS STATUS -->
-                    <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col">
-                    <!-- MAILVERTEILER -->
-                    <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
-                </div>
-            </div>
-			<div class="row">
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<!-- CALENDAR SYNC OPTIONS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div class="row mb-3 d-none d-md-block">
                 <div class="col">
 					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
                 </div>
 			</div>
+			<!-- PROFIL UPDATES -->
+            <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+                <div class="col mb-3">
+                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>
+            </div>
+			<!-- AUSWEIS STATUS -->
+            <div class="row mb-3" >
+                <div class="col-12">
+                    <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
+                </div>
+            </div>
+			<!-- MAILVERTEILER -->
+            <div class="row mb-3">
+                <div class="col">
+                    <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
+                </div>
+            </div>
         </div>
     </div>
 </div>

public/js/components/Cis/Profil/MitarbeiterViewProfil.js

@@ -20,7 +20,6 @@ export default {
 	data() {
 		return {
 			collapseIconFunktionen: true,
-			arePhrasesPreloaded: false,
 			funktionen_table_options: {
 				persistenceID: "filterTableMaViewProfilFunktionen",
 				persistence: {
@@ -31,6 +30,7 @@ export default {
 				responsiveLayout: "collapse",
 				responsiveLayoutCollapseUseFormatters: false,
 				responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
+				locale: true,
 				columns: [
 					//? option when wanting to hide the collapsed list
 
@@ -45,25 +45,24 @@ export default {
 						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t("ui/bezeichnung")),
+						title: "placeholder",
+						titlePhrase: "ui/bezeichnung",
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true,
 					},
 					{
-						title: Vue.computed(() =>
-							this.$p.t("lehre/organisationseinheit"),
-						),
+						title: "placeholder",
+						titlePhrase: "lehre/organisationseinheit",
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true,
 					},
 					{
-						title: Vue.computed(() =>
-							this.$p.t("global/gueltigVon"),
-						),
+						title: "placeholder",
+						titlePhrase: "global/gueltigVon",
 						field: "Gültig_von",
 						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
@@ -74,9 +73,8 @@ export default {
 						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() =>
-							this.$p.t("global/gueltigBis"),
-						),
+						title: "placeholder",
+						titlePhrase: "global/gueltigBis",
 						field: "Gültig_bis",
 						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
@@ -87,9 +85,8 @@ export default {
 						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() =>
-							this.$p.t("profil/wochenstunden"),
-						),
+						title: "placeholder",
+						titlePhrase: "profil/wochenstunden",
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
@@ -214,26 +211,12 @@ export default {
 			return quickLinks;
 		},
 	},
-	created() {
-		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
-			this.arePhrasesPreloaded = true;
-		});
-	},
 
 	template: /*html*/ `
 
 <div class="container-fluid text-break fhc-form"  >
     <!-- ROW -->
     <div class="row">
-        <!-- 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 -->
         <!-- MAIN PANNEL -->
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -242,27 +225,33 @@ export default {
             <div class="row mb-4">
                 <!-- FIRST KAESTCHEN -->
                 <div  class="col-lg-12 col-xl-6 ">
+					<!-- Profil Informationen -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- Profil Informationen -->
                             <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
                 </div>
                 <div  class="col-xl-6 col-lg-12 ">
+					<!-- EMAILS -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- EMAILS -->
                             <profil-emails :title="this.$p.t('person','email')" :data="personEmails"></profil-emails>
                         </div>
                     </div>
                     <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
+					<!-- roleInformation -->
                     <div class="row mb-4">
                         <div  class=" col-lg-12">
-                            <!-- roleInformation -->
                             <role-information :data="roleInformation" :title="$p.t('profil','mitarbeiterInformation')"></role-information>
                         </div>
                     </div>
@@ -276,7 +265,7 @@ export default {
             <div class="row">
                 <!-- FIRST TABLE -->
                 <div class="col-12 mb-4" >
-                    <core-filter-cmpt v-if="arePhrasesPreloaded" @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt @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>
@@ -284,15 +273,15 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!-- VISIBLE UNTIL VIEWPORT MD -->
-			<div v-if="quickLinks.length" class="row mb-4">
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
 				<div class="col">
 					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>
 			</div>
+			<!-- MAILVERTEILER -->
 			<div class="row">
 				<div class="col">
-					<!-- MAILVERTEILER -->
 					<mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
 				</div>
 			</div>

public/js/components/Cis/Profil/Profil.js

@@ -176,6 +176,7 @@ export const Profil = {
 			this.data = data.profil_data.data;
 			this.calendarSyncUrls = data.calendar_sync_urls ?? [];
 			this.authPermissions = data.permissions;
+			console.log(data.profil_data);
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {

public/js/components/Cis/Profil/StudentProfil.js

@@ -29,13 +29,12 @@ export default {
 		QuickLinks,
 		CalendarSync,
 	},
-	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
+	inject: ["sortProfilUpdates", "collapseFunction", "isEditable"],
 	data() {
 		return {
 			showModal: false,
 			collapseIconBetriebsmittel: true,
 			editDataFilter: null,
-			arePhrasesPreloaded: false,
 			// tabulator options
 			zutrittsgruppen_table_options: {
 				persistenceID: "filterTableStudentProfilZutrittsgruppen",
@@ -44,9 +43,9 @@ export default {
 				},
 				minHeight: 200,
 				layout: "fitColumns",
-				columns: [
-					{
-					title: Vue.computed(() => this.$p.t('profil/zutrittsGruppen')),
+				columns: [{
+					title: "placeholder",
+					titlePhrase: "profil/zutrittsGruppen",
 					field: "bezeichnung"
 					}
 				],
@@ -62,6 +61,7 @@ export default {
 				responsiveLayoutCollapseUseFormatters: false,
 				responsiveLayoutCollapseFormatter: Vue.$collapseFormatter,
 				responsiveLayoutCollapseStartOpen: false,
+				locale: true,
 				columns: [
 					{
 						title:
@@ -75,7 +75,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(()=>this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: "placeholder",
+						titlePhrase: "profil/entlehnteBetriebsmittel",
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
@@ -83,7 +84,8 @@ export default {
 						responsive: 0,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/inventarnummer')) ,
+						title: "placeholder",
+						titlePhrase: "profil/inventarnummer",
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -92,7 +94,8 @@ export default {
 						responsive: 2,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')) ,
+						title: "placeholder",
+						titlePhrase: "profil/ausgabedatum",
 						field: "Ausgegeben_am",
 						headerFilterFunc: 'dates',
 						headerFilter: dateFilter,
@@ -259,19 +262,9 @@ export default {
 		},
 	},
 	created() {
-		// preload phrasen
-		this.$p.loadCategory('profil').then(() => {
-			this.arePhrasesPreloaded = true;
-		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 	},
-	watch: {
-		'language.value'(newVal) {
-			if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setColumns(this.betriebsmittel_table_options.columns)
-			if(this.$refs.zutrittsgruppenTable) this.$refs.zutrittsgruppenTable.tabulator.setColumns(this.zutrittsgruppen_table_options.columns)
-		}
-	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form">
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal"
@@ -292,14 +285,13 @@ export default {
 					</button>
 				</div>
 			</div>
+			<!-- MOBILE PROFIL UPDATES -->
 				<div v-if="data.profilUpdates" class="row mb-3">
 					<div class="col">
-						<!-- 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 ">
@@ -308,30 +300,42 @@ export default {
 				<!-- ROW WITH THE PROFIL INFORMATION -->
 				<div class="row mb-4 ">
 					<div  class="col-lg-12 col-xl-6 ">
+						<!-- PROFIL INFORMATION -->
 						<div class="row mb-4">
 							<div class="col">
-								<!-- PROFIL INFORMATION -->
 								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
+						<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+						<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+							<div class="col">
+								<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+							</div>
+						</div>
+						<!-- CALENDAR SYNC OPTIONS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+						<div class="row mb-4 d-md-none">
+            			    <div class="col">
+								<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+            			    </div>
+						</div>
+						<!-- STUDENT INFO -->
 						<div class="row mb-4">
 							<div  class=" col-lg-12">
-								<!-- STUDENT INFO -->
 								<role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 							</div>
 						</div>
 					<!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
 					</div>
 					<div  class="col-xl-6 col-lg-12 ">
+						<!-- EMAILS -->
 						<div class="row mb-4">
 							<div class="col">
-								<!-- EMAILS -->
 								<profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
 							</div>
 						</div>
+						<!-- PRIVATE KONTAKTE-->
 						<div class="row mb-4 ">
 							<div class="col">
-								<!-- PRIVATE KONTAKTE-->
 								<div class="card">
 									<div class="card-header">
 										<div class="row">
@@ -354,9 +358,9 @@ export default {
 						</div>
 					</div>
 
+					<!-- PRIVATE ADRESSEN-->
 					<div class="row mb-4">
 						<div class="col">
-							<!-- PRIVATE ADRESSEN-->
 							<div class="card">
 								<div class="card-header">
 									<div class="row">
@@ -384,7 +388,6 @@ export default {
 			<div class="row">
 				<div class="col-12 mb-4" >
 					<core-filter-cmpt
-					v-if="arePhrasesPreloaded"
 					@tableBuilt="betriebsmittelTableBuilt"
 					:title="$p.t('profil','entlehnteBetriebsmittel')"
 					ref="betriebsmittelTable"
@@ -394,7 +397,6 @@ export default {
 				</div>
 				<div class="col-12 mb-4" >
 					<core-filter-cmpt
-					v-if="arePhrasesPreloaded"
 					@tableBuilt="zutrittsgruppenTableBuilt" 
 					:title="$p.t('profil','zutrittsGruppen')" 
 					ref="zutrittsgruppenTable" 
@@ -408,11 +410,6 @@ export default {
 		</div>
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
-				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
-				</div>
-			</div>
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
@@ -426,9 +423,21 @@ export default {
 					</button>
 				</div>
 			</div>
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<!-- CALENDAR SYNC OPTIONS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div class="row mb-3 d-none d-md-block">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
+			<!-- PROFIL UPDATES -->
 			<div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
 				<div class="col mb-3">
-					<!-- PROFIL UPDATES -->
 					<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
 				</div>
 			</div>
@@ -438,18 +447,13 @@ export default {
 				</div>
 			</div>
 			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+			<!-- MAILVERTEILER -->
             <div class="row mb-3">
 				<div class="col">
-					<!-- HIER SIND DIE MAILVERTEILER -->
 					<mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 				</div>
-            <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
             </div>
-			<div class="row">
-                <div class="col">
-					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
-                </div>
-			</div>
+            <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
         <!-- END OF SIDE PANEL -->
         </div>
     <!-- END OF CONTAINER ROW-->

public/js/components/Cis/Profil/StudentViewProfil.js

@@ -121,12 +121,12 @@ export default {
                             <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
-                    <!-- SECOND ROW OF FIRST COLUMN -->
-					<div class="row mb-4">
-                        <div class="col">
-                            
-                        </div>
-                    </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
@@ -155,7 +155,8 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- START OF THE FIRST ROW IN THE SIDE PANEL -->
-            <div v-if="quickLinks.length" class="row mb-4">
+            <!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
 				<div class="col">
 					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>

public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js

@@ -3,6 +3,11 @@ export default {
 		event: {
 			type: Object,
 			required: true
+		},
+		timeSlotDisplayBehavior: {
+			type: String,
+			default: "default",
+			// options: default, always, never 
 		}
 	},
 	computed:{
@@ -50,7 +55,17 @@ export default {
 			return luxon.Duration
 				.fromISOTime(this.event.ende)
 				.toISOTime({ suppressSeconds: true });
-		}
+		},
+		timeSlotDisplayClasses() {
+			switch (this.$props.timeSlotDisplayBehavior) {
+				case "always":
+					return "d-grid";
+				case "never":
+					return "d-none";
+				default:
+					return "d-none d-xl-grid";
+			}
+		},
 	},
 	template: /*html*/`
 	<div
@@ -58,8 +73,9 @@ export default {
 		@wheel.stop
 	>
 		<div
-			v-if="!event.allDayEvent && event?.beginn && event?.ende"
-			class="event-time d-none d-xl-grid h-100"
+			v-if="!event?.allDayEvent && event?.beginn && event?.ende"
+			:class="timeSlotDisplayClasses"
+			class="event-time h-100"
 		>
 			<span>{{ start }}</span>
 			<span>{{ end }}</span>

public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js

@@ -3,6 +3,11 @@ export default {
 		event: {
 			type: Object,
 			required: true
+		},
+		timeSlotDisplayBehavior: {
+			type: String,
+			default: "default",
+			// options: default, always, never 
 		}
 	},
 	computed: {
@@ -50,21 +55,33 @@ export default {
 			return luxon.Duration
 				.fromISOTime(this.event.ende)
 				.toISOTime({ suppressSeconds: true });
-		}
+		},
+		timeSlotDisplayClasses() {
+			switch (this.$props.timeSlotDisplayBehavior) {
+				case "always":
+					return "d-grid";
+				case "never":
+					return "d-none";
+				default:
+					return "d-none d-xl-grid";
+			}
+		},
 	},
 	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"
+			v-if="!event?.allDayEvent && event?.beginn && event?.ende"
+			:class="timeSlotDisplayClasses"
+			class="event-time h-100"
 		>
 			<span>{{ start }}</span>
 			<span>{{ end }}</span>
 		</div>
 		<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 in event.lektor.slice(0, 3)"
 				class="event-lectors"
@@ -77,7 +94,6 @@ export default {
 			>
 				... +{{ event.lektor.length - 3 }}
 			</span>
-			<span class="event-place">{{ event.ort_kurzbz }}</span>
 		</div>
 	</div>
 	`,

public/js/components/Funktionen/Funktionen.js

@@ -551,6 +551,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_von"
+							model-type="yyyy-MM-dd"
 							name="datum_von"
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
@@ -566,6 +567,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_bis"
+							model-type="yyyy-MM-dd"
 							name="datum_bis"
 							:label="$p.t('global/bis')"
 							auto-apply

public/js/components/Studierendenantrag/Form/Unterbrechung.js

@@ -90,6 +90,17 @@ export default {
 								msg,
 								severity: this.statusSeverity
 							});
+
+							if (this.data.status === 'Abgelehnt' &&  this.data?.status_grund?.trim())
+							{
+								this.$emit('setInfos', [
+									{
+										title: this.$p.t('studierendenantrag', 'status_grund_abgelehnt'),
+										body: this.data.status_grund,
+										severity: this.statusSeverity
+									}
+								]);
+							}
 						}
 						return result;
 					}

public/js/components/Studierendenantrag/Leitung.js

@@ -18,7 +18,8 @@ export default {
 	},
 	props: {
 		stgL: Array,
-		stgA: Array
+		stgA: Array,
+		abmeldung_enabled: Boolean
 	},
 	data() {
 		return {
@@ -255,6 +256,7 @@ export default {
 		<leitung-actions
 			:stg-a="stgkzA"
 			:stg-l="stgkzL"
+			:abmeldung_enabled="abmeldung_enabled"
 			:selectedData="selectedData"
 			:columns="columns"
 			@reload="reload"

public/js/components/Studierendenantrag/Leitung/Actions.js

@@ -10,7 +10,8 @@ export default {
 		selectedData: Array,
 		columns: Array,
 		stgL: Array,
-		stgA: Array
+		stgA: Array,
+		abmeldung_enabled: Boolean,
 	},
 	emits: [
 		'reload',
@@ -64,7 +65,7 @@ export default {
 	template: `
 	<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
 		<div class="d-flex align-items-center gap-2">
-			<actions-new @reload="$emit('reload')"></actions-new>
+			<actions-new v-if="abmeldung_enabled" @reload="$emit('reload')"></actions-new>
 			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="$p.t('table','reload')">
 				<i class="fa-solid fa-rotate-right"></i>
 			</button>

public/js/components/Studierendenantrag/Leitung/Table.js

@@ -55,7 +55,7 @@ export default {
 			return this.$api
 				.call(ApiStudstatusLeitung.getHistory(this.lastHistoryClickedId))
 				.then(res => {
-					this.historyData = res.data.sort((a, b) => a.insertamum > b.insertamum);
+					this.historyData = res.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js

@@ -470,6 +470,7 @@ export default {
 							:label="$p.t('admission', 'anmeldundRtAm')"
 							type="DatePicker"
 							v-model="formData.anmeldedatum"
+							model-type="yyyy-MM-dd"
 							auto-apply
 							:enable-time-picker="false"
 							text-input

public/js/components/Stv/Studentenverwaltung/Details/Details.js

@@ -293,6 +293,7 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
+						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today

public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js

@@ -103,6 +103,7 @@ export default {
 						<form-input
 							type="DatePicker"
 							v-model="formData.nachgereicht_am"
+							model-type="yyyy-MM-dd"
 							name="nachgereicht_am"
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply

public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js

@@ -26,13 +26,13 @@ export default {
 		internMail(event) {
 			if (this.internMails.length)
 			{
-				splitMailsHelper(this.internMails, event, null, this.$fhcAlert, this.$p)
+				splitMailsHelper(this.internMails, event, null, null, this.$fhcAlert, this.$p)
 			}
 		},
 		privateMail(event) {
 			if (this.privateMails.length)
 			{
-				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
+				splitMailsHelper(this.privateMails, event, null,null, this.$fhcAlert, this.$p)
 			}
 		}
 	},

public/js/components/Stv/Studentenverwaltung/Details/Konto.js

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: new Date()
+			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
 		};
 	},
 	computed: {
@@ -259,6 +259,7 @@ export default {
 					<form-input
 						type="DatePicker"
 						v-model="counterdate"
+						model-type="yyyy-MM-dd"
 						input-group
 						:enable-time-picker="false"
 						text-input

public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js

@@ -79,6 +79,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

@@ -88,7 +88,7 @@ export default {
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				buchungsdatum: new Date(),
+				buchungsdatum: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,6 +154,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js

@@ -467,6 +467,7 @@ export default {
 						:label="$p.t('ui', 'von')"
 						type="DatePicker"
 						v-model="formData.von"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -501,6 +502,7 @@ export default {
 						:label="$p.t('global', 'bis')"
 						type="DatePicker"
 						v-model="formData.bis"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js

@@ -325,6 +325,7 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -389,6 +390,7 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
+						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -454,6 +456,7 @@ export default {
 						:label="$p.t('lehre', 'zgvDoktorDatum')"
 						type="DatePicker"
 						v-model="data.zgvdoktordatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdoktordatum"
 						no-today
 						auto-apply

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js

@@ -5,6 +5,7 @@ import PvAutoComplete from "../../../../../../../index.ci.php/public/js/componen
 import ApiStvProjektarbeit from '../../../../../api/factory/stv/projektarbeit.js';
 
 export default {
+	name: 'ProjektarbeitDetails',
 	components: {
 		FormForm,
 		FormInput,
@@ -110,6 +111,10 @@ export default {
 			this.formData.anmerkung = null;
 			this.$refs.formDetails.clearValidation();
 		},
+		setFormData(projektarbeit) {
+			this.formData = projektarbeit;
+			if (this.formData.firma_id) this.formData.firma = {firma_id: this.formData.firma_id, name: this.formData.firma_name};
+		},
 		getFormData(newProjektarbeit, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
 
 			this.additional_lehrveranstaltung_id = additional_lehrveranstaltung_id;
@@ -148,8 +153,7 @@ export default {
 			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};
+					this.setFormData(result.data)
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError)

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js

@@ -9,6 +9,7 @@ import ProjektarbeitDetails from "./Details.js";
 import Projektbetreuer from "./Projektbetreuer.js";
 
 export default {
+	name: 'Projektarbeit',
 	components: {
 		CoreFilterCmpt,
 		BsModal,
@@ -213,17 +214,6 @@ export default {
 							});
 							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);
-
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
@@ -264,6 +254,7 @@ export default {
 		actionEditProjektarbeit() {
 			this.statusNew = false;
 			this.toggleMenu('details');
+			this.$refs.projektbetreuer.getProjektbetreuer(this.editedProjektarbeit?.projektarbeit_id, this.editedProjektarbeit?.studiensemester_kurzbz);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionEditBetreuer() {
@@ -280,18 +271,26 @@ export default {
 				.then(this.deleteProjektarbeit)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		saveProjektarbeit() {
+			if(this.statusNew) this.addNewProjektarbeit()
+			else this.updateProjektarbeit()
+		},
 		addNewProjektarbeit() {
 			this.$refs.projektarbeitDetails.addNewProjektarbeit()
 				.then((result) => {
+					if(result?.data?.length) {
+						this.editedProjektarbeit = result.data[0]
+						this.$refs.projektarbeitDetails.setFormData(this.editedProjektarbeit)
+						this.toggleMenu('betreuer');
+					}
 					this.projektarbeitSaved();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateProjektarbeit() {
 			this.$refs.projektarbeitDetails.updateProjektarbeit()
-				.then((result) => {
-					this.projektarbeitSaved();
-				})
+				.then(() => this.$refs.projektbetreuer.saveIfOpen())
+				.then(() => this.projektarbeitSaved())
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteProjektarbeit(projektarbeit_id) {
@@ -308,7 +307,8 @@ export default {
 		projektarbeitSaved() {
 			this.reload();
 			this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-			this.hideModal('projektarbeitModal');
+			if(!this.statusNew) this.hideModal('projektarbeitModal');
+			else this.statusNew = false
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.$refs.projektbetreuer.setDefaultStunden(projekttyp_kurzbz);
@@ -321,22 +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;
-				}
+			if (this.statusNew == false && tabId == 'details') {
+				
+				this.$refs.projektarbeitDetails.getFormData(
+					this.statusNew, this.editedProjektarbeit?.studiensemester_kurzbz, this.editedProjektarbeit?.lehrveranstaltung_id
+				);
+				this.$refs.projektarbeitDetails.loadProjektarbeit(this.editedProjektarbeit?.projektarbeit_id);
+			} else if(tabId == 'betreuer') {
+				this.$refs.projektbetreuer.getFormData(
+					this.editedProjektarbeit ? this.editedProjektarbeit.projekttyp_kurzbz : null
+				);
+				this.$refs.projektbetreuer.getProjektbetreuer(this.editedProjektarbeit?.projektarbeit_id, this.editedProjektarbeit?.studiensemester_kurzbz);
 			}
+		},
+		resetFormData() {
+			this.$refs.projektarbeitDetails.resetForm()
+			this.$refs.projektbetreuer.resetForm()
 		}
 	},
 	template: `
@@ -358,46 +358,29 @@ export default {
 		</core-filter-cmpt>
 
 		<!--Modal: projektarbeitModal-->
-		<bs-modal ref="projektarbeitModal" dialog-class="modal-xl modal-dialog-scrollable" header-class="flex-wrap pb-0">
+		<bs-modal ref="projektarbeitModal" :dialog-class="(statusNew ? 'modal-xl ' : 'fhc-xxl-modal ' ) + 'modal-dialog-scrollable'"
+		 	header-class="flex-wrap pb-0"
+		 	@hideBsModal="resetFormData"
+		 	>
 			<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>
 
-			<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="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="toggleMenu('betreuer')">{{$p.t('projektarbeit', 'betreuerGross')}}</button>
-					</li>
-				</ul>
-			</template>
-
-			<div class="tab-content" id="pa_content">
-				<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">
-							</projektarbeit-details>
-						</div>
-					</div>
+			<div class="row" >
+				<div :class="statusNew ? 'col-12' : 'col-6'">
+					<projektarbeit-details ref="projektarbeitDetails" :student="student" @projekttyp-changed="setDefaultStunden">
+					</projektarbeit-details>
 				</div>
 
-				<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" @betreuer-saved="reload"></projektbetreuer>
-						</div>
-					</div>
+				<div :class="statusNew ? '' : 'col-6'" :style="statusNew ? 'display: none' : ''">
+					<projektbetreuer ref="projektbetreuer" :config="config" @betreuer-saved="reload"></projektbetreuer>
 				</div>
 			</div>
 
 			<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 type="button" class="btn btn-secondary" @click="resetFormData" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button class="btn btn-primary" @click="saveProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
 			</template>
 
 		</bs-modal>

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js

@@ -10,6 +10,7 @@ import Vertrag from "./Vertrag.js";
 import ApiStvProjektbetreuer from '../../../../../api/factory/stv/projektbetreuer.js';
 
 export default {
+	name: 'Projektbetreuer',
 	components: {
 		CoreFilterCmpt,
 		BsModal,
@@ -120,7 +121,7 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '100',
-				selectableRows: true,
+				selectableRows: 1,
 				index: 'betreuer_id',
 				persistence:{
 					columns: true, //persist column layout
@@ -292,21 +293,44 @@ export default {
 						this.$refs.projektbetreuerTable.tabulator.replaceData(this.addIds(result.data));
 					})
 					.catch(this.$fhcAlert.handleSystemError);
+
+				// get other initial data
+				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);
 			} else {
 				this.emptyBetreuerList();
 			}
 		},
-		saveProjektbetreuer() {
-			this.$refs.formProjektbetreuer.call(
+		_doSaveBetreuer() {
+			return this.$refs.formProjektbetreuer.call(
 				ApiStvProjektbetreuer.saveProjektbetreuer(this.projektarbeit_id, this.getFormDataWithBetreuer())
-			)
-			.then(result => {
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+			).then(result => {
 				this.getProjektbetreuer(this.projektarbeit_id, this.studiensemester_kurzbz);
 				this.resetModes();
 				this.$emit('betreuerSaved');
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+				return result;
+			});
+		},
+		// called by combined save button
+		saveIfOpen() {
+			if (!this.betreuerFormOpened) return Promise.resolve(null);
+			return this._doSaveBetreuer();
+		},
+		saveProjektbetreuer() {
+			this._doSaveBetreuer()
+				.then(() => this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')))
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		searchBetreuer(event) {
 			if (this.abortController.betreuer) {
@@ -539,7 +563,7 @@ export default {
 			</form-form>
 
 			<button class="btn btn-primary" v-show="betreuerFormOpened" @click="saveProjektbetreuer">
-				{{ $p.t('projektarbeit', 'betreuerSpeichern') }}
+				{{ $p.t('projektarbeit', 'betreuerSpeichernv2') }}
 			</button>
 			<!-- <div class = "mt-5" v-if="beurteilungDownloadLink !== null">
 				<div class="mb-1">

public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js

@@ -276,6 +276,7 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.datum"
+				model-type="yyyy-MM-dd"
 				name="datum"
 				:label="$p.t('global/datum')"
 				auto-apply
@@ -291,6 +292,7 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bestaetigtam"
+				model-type="yyyy-MM-dd"
 				name="bestaetigtam"
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
@@ -306,13 +308,14 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bewerbung_abgeschicktamum"
+				model-type="yyyy-MM-dd HH:mm:ss"
 				name="bewerbung_abgeschicktamum"
 				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 				auto-apply
-				:enable-time-picker="false"
-				format="dd.MM.yyyy"
+				:enable-time-picker="true"
+				format="dd.MM.yyyy HH:mm:ss"
 				text-input
-				preview-format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy HH:mm:ss"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"
 				>

public/js/components/Stv/Studentenverwaltung/List/New.js

@@ -285,6 +285,7 @@ export default {
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
+								model-type="yyyy-MM-dd"
 								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input

public/js/components/filter/Filter.js

@@ -22,8 +22,14 @@ import TableDownload from './Table/Download.js';
 import collapseAutoClose from '../../directives/collapseAutoClose.js';
 
 import moduleLayoutFitDataStretchFrozen from '../../tabulator/layouts/fitDataStretchFrozen.js';
+import InternalToExternalEventBroadcastModule from "../../tabulator/customModules/InternalToExternalEventBroadcastModule.js"
+import MenuExtensionModule from "../../tabulator/customModules/MenuExtensionModule.js"
+import ResponsiveLayoutExtensionModule from "../../tabulator/customModules/ResponsiveLayoutExtensionModule.js"
+
+import { debounce } from "../../helpers/DebounceHelper.js";
 
 import ApiFilter from '../../api/factory/filter.js';
+import ApiPhrases from '../../api/factory/phrasen.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -84,8 +90,9 @@ export const CoreFilterCmpt = {
 		useSelectionSpan: {
 			type: Boolean,
 			default: true
-		}
+		},
 	},
+	inject: ["language"],
 	data: function() {
 		return {
 			uuid: 0,
@@ -120,7 +127,8 @@ export const CoreFilterCmpt = {
 				headerFilter: false,
 				group: false,
 				page: false,
-			}
+			},
+			collapsedHeadingLocalizationTimer: null,
 		};
 	},
 	computed: {
@@ -183,20 +191,25 @@ export const CoreFilterCmpt = {
 			return columns;
 		},
 		fieldIdsForVisibilty() {
-			if (!this.tableBuilt)
-				return [];
-			return this.tabulator.getColumns().filter(col => {
-				let def = col.getDefinition();
-				return !def.frozen && def.title && def.formatter != "responsiveCollapse";
-			}).map(col => col.getField());
-		},
-		fieldNames() {
-			if (!this.tableBuilt)
-				return {};
-			return this.tabulator.getColumns().reduce((res, col) => {
-				res[col.getField()] = col.getDefinition().title;
-				return res;
-			}, {});
+			if (!this.tableBuilt) return [];
+
+			const localizedColumnTitles = this.tabulator.getLang().columns;
+			const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale;
+			return this.tabulator
+				.getColumns()
+				.filter((col) => {
+					let def = col.getDefinition();
+					let title =
+						isTabulatorLocalized && localizedColumnTitles[def.field]
+							? localizedColumnTitles[def.field]
+							: def.title;
+					return (
+						!def.frozen &&
+						title &&
+						def.formatter != "responsiveCollapse"
+					);
+				})
+				.map((col) => col.getField());
 		},
 		idExtra() {
 			if (!this.uuid)
@@ -204,14 +217,38 @@ export const CoreFilterCmpt = {
 			return '-' + this.uuid;
 		},
 		columnsForFilter() {
-			if (!this.filteredColumns || !this.datasetMetadata)
-				return [];
-			const filterTitles = this.filteredColumns.reduce((a,c) => {
-				a[c.field] = c.title;
-				return a;
-			}, {});
-			return this.datasetMetadata.map(el => ({...el, ...{title: filterTitles[el.name]}}));
-		}
+			if (!this.filteredColumns || !this.datasetMetadata) return [];
+
+			const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale;
+
+			let filterTitles;
+			if (isTabulatorLocalized) {
+				const localizedColumnTitles = this.tabulator.getLang().columns;
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = localizedColumnTitles[c.field];
+					return a;
+				}, {});
+			} else {
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = c.title;
+					return a;
+				}, {});
+			}
+
+			return this.datasetMetadata.map((el) => ({
+				...el,
+				...{ title: filterTitles[el.name] },
+			}));
+		},
+	},
+	watch: {
+		"language.value": {
+			handler(newSelectedLanguage) {
+				if (!this.$props.tabulatorOptions.locale) return;
+
+				this.tabulator.setLocale(newSelectedLanguage);
+			},
+		},
 	},
 	methods: {
 		reloadTable() {
@@ -220,6 +257,10 @@ export const CoreFilterCmpt = {
 			else
 				this.getFilter();
 		},
+		setSelectedFields() {
+			const cols = this.tabulator.getColumns();
+			this.selectedFields = cols.filter(col => col.isVisible()).map(col => col.getField());
+		},
 		async initTabulator() {
 			let placeholder = '< Phrasen Plugin not loaded! >';
 			if (this.$p) {
@@ -263,6 +304,10 @@ export const CoreFilterCmpt = {
 					persistence: this.persistence,
 				}, ...(this.tabulatorOptions || {})};
 
+			if (tabulatorOptions.locale) {
+				tabulatorOptions = await this.configureTabulatorLocalizations(tabulatorOptions);
+			}
+
 			// set default height if no height property is set
 			if (tabulatorOptions.height === undefined &&
 				tabulatorOptions.minHeight === undefined &&
@@ -291,10 +336,10 @@ export const CoreFilterCmpt = {
 			}
 
 			// Start the tabulator with the build options
-			this.tabulator = new Tabulator(
-				this.$refs.table,
-				tabulatorOptions
-			);
+			this.tabulator = new Tabulator(this.$refs.table, {
+				...tabulatorOptions,
+				debugInvalidOptions: false,
+			});
 			// If event handlers have been provided
 			if (Array.isArray(this.tabulatorEvents) && this.tabulatorEvents.length > 0)
 			{
@@ -302,7 +347,10 @@ export const CoreFilterCmpt = {
 				for (let evt of this.tabulatorEvents)
 					this.tabulator.on(evt.event, evt.handler);
 			}
-			this.tabulator.on('tableBuilt', () => {this.tableBuilt = true; this.$emit('tableBuilt');});
+			this.tabulator.on('tableBuilt', () => {
+				this.tableBuilt = true;
+				this.$emit('tableBuilt');
+			});
 			this.tabulator.on("rowSelectionChanged", data => {
 				this.selectedData = data;
 			});
@@ -337,7 +385,7 @@ export const CoreFilterCmpt = {
 				this.tabulator.on('tableBuilt', () => {
 					const cols = this.tabulator.getColumns();
 					this.fields = cols.map(col => col.getField());
-					this.selectedFields = cols.filter(col => col.isVisible()).map(col => col.getField());
+					this.setSelectedFields();
 					if (this.tabulator.options.persistence.headerFilter)
 						this._setHeaderFilter();
 				});
@@ -348,6 +396,121 @@ export const CoreFilterCmpt = {
 				this.filterActive = filters.length > 0;
 				this.$emit("headerFilterOn", this.filterActive);
 			});
+			this.tabulator.on("localized", () => {
+				this.tabulator.modules.responsiveLayout.generateCollapsedContent();
+			});
+		},
+		async configureTabulatorLocalizations(tabulatorOptions) {
+			tabulatorOptions.locale = this.$p.user_language.value;
+			tabulatorOptions.langs = {};
+
+			const genericTabulatorPhrasesResponse = await this.$api.call(
+				ApiPhrases.getTabulatorPhrases(),
+			);
+			const genericTabulatorPhrasesData = genericTabulatorPhrasesResponse.data;
+			Object.keys(genericTabulatorPhrasesData).forEach((language) => {
+				let genericTabulatorPhraseToTranslationMapper = {};
+				genericTabulatorPhrasesData[language].forEach((phrase) => {
+					genericTabulatorPhraseToTranslationMapper[phrase.phrase] = phrase.text;
+				});
+
+				tabulatorOptions.langs[language] = {
+					data: {
+						loading: genericTabulatorPhraseToTranslationMapper["loading"],
+						error: genericTabulatorPhraseToTranslationMapper["error"],
+					},
+					groups: {
+						item: genericTabulatorPhraseToTranslationMapper["item"],
+						items: genericTabulatorPhraseToTranslationMapper["items"],
+					},
+					pagination: {
+						page_size:
+							genericTabulatorPhraseToTranslationMapper["page_size"],
+						page_title:
+							genericTabulatorPhraseToTranslationMapper["page_title"],
+						first: genericTabulatorPhraseToTranslationMapper["first"],
+						first_title:
+							genericTabulatorPhraseToTranslationMapper["first_title"],
+						last: genericTabulatorPhraseToTranslationMapper["last"],
+						last_title:
+							genericTabulatorPhraseToTranslationMapper["last_title"],
+						prev: genericTabulatorPhraseToTranslationMapper["prev"],
+						prev_title:
+							genericTabulatorPhraseToTranslationMapper["prev_title"],
+						next: genericTabulatorPhraseToTranslationMapper["next"],
+						next_title:
+							genericTabulatorPhraseToTranslationMapper["next_title"],
+						all: genericTabulatorPhraseToTranslationMapper["all"],
+						counter: {
+							showing:
+								genericTabulatorPhraseToTranslationMapper["showing"],
+							of: genericTabulatorPhraseToTranslationMapper["of"],
+							rows: genericTabulatorPhraseToTranslationMapper["rows"],
+							pages: genericTabulatorPhraseToTranslationMapper["pages"],
+						},
+					},
+				};
+			});
+
+			let phrasesGroupedByCategoryRequestParam = {};
+			tabulatorOptions.columns.forEach((column) => {
+				if (!column.titlePhrase?.length) return;
+
+				let [category, phrase] = column.titlePhrase.split("/");
+				if (phrasesGroupedByCategoryRequestParam[category]) {
+					phrasesGroupedByCategoryRequestParam[category].push(phrase);
+				} else {
+					phrasesGroupedByCategoryRequestParam[category] = [phrase];
+				}
+			});
+			tabulatorOptions.menuItemPhrases?.forEach((menuItemPhrase) => {
+				let [category, phrase] = menuItemPhrase.split("/");
+				if (phrasesGroupedByCategoryRequestParam[category]) {
+					phrasesGroupedByCategoryRequestParam[category].push(phrase);
+				} else {
+					phrasesGroupedByCategoryRequestParam[category] = [phrase];
+				}
+			});
+
+			if (!Object.keys(phrasesGroupedByCategoryRequestParam).length) {
+				return tabulatorOptions;
+			}
+
+			const phrasesResponse = await this.$api.call(
+				ApiPhrases.getPhrases(phrasesGroupedByCategoryRequestParam),
+			);
+			const phrasesData = phrasesResponse.data;
+
+			Object.keys(phrasesData).forEach((language) => {
+				let phraseToTranslationMapper = {};
+				phrasesData[language].forEach((phrase) => {
+					phraseToTranslationMapper[
+						phrase.category + "/" + phrase.phrase
+					] = phrase.text;
+				});
+
+				let columnFieldToTranslationMapper = {};
+				tabulatorOptions.columns.forEach((column) => {
+					if (!column.titlePhrase?.length) return;
+
+					columnFieldToTranslationMapper[column.field] =
+						phraseToTranslationMapper[column.titlePhrase] ??
+						"<< PHRASE " + column.titlePhrase + " >>";
+				});
+				tabulatorOptions.langs[language].columns =
+					columnFieldToTranslationMapper;
+
+				let menuItemPhraseToTranslationMapper = {};
+				tabulatorOptions.menuItemPhrases?.forEach((menuItemPhrase) => {
+					menuItemPhraseToTranslationMapper[menuItemPhrase] =
+						phraseToTranslationMapper[menuItemPhrase] ??
+						"<< PHRASE " + menuItemPhrase + " >>";
+				});
+				tabulatorOptions.langs[language].menuItems =
+					menuItemPhraseToTranslationMapper;
+			});
+
+			return tabulatorOptions;
 		},
 		updateTabulator() {
 			if (this.tabulator) {
@@ -371,6 +534,7 @@ export const CoreFilterCmpt = {
 			});
 			this.tabulator.clearFilter();
 			this.filterActive = false;
+			this.$emit('headerFilterOn', this.filterActive)
 		},
 		_setHeaderFilter()
 		{
@@ -654,7 +818,18 @@ export const CoreFilterCmpt = {
 
 			// parent not found
 			return false;
-		}
+		},
+		getColumnNames() {
+			if (!this.tableBuilt) {
+				return {};
+			} else if (this.tabulator.options.locale) {
+				return this.tabulator.getLang().columns;
+			}
+			return this.tabulator.getColumns().reduce((res, col) => {
+				res[col.getField()] = col.getDefinition().title;
+				return res;
+			}, {});
+		},
 	},
 	beforeCreate() {
 		if (!this.tableOnly == !this.filterType)
@@ -665,6 +840,10 @@ export const CoreFilterCmpt = {
 			alert('"nwNewEntry" listener is mandatory when sideMenu is true');
 		this.uuid = _uuid++;
 		this.$emit('uuidDefined', this.uuid)
+
+		Tabulator.registerModule(InternalToExternalEventBroadcastModule);
+		Tabulator.registerModule(MenuExtensionModule);
+		Tabulator.registerModule(ResponsiveLayoutExtensionModule);
 	},
 	mounted() {
 		this.initTabulator().then(() => {
@@ -732,7 +911,7 @@ export const CoreFilterCmpt = {
 				:data-bs-parent="'#filterCollapsables' + idExtra"
 				:fields="fieldIdsForVisibilty"
 				:selected="selectedFields"
-				:names="fieldNames"
+				:names="getColumnNames()"
 				@hide="tabulator.hideColumn($event)"
 				@show="tabulator.showColumn($event)"
 				v-collapse-auto-close

public/js/components/filter/Filter/Columns.js

@@ -42,7 +42,7 @@ export default {
 	watch: {
 		selected(n) {
 			this.selectedFields = n;
-		}
+		},
 	},
 	methods: {
 		toggle(field) {

public/js/components/searchbar/searchbar.js

@@ -8,6 +8,7 @@ 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 { debounce } from "../../helpers/DebounceHelper.js";
 
 export default {
 	name: "FhcSearchbar",
@@ -57,6 +58,107 @@ export default {
 			settingsDropdown: null,
 			lastQuery: "",
 			isSearchShownInMobileView: false,
+			callsearchapi: debounce(() => {
+				this.error = null;
+				this.searchresult.splice(0, this.searchresult.length);
+				this.searching = true;
+				this.showsearchresult();
+				if (this.searchsettings.types.length === 0) {
+					this.error = this.$p.t("search/error_missing_type");
+					this.searching = false;
+					return;
+				}
+
+				if (this.abortController) this.abortController.abort();
+
+				if (!this.searchsettings.searchstr?.length) return;
+
+				this.abortController = new AbortController();
+
+				this.searchfunction(this.searchsettings, {
+					timeout: 50000,
+					signal: this.abortController.signal,
+				})
+					.then((response) => {
+						if (!response.data) {
+							this.error = this.$p.t("search/error_general");
+						} else {
+							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",
+											"student",
+											"prestudent",
+										];
+										mergedType +=
+											this.searchoptions.mergeResults;
+										mergeKey = "person_id";
+										break;
+								}
+
+								if (mergeTypes.length) {
+									res = Object.values(
+										res.reduce((a, c) => {
+											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],
+												};
+											} 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.searchmode = response.meta.mode;
+						}
+						this.searching = false;
+						this.retry = 0;
+					})
+					.catch((error) => {
+						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;
+					});
+			}, 500),
 		};
 	},
 	computed: {
@@ -345,122 +447,18 @@ export default {
 			this.abort();
 			if (this.searchsettings.searchstr.length >= 2) {
 				this.calcSearchResultExtent();
-				this.searchtimer = setTimeout(this.callsearchapi, 500);
+				this.callsearchapi();
 			} else {
 				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);
-			this.searching = true;
-			this.showsearchresult();
-			if (this.searchsettings.types.length === 0) {
-				this.error = this.$p.t("search/error_missing_type");
-				this.searching = false;
-				return;
-			}
-
-			if (this.abortController) this.abortController.abort();
-
-			if (!this.searchsettings.searchstr?.length) return;
-
-			this.abortController = new AbortController();
-
-			this.searchfunction(this.searchsettings, {
-				timeout: 50000,
-				signal: this.abortController.signal,
-			})
-				.then((response) => {
-					if (!response.data) {
-						this.error = this.$p.t("search/error_general");
-					} else {
-						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",
-										"student",
-										"prestudent",
-									];
-									mergedType +=
-										this.searchoptions.mergeResults;
-									mergeKey = "person_id";
-									break;
-							}
-
-							if (mergeTypes.length) {
-								res = Object.values(
-									res.reduce((a, c) => {
-										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],
-											};
-										} 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.searchmode = response.meta.mode;
-					}
-					this.searching = false;
-					this.retry = 0;
-				})
-				.catch((error) => {
-					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 () {
 			this.search();
 			this.togglesettings();

public/js/helpers/DebounceHelper.js

@@ -0,0 +1,7 @@
+export const debounce = (callback, wait) => {
+	let timeoutId = null;
+	return (context) => {
+		window.clearTimeout(timeoutId);
+		timeoutId = window.setTimeout(() => callback(), wait);
+	}
+}

public/js/helpers/EmailHelpers.js

@@ -1,45 +1,66 @@
-export async function splitMailsHelper(mails, event, subject, alertPluginRef, phrasenPluginRef) {
+export async function splitMailsHelper(mails, event, subject, body, alertPluginRef, phrasenPluginRef) {
+	await phrasenPluginRef.loadCategory('ui');
 	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 useBcc = event?.ctrlKey || event?.metaKey;
+
+	// build query parameters using URLSearchParams to get encoding
+	const urlParams = new URLSearchParams();
+	if (subject && typeof subject === 'string') {
+		urlParams.append('subject', subject);
+	}
+	if (body && typeof body === 'string') {
+		urlParams.append('body', body);
+	}
+
+	// initial overhead: "mailto:?bcc=" -> 12 chars, "mailto:" -> 7 chars
+	const baseOverhead = useBcc ? 12 : 7;
+	let queryString = urlParams.toString().replace(/\+/g, '%20');;
+	let overhead = baseOverhead + (queryString ? 1 + queryString.length : 0); // +1 accounts for '?' or '&'
+
+	// calculate overhead with body to exceed the limit
+	if (overhead > 2024) {
+		await alertPluginRef.alertWarning(phrasenPluginRef.t('ui', 'bodyZuLang'));
+		urlParams.delete('body').replace(/\+/g, '%20');;
+		queryString = urlParams.toString();
+		overhead = baseOverhead + (queryString ? 1 + queryString.length : 0);
 	}
 
 	let firstrun = true;
-	let useBcc = event?.ctrlKey || event?.metaKey;
-	while (maillist.length > 0)
-	{
-		if (maillist.length + subjectlength > 2024)
-		{
-			let splitposition = maillist.lastIndexOf(splititem, 1900);
+	while (maillist.length > 0) {
+		let mailto = "";
+		if (maillist.length + overhead > 2024) {
+			let splitposition = maillist.lastIndexOf(splititem, 2024 - overhead);
+
+			// Fallback guard: if a single email address is somehow longer than the remaining space
+			if (splitposition === -1) {
+				splitposition = maillist.indexOf(splititem);
+				if (splitposition === -1) splitposition = maillist.length;
+			}
+
 			mailto = maillist.substring(0, splitposition);
 			maillist = maillist.substring(splitposition + 1);
-		}
-		else
-		{
+		} else {
 			mailto = maillist;
 			maillist = "";
 		}
 
+		// construct the clean mailLink
 		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;
-			}
+		if (queryString) {
+			// If using BCC, the string already has a '?', so append with '&'. Otherwise, start with '?'
+			mailLink += useBcc ? `&${queryString}` : `?${queryString}`;
 		}
 
+		if (firstrun) {
+			window.location.href = mailLink;
+			firstrun = false;
+		} else {
+			if (await alertPluginRef.confirm({message: phrasenPluginRef.t('ui', 'weitereEMail')}) === true) {
+				window.location.href = mailLink;
+			} else {
+				break; // Stop processing further batches if the user cancels
+			}
+		}
 	}
 }

public/js/helpers/StringHelpers.js

@@ -1,4 +1,49 @@
 export function capitalize(string) {
-	if (!string) return '';
+	if (!string) return "";
 	return string[0].toUpperCase() + string.slice(1);
-}
+}
+
+export function convertCase(string, from, to) {
+	const possibleCases = ["kebab", "snake", "camel"];
+	if (
+		from === to ||
+		!possibleCases.includes(from) ||
+		!possibleCases.includes(to)
+	)
+		return string;
+
+	const individualWords =
+		from === "kebab"
+			? string.split("-")
+			: from === "snake"
+				? string.split("_")
+				: splitWordsInCamelCase(string);
+
+	const formattedIndividualWords = ["snake", "kebab"].includes(to)
+		? individualWords.map((word) => word.toLowerCase())
+		: individualWords.map((word, index) => {
+				if (!index) return word.toLowerCase();
+				return word.slice(0, 1).toUpperCase() + word.slice(1).toLowerCase();
+			});
+
+	const joinCharacter = to === "snake" ? "_" : to === "kebab" ? "-" : "";
+	return formattedIndividualWords.join(joinCharacter);
+}
+
+function splitWordsInCamelCase(string) {
+	const lastUpperCaseLetterIndex = string
+		.split("")
+		.findLastIndex((character) => {
+			return character.toUpperCase() === character;
+		});
+
+	if (lastUpperCaseLetterIndex < 1) {
+		return [string];
+	}
+
+	let splitWords = splitWordsInCamelCase(
+		string.slice(0, lastUpperCaseLetterIndex),
+	);
+	splitWords.push(string.slice(lastUpperCaseLetterIndex));
+	return splitWords;
+}

public/js/tabulator/customModules/InternalToExternalEventBroadcastModule.js

@@ -0,0 +1,31 @@
+// changes within tabulator are often not adequately broadcast to the external component
+// this module exposes tabulator's internal events
+// if external event name is not specified, the dispatched external event will be the camelCase version of the kebab-case internal event
+
+import Module from "../../../../vendor/olifolkerd/tabulator5/src/js/core/Module.js";
+import { convertCase } from "../../helpers/StringHelpers.js";
+
+export default class InternalToExternalEventBroadcastModule extends Module {
+	static moduleName = "internalToExternalEventBroadcast";
+	static moduleInitNumber = 1;
+
+	constructor(table) {
+		super(table);
+
+		this.eventsToBroadcast = [
+			// example event
+			// {
+			// 	internal: "layout-refreshed",
+			// 	external: null,
+			// },
+		];
+	}
+
+	initialize() {
+		this.eventsToBroadcast.forEach((event) => {
+			this.subscribe(event.internal, () => {
+				this.dispatchExternal(event.external ?? convertCase(event.internal, "kebab", "camel"));
+			});
+		});
+	}
+}