BUG: add fix for room deletion with attached sub rooms

To make headings stand out more clearly from the buttons

application/config/navigation.php

@@ -45,6 +45,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 30,
 					'requiredPermissions' => 'admin:w'
+				),
+				'roomManagerOverview' => array(
+					'link' => site_url('RoomManager'),
+					'icon' => '',
+					'description' => 'Raumverwaltung',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'basis/ort:r'
 				)
 			)
 		),
@@ -208,7 +216,14 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                )
+                ),
+				'dashboardadmin' => array(
+					'link' => site_url('dashboard/Admin'),
+					'description' => 'Dashboard Admin',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'dashboard/admin:r'
+				)
 			)
 		)
 	)
@@ -376,3 +391,12 @@ $config['navigation_menu']['apps'] = [
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]
 ];
+
+$config['navigation_menu']['RoomManager/index'] = array(
+	'lvTemplateUebersicht' => array(
+		'link' => site_url('RoomManager'),
+		'description' => 'Raumverwaltung übersicht',
+		'icon' => '',
+		'sort' => 1
+	)
+);

application/config/routes.php

@@ -122,6 +122,8 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/f
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 
+$route['RoomManager/.*'] = 'RoomManager/index';
+
 foreach($subdirs as $subdir)
 {
 	if(is_dir($subdir))

application/controllers/RoomManager.php

@@ -0,0 +1,62 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class RoomManager extends Auth_Controller
+{
+	private $_uid;  // uid of the logged user
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => array('basis/ort:r')
+			)
+		);
+
+		$this->load->library('PermissionLib');
+		$this->load->library('AuthLib');
+
+		$this->loadPhrases(
+			array(
+				'ui',
+				'global',
+				'person',
+				'abschlusspruefung',
+				'password',
+				'lehre'
+			)
+		);
+
+		$this->_setAuthUID();
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+		return $this->load->view('room_manager/index', [
+			'permissions' => [
+				'basis/ort_w' => $this->permissionlib->isBerechtigt('basis/ort', 'suid'),
+			],
+		]);
+	}
+	
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

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

@@ -511,10 +511,11 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
-
-		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
+		if(count($projektarbeiten_ids) > 0) {
+			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
+		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			
@@ -846,9 +847,10 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		$email = $this->getDataOrTerminateWithError($result, 'general');
-		
-		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+		if(count($result->retval) > 0) {
+			$email = getData($result);
+			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+		} else return '';
 
 	}
 

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

@@ -208,7 +208,6 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
-		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -221,7 +220,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: '',
+			'uid' => $this->input->post_get('uid') ?: null,
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -251,6 +250,9 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
+
+				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
+
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -332,6 +334,7 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

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

@@ -31,21 +31,180 @@ class Ort extends FHCAPI_Controller
 	 */
 	public function __construct()
 	{
-		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
+			'getAllRooms' => array('basis/ort:r'),
+			'getRooms' => self::PERM_LOGGED,
+			'getTypes' => self::PERM_LOGGED,
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
-			'getRooms' => self::PERM_LOGGED,
-			'getTypes' => self::PERM_LOGGED
+			'getRoom' => self::PERM_LOGGED,
+			'createRoom' => array('basis/ort:rw'),
+			'updateRoom' => array('basis/ort:rw'),
+			'deleteRoom' => array('basis/ort:rw'),
 		]);
 
+		$this->load->library('form_validation');
+		$this->load->library('requests/RoomRequest');
+
 		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
 		$this->config->load('raumsuche');
+
+		$this->loadPhrases([
+			'global',
+			'ui',
+			'lehre',
+			'gruppenmanagement',
+			'person',
+		]);
+
+		
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	public function getAllRooms()
+	{
+		$paginationSize = $this->input->get('pagination[size]', TRUE);
+		$paginationPage = $this->input->get('pagination[page]', TRUE);
+
+		$filter = $this->input->get('filter', TRUE);
+		
+		$filterData = [];
+
+
+		$query = "SELECT
+				COUNT(*) OVER() AS full_count,
+				public.tbl_ort.*, 
+				org.bezeichnung as org_bezeichnung,
+				org.organisationseinheittyp_kurzbz as org_organisationseinheittyp_kurzbz
+			FROM public.tbl_ort 
+			LEFT JOIN public.tbl_ort as pr ON pr.ort_kurzbz = public.tbl_ort.parent_ort_kurzbz
+			LEFT JOIN public.tbl_organisationseinheit as org ON org.oe_kurzbz = public.tbl_ort.oe_kurzbz";
+
+
+		$queryWhereFragments = [];
+
+		$searchableIdAttributes = ['standort_id', 'gebteil', 'oe_kurzbz'];
+		$searchableTextAttributes = ['ort_kurzbz', 'parent_ort_kurzbz', 'bezeichnung', 'planbezeichnung', 'oe_bezeichnung'];
+		$searchableBooleanAttributes = ['lehre', 'reservieren', 'aktiv'];
+		$searchableNumericAttributes = ['max_person', 'arbeitsplaetze', 'kosten', 'stockwerk'];
+		$searchableNumericSpanAttributes = ['m2'];
+		$searchableCustomAttributes = [
+			[
+				'raw_sql_fragment' => "CONCAT(public.tbl_ort.ort_kurzbz, ' - ', public.tbl_ort.bezeichnung)",
+				'filter_parameter' => 'ort_kurzbz_bezeichnung_concat',
+			], 
+			[
+				'raw_sql_fragment' => "CONCAT('[', org.organisationseinheittyp_kurzbz, '] ', org.bezeichnung)",
+				'filter_parameter' => 'org_organisationseinheittyp_kurzbz_org_bezeichnung_concat',
+			]
+		];
+
+		foreach ($searchableIdAttributes as $attribute) {
+			if (isset($filter[$attribute]) && $filter[$attribute] !== '') {
+				$queryWhereFragments[] = "public.tbl_ort.$attribute = ?";
+				$filterData[] = trim($filter[$attribute]);
+			}
+		}
+
+		foreach ($searchableTextAttributes as $attribute) {
+			$tableAttribute = "public.tbl_ort.$attribute";
+			if ($attribute === 'oe_bezeichnung') {
+				$tableAttribute = "org.bezeichnung";
+			}
+			if (isset($filter[$attribute]) && $filter[$attribute] !== '') {
+				$queryWhereFragments[] = "$tableAttribute ILIKE ?";
+				$filterData[] = '%' . trim($filter[$attribute]) . '%';
+			}
+		}
+
+		foreach ($searchableBooleanAttributes as $attribute) {
+			if (isset($filter[$attribute]) && $filter[$attribute] !== '') {
+				$queryWhereFragments[] = "public.tbl_ort.$attribute = ?";
+				$filterData[] = $filter[$attribute] === 'true' ? true : false;
+			}
+		}
+
+		foreach ($searchableNumericAttributes as $attribute) {
+			if (isset($filter[$attribute]) && $filter[$attribute] !== '') {
+				$queryWhereFragments[] = "public.tbl_ort.$attribute = ?";
+				$filterData[] = trim($filter[$attribute]);
+			}
+		}
+
+		foreach ($searchableNumericSpanAttributes as $attribute) {
+			if (isset($filter[$attribute]) && $filter[$attribute] !== '') {
+				$queryWhereFragments[] = "public.tbl_ort.$attribute >= ? AND public.tbl_ort.$attribute <= ?";
+				$filterData[] = trim($filter[$attribute]) - 1;
+				$filterData[] = trim($filter[$attribute]) + 1;
+			}
+		}
+
+		foreach ($searchableCustomAttributes as $customAttribute) {
+			if (isset($filter[$customAttribute['filter_parameter']]) && $filter[$customAttribute['filter_parameter']] !== '') {
+				$queryWhereFragments[] = $customAttribute['raw_sql_fragment'] . " ILIKE ?";
+				$filterData[] = '%' . trim($filter[$customAttribute['filter_parameter']]) . '%';
+			}
+		}
+
+		if (count($queryWhereFragments) > 0) {
+			$query .= ' WHERE ' . implode(' AND ', $queryWhereFragments);
+		}
+
+		$sortableAttributes = ['ort_kurzbz', 'bezeichnung', 'planbezeichnung', 'max_person', 'arbeitsplaetze', 'm2', 'lehre', 'reservieren', 'aktiv', 'stockwerk', 'kosten', 'parent_ort_kurzbz', 'org_bezeichnung'];
+		$sortableConcatAttributes = [
+			[
+				'raw_sql_fragment' => "CONCAT('[', org.organisationseinheittyp_kurzbz, '] ', org.bezeichnung)",
+				'sort_parameter' => 'org_organisationseinheittyp_kurzbz_org_bezeichnung_concat',
+			]
+		];
+		$sorter = $this->input->get('sort', TRUE);
+
+		foreach ($sortableAttributes as $attribute) {
+			if (isset($sorter[$attribute]) && in_array(strtolower($sorter[$attribute]), ['asc', 'desc'])) {
+				if ($attribute === 'org_bezeichnung') {
+					$query .= " ORDER BY org.bezeichnung " . strtoupper($sorter[$attribute]);
+				} else {
+					$query .= " ORDER BY public.tbl_ort.$attribute " . strtoupper($sorter[$attribute]);
+				}
+			}
+		}
+
+		foreach ($sortableConcatAttributes as $customAttribute) {
+			if (isset($sorter[$customAttribute['sort_parameter']]) && in_array(strtolower($sorter[$customAttribute['sort_parameter']]), ['asc', 'desc'])) {
+				$query .= " ORDER BY " . $customAttribute['raw_sql_fragment'] . " " . strtoupper($sorter[$customAttribute['sort_parameter']]);
+			}
+		}
+
+		if (!isset($sorter)) {
+			$query .= ' ORDER BY public.tbl_ort.ort_kurzbz ASC';
+		}
+
+		if ($paginationSize && $paginationPage) {
+			$query .= " LIMIT ? OFFSET ?";
+		}
+
+		$queryData = array_merge($filterData);
+		if ($paginationSize && $paginationPage) {
+			$queryData = array_merge($filterData, [$paginationSize, ($paginationPage - 1) * $paginationSize]);
+		}
+
+		$result = $this->OrtModel->execReadOnlyQuery($query, $queryData);
+ 
+		$queryData = hasData($result) ? getData($result) : [];
+		
+		if ($paginationSize && $paginationPage) {
+			$totalItems = count($queryData) > 0 ? $queryData[0]->full_count : 0;
+			$pageCount = ceil($totalItems / $paginationSize);
+			$this->addTabulatorPaginationData($pageCount); 
+		}
+		
+		$this->terminateWithSuccess($queryData);
+	}
+
 	/**
 	 * Retrieves all Ort entries filtered by the provided parameters
 	 */
@@ -54,7 +213,7 @@ class Ort extends FHCAPI_Controller
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
 		$this->form_validation->set_rules('datum','Datum','required');
-		$this->form_validation->set_rules('von','Uhrzeit Von','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		$this->form_validation->set_rules('von','Uhrzeit Von','required|regexresponse_match[/^[0-9]{2}:[0-9]{2}$/]');
 		$this->form_validation->set_rules('bis','Uhrzeit Bis','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
 		if($this->form_validation->run() == FALSE) {
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -66,7 +225,6 @@ class Ort extends FHCAPI_Controller
 		$typ = $this->input->get('typ', TRUE);
 		$personenanzahl = $this->input->get('personenanzahl', TRUE);
 		
-		
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
 		
@@ -100,8 +258,7 @@ class Ort extends FHCAPI_Controller
 			)
 		";
 		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-//		$this->addMeta('qry', $qry);
-//		$this->addMeta('params', $params);
+
 		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 		
 		$this->terminateWithSuccess($result);
@@ -174,5 +331,161 @@ class Ort extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($content);
 	}
+
+	public function getRoom($ort_kurzbz)
+	{
+		$result = $this->OrtModel->load($ort_kurzbz);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = hasData($result) ? current(getData($result)) : null;
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function createRoom()
+	{
+		
+		if (!$this->roomrequest->validate()) {
+			$this->terminateWithValidationErrors($this->roomrequest->errors());
+			return;
+		}
+
+		$this->db->trans_start();
+
+		$data = [
+			"parent_ort_kurzbz" => $this->input->post('parent_ort_kurzbz'),
+			"oe_kurzbz" => $this->input->post('oe_kurzbz'),
+			"content_id" => !empty($this->input->post('content_id')) ? $this->input->post('content_id') : null,
+			"standort_id" => $this->input->post('standort_id'),
+			"ort_kurzbz" => $this->input->post('ort_kurzbz'),
+			"bezeichnung" => $this->input->post('bezeichnung'),
+			"planbezeichnung" => $this->input->post('planbezeichnung'),
+			"aktiv" => $this->input->post('aktiv') ? true : false,
+			"lehre" => $this->input->post('lehre') ? true : false,
+			"reservieren" => $this->input->post('reservieren') ? true : false,
+			"max_person" => $this->input->post('max_person'),
+			"stockwerk" => $this->input->post('stockwerk'),
+			"lageplan" => $this->input->post('lageplan'),
+			"dislozierung" => $this->input->post('dislozierung'),
+			"kosten" => $this->input->post('kosten'),
+			"ausstattung" => $this->input->post('ausstattung'),
+			"telefonklappe" => $this->input->post('telefonklappe'),
+			"m2" => $this->input->post('m2'),
+			"gebteil" => $this->input->post('gebteil'),
+			"arbeitsplaetze" => $this->input->post('arbeitsplaetze'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUid(),
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUid()
+		];
+
+		$this->OrtModel->db->set($data);
+		$result = $this->OrtModel->db->insert($this->OrtModel->getDbTable());
+
+		$this->db->trans_complete();
+
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function updateRoom($ort_kurzbz)
+	{
+		if (!$this->roomrequest->validate("update")) {
+			$this->terminateWithValidationErrors($this->roomrequest->errors());
+			return;
+		}
+
+		$this->db->trans_start();
+
+		$fields = [
+			"parent_ort_kurzbz",
+			"oe_kurzbz",
+			"content_id",
+			"standort_id",
+			"bezeichnung",
+			"planbezeichnung",
+			"aktiv",
+			"lehre",
+			"reservieren",
+			"max_person",
+			"stockwerk",
+			"lageplan",
+			"dislozierung",
+			"kosten",
+			"ausstattung",
+			"telefonklappe",
+			"m2",
+			"gebteil",
+			"arbeitsplaetze"
+		];
+
+		foreach ($fields as $field) {
+			if (array_key_exists($field, $this->input->post())) {
+				$data[$field] = $this->input->post($field);
+			}
+		}
+
+		$data['updateamum'] = date('c');
+		$data['updatevon'] = getAuthUid();
+
+		$this->OrtModel->db->set($data);
+		$this->OrtModel->db->where('ort_kurzbz', $ort_kurzbz);
+		$result = $this->OrtModel->db->update($this->OrtModel->getDbTable());
+
+		$this->db->trans_complete();
+
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function deleteRoom($ort_kurzbz)
+	{
+
+		$this->db->trans_start();
+
+		$reservationsQuery = "SELECT COUNT(*) FROM campus.tbl_reservierung WHERE ort_kurzbz = ?";
+		$reservationsResult = $this->OrtModel->execReadOnlyQuery($reservationsQuery, [$ort_kurzbz]);
+		if (isError($reservationsResult)) {
+			$this->terminateWithError(getError($reservationsResult), self::ERROR_TYPE_GENERAL);
+		}
+
+		$reservationsCount = hasData($reservationsResult) ? getData($reservationsResult)[0]->count : 0;
+		if ($reservationsCount > 0) {
+			$this->terminateWithError($this->p->t('ui', 'error_existingReservationsForRoomsUponDeletion'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$softwareImageOrtQuery = "SELECT COUNT(*) FROM extension.tbl_softwareimage_ort WHERE ort_kurzbz = ?";
+		$softwareImageOrtResult = $this->OrtModel->db->query($softwareImageOrtQuery, [$ort_kurzbz]);
+		if ($softwareImageOrtResult === false) {
+			$this->terminateWithError($this->p->t('ui', 'error_existingSoftwareImageForRoomTypeUponDeletion'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$softwareImageOrtCount = $softwareImageOrtResult->row()->count;
+		if ($softwareImageOrtCount > 0) {
+			$this->terminateWithError($this->p->t('ui', 'error_existingSoftwareImageForRoomTypeUponDeletion'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$subRoomsCountQuery = "SELECT COUNT(*) FROM public.tbl_ort WHERE parent_ort_kurzbz = ?";
+		$subRoomsCountQuery = $this->OrtModel->execReadOnlyQuery($subRoomsCountQuery, [$ort_kurzbz]);
+		$subRoomsCount = hasData($subRoomsCountQuery) ? getData($subRoomsCountQuery)[0]->count : 0;
+		if ($subRoomsCount > 0) {
+			$this->terminateWithError($this->p->t('ui', 'error_existingSubRoomsForRoomUponDeletion'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->OrtModel->delete([
+			"ort_kurzbz" => $ort_kurzbz
+		]);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_complete();
+
+		return $this->terminateWithSuccess(true);
+	}
 }
 

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

@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class RoomToRoomTypeApi extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'getRoomToRoomTypeRelationsByRoomShortCode' => array('basis/ort:r'),
+			'createRoomToRoomTypeRelation' => array('basis/ort:rw'),
+			'deleteRoomToRoomTypeRelation' => array('basis/ort:rw'),
+		]);
+
+		$this->load->library('form_validation');
+
+		$this->load->model('ressource/Ortraumtyp_model', 'OrtRoomTypeModel');
+
+		$this->loadPhrases([
+			'global',
+			'ui',
+			'lehre'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+    public function getRoomToRoomTypeRelationsByRoomShortCode($roomShortCode) {
+		$this->OrtRoomTypeModel->db->select('public.tbl_ortraumtyp.*, public.tbl_raumtyp.beschreibung as raumtyp_beschreibung');
+		$this->OrtRoomTypeModel->db->join('public.tbl_raumtyp', 'public.tbl_raumtyp.raumtyp_kurzbz = public.tbl_ortraumtyp.raumtyp_kurzbz', 'left');
+		$this->OrtRoomTypeModel->db->order_by('hierarchie', 'ASC');
+        $result = $this->OrtRoomTypeModel->loadWhere(['ort_kurzbz' => $roomShortCode]);
+        
+        return $this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+    }
+
+	public function createRoomToRoomTypeRelation() {
+		$this->form_validation->set_rules('roomShortCode', 'roomShortCode', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' =>  $this->p->t('lehre', 'kurzbz')])
+		]);
+		$this->form_validation->set_rules('roomTypeShortCode', 'roomTypeShortCode', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' =>  $this->p->t('lehre', 'kurzbz')])
+		]);
+		$this->form_validation->set_rules('hierarchy', 'hierarchy', 'required|integer', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' =>  $this->p->t('ui', 'hierarchy')]),
+			'integer' => $this->p->t('ui', 'error_fieldInteger', ['field' =>  $this->p->t('ui', 'hierarchy')])
+		]);
+
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$existingRelationResponse = $this->OrtRoomTypeModel->loadWhere([
+			'ort_kurzbz' => $this->input->post('roomShortCode'),
+			'hierarchie' => $this->input->post('hierarchy'),
+		]);
+		if (hasData($existingRelationResponse)) { 
+			$this->terminateWithError($this->p->t('ui', 'error_roomToRoomTypeRelationAlreadyExists'), self::ERROR_TYPE_GENERAL);
+		}
+		
+		$data = [
+			'ort_kurzbz' => $this->input->post('roomShortCode'),
+			'raumtyp_kurzbz' => $this->input->post('roomTypeShortCode'),
+			'hierarchie' => $this->input->post('hierarchy'),
+		];
+
+		$this->OrtRoomTypeModel->db->set($data);
+		$result = $this->OrtRoomTypeModel->db->insert($this->OrtRoomTypeModel->getDbTable());
+
+		if ($result === false) {
+			return $this->terminateWithError($this->OrtRoomTypeModel->getLastError());
+		}
+
+		return $this->terminateWithSuccess(['message' => 'Room to Room Type relation created successfully.']);
+	}
+
+	public function deleteRoomToRoomTypeRelation() {
+		$this->form_validation->set_rules('roomShortCode', 'roomShortCode', 'required');
+		$this->form_validation->set_rules('roomTypeShortCode', 'roomTypeShortCode', 'required');
+		$this->form_validation->set_rules('hierarchy', 'hierarchy', 'required|integer');
+
+		if ($this->form_validation->run() === false) {
+			return $this->terminateWithError(validation_errors());
+		}
+
+		$result = $this->OrtRoomTypeModel->db->delete($this->OrtRoomTypeModel->getDbTable(), [
+			'ort_kurzbz' => $this->input->post('roomShortCode'),
+			'raumtyp_kurzbz' => $this->input->post('roomTypeShortCode'),
+			'hierarchie' => $this->input->post('hierarchy'),
+		]);
+
+		if ($result === false) {
+			return $this->terminateWithError($this->OrtRoomTypeModel->getLastError());
+		}
+
+		return $this->terminateWithSuccess(['message' => 'Room to Room Type relation deleted successfully.']);
+	}
+}
+

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

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class RoomTypeApi extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllRoomTypes' => array('basis/ort:r'),
+			'createRoomType' =>  array('basis/ort:rw'),
+		]);
+
+		$this->load->library('form_validation');
+
+		$this->load->model('ressource/Raumtyp_model', 'RoomTypeModel');
+
+		$this->loadPhrases([
+			'global',
+			'ui',
+			'lehre'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+    public function getAllRoomTypes() {
+		$this->RoomTypeModel->addOrder('raumtyp_kurzbz', 'ASC');
+        $result = $this->RoomTypeModel->load();
+        
+        return $this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+    }
+
+	public function createRoomType() {
+		$this->form_validation->set_rules('kurzbezeichnung', 'kurzbezeichnung', 'required|max_length[255]|is_unique[tbl_raumtyp.raumtyp_kurzbz]', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' =>  $this->p->t('lehre', 'kurzbz')]),
+			'is_unique' => $this->p->t('ui', 'error_fieldUnique', ['field' =>  $this->p->t('lehre', 'kurzbz')]),
+		]);
+		$this->form_validation->set_rules('beschreibung', 'beschreibung', 'max_length[255]');
+
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$data = [
+			'raumtyp_kurzbz' => $this->input->post('kurzbezeichnung'),
+			'beschreibung' => $this->input->post('beschreibung'),
+		];
+
+		$this->RoomTypeModel->db->set($data);
+		$result = $this->RoomTypeModel->db->insert($this->RoomTypeModel->getDbTable());
+
+		if ($result === false) {
+			return $this->terminateWithError($this->RoomTypeModel->getLastError());
+		}
+
+		return $this->terminateWithSuccess();
+	}
+}
+

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Board extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'list'					=> 'dashboard/admin:r',
+			'create'				=> 'dashboard/admin:rw',
+			'update'				=> 'dashboard/admin:rw',
+			'delete'				=> 'dashboard/admin:rw'
+		]);
+
+		// Models
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+
+	public function list()
+	{
+		$result = $this->DashboardModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function create()
+	{
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		
+		$result = $this->DashboardModel->insert([
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_id = $this->input->post('dashboard_id');
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		$beschreibung = $this->input->post('beschreibung');
+
+		$result = $this->DashboardModel->update([
+			'dashboard_id' => $dashboard_id
+		], [
+			'dashboard_kurzbz' => $dashboard_kurzbz,
+			'beschreibung' => $beschreibung
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_id = $this->input->post('dashboard_id');
+
+		//delete all presets
+		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+
+		$result = $this->DashboardPresetModel->delete([
+			'dashboard_id' => $dashboard_id
+		]);
+		$this->getDataOrTerminateWithError($result);
+
+		//delete all widgets
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+
+		$result = $this->DashboardWidgetModel->delete([
+			'dashboard_id' => $dashboard_id
+		]);
+		$this->getDataOrTerminateWithError($result);
+
+		$result = $this->DashboardModel->delete($dashboard_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+}

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Preset extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'list'					=> 'dashboard/admin:r',
+			'getBatch'				=> 'dashboard/admin:r',
+			'addWidget'				=> 'dashboard/admin:rw',
+			'removeWidget'			=> 'dashboard/admin:rw'
+		]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+
+	public function list($dashboard_kurzbz)
+	{
+		$sql = "
+			WITH
+			dashboard_presets AS (
+				SELECT
+					*
+				FROM
+					dashboard.tbl_dashboard_preset dp
+				JOIN
+					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
+				WHERE
+					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
+			),
+			general AS 	(
+				SELECT
+					'general' AS funktion_kurzbz,
+					'Allgemein' AS beschreibung
+			)
+
+			(
+				SELECT
+					f.funktion_kurzbz,
+					f.beschreibung,
+					COUNT(p.preset_id) AS has_preset
+				FROM
+					general f
+				LEFT JOIN
+					dashboard_presets p ON p.funktion_kurzbz IS NULL
+				GROUP BY
+					f.funktion_kurzbz, f.beschreibung
+			)
+			UNION ALL
+			(
+				SELECT
+					f.funktion_kurzbz,
+					f.beschreibung,
+					COUNT(p.preset_id) AS has_preset
+				FROM
+					public.tbl_funktion f
+				LEFT JOIN
+					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
+				GROUP BY
+					f.funktion_kurzbz, f.beschreibung
+				ORDER BY
+					f.beschreibung ASC
+			)
+		";
+
+		$result = $this->FunktionModel->execReadOnlyQuery($sql);
+
+		$funktionen = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($funktionen);
+	}
+
+	public function getBatch()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$db = $this->input->post('db');
+		$funktionen = $this->input->post('funktionen') ?: [];
+
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->dashboardlib->getPreset($db, $funktion);
+			if ($conf) {
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			} else {
+				$result[$funktion] = [];
+			}
+		}
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function addWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
+		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_kurzbz = $this->input->post('dashboard');
+		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
+		$widget = $this->input->post('widget');
+
+		if (!isset($widget['widgetid']))
+			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
+
+		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
+
+		$preset->preset = json_encode($preset_decoded);
+
+		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($widget['widgetid']);
+	}
+
+	public function removeWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
+		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_kurzbz = $this->input->post('db');
+		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
+		$widgetid = $this->input->post('widgetid');
+
+		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if (!$preset)
+			show_404();
+
+		$preset_decoded = json_decode($preset->preset, true);
+
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+			show_404();
+
+		$preset->preset = json_encode($preset_decoded);
+
+		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
+	}
+}

application/controllers/api/frontend/v1/dashboard/User.php

@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the users dashboard
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class User extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get'							=> 'dashboard/benutzer:r',
+			'addWidget'						=> 'dashboard/benutzer:rw',
+			'removeWidget'					=> 'dashboard/benutzer:rw'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+
+	public function get($dashboard_kurzbz)
+	{
+		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
+		if (!$dashboard)
+			show_404();
+		
+		$uid = $this->authlib->getAuthObj()->username;
+
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
+
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
+	}
+
+	public function addWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$widget = $this->input->post('widget');
+		$dashboard_kurzbz = $this->input->post('dashboard');
+		$uid = $this->authlib->getAuthObj()->username;
+		
+		if (!isset($widget['widgetid']))
+			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
+
+		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];
+
+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->dashboardlib->insertOrUpdateOverride($override);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($widget['widgetid']);
+	}
+
+	public function removeWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$widget_id = $this->input->post('widget');
+		$dashboard_kurzbz = $this->input->post('dashboard');
+		$uid = $this->authlib->getAuthObj()->username;
+		
+		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
+		if (!$override)
+			show_404();
+		
+		$override_decoded = json_decode($override->override, true);
+
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}
+
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->dashboardlib->insertOrUpdateOverride($override);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess();
+	}
+}

application/controllers/api/frontend/v1/dashboard/Widget.php

@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the users dashboard
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Widget extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+			'list'							=> 'dashboard/admin:r',
+			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+			'setAllowed'					=> 'dashboard/admin:rw'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+	}
+
+	public function get($id)
+	{
+		$result = $this->WidgetModel->load($id);
+
+		$widget = $this->getDataOrTerminateWithError($result);
+
+		if (!$widget)
+			return $this->terminateWithSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => [
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $id . ' could not be found'
+				],
+				"setup" => [
+					"name" => 'Widget Not Found',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"width" => 1,
+					"height" => 1
+				]
+			]);
+
+		$widget = current($widget);
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		$this->terminateWithSuccess($widget);
+	}
+
+	public function list($dashboard)
+	{
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
+
+		$widgets = $this->getDataOrTerminateWithError($result);
+
+		$widgets = array_map(function ($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $widgets);
+
+		$this->terminateWithSuccess($widgets);
+	}
+
+	public function listAllowed($dashboard)
+	{
+		$result = $this->WidgetModel->getForDashboard($dashboard);
+
+		$widgets = $this->getDataOrTerminateWithError($result);
+
+		$widgets = array_map(function ($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $widgets);
+
+		$this->terminateWithSuccess($widgets);
+	}
+
+	public function setAllowed()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
+		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$data = [
+			'dashboard_id' => $this->input->post('dashboard_id'),
+			'widget_id' => $this->input->post('widget_id')
+		];
+
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+		
+		if ($this->input->post('allowed'))
+			$result = $this->DashboardWidgetModel->insert($data);
+		else
+			$result = $this->DashboardWidgetModel->delete($data);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}

application/controllers/api/frontend/v1/messages/Messages.php

@@ -42,14 +42,22 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size, $page)
+	public function getMessages($id, $type_id, $size=null, $page=null)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		$offset = $size * ($page - 1);
-		$limit = $size;
+		if(!(is_null($size) && is_null($page)))
+		{
+			$offset = $size * ($page - 1);
+			$limit = $size;
+		}
+		else
+		{
+			$offset = null;
+			$limit = null;
+		}
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 

application/controllers/api/frontend/v1/notiz/NotizPerson.php

@@ -24,6 +24,7 @@ class NotizPerson extends Notiz_Controller
 		//Load Models
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 		//Permission checks for allowed Oes
 		if ($this->router->method == 'addNewNotiz')
@@ -38,7 +39,7 @@ class NotizPerson extends Notiz_Controller
 			{
 				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 			}
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ( $this->router->method == 'updateNotiz')
@@ -59,7 +60,7 @@ class NotizPerson extends Notiz_Controller
 			$person_id = current($data)->person_id;
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ($this->router->method == 'deleteNotiz' )
@@ -78,7 +79,7 @@ class NotizPerson extends Notiz_Controller
 			}
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 	}
 
@@ -99,44 +100,20 @@ class NotizPerson extends Notiz_Controller
 	}
 
 	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOneUidExists($person_id, $allowedStgs)
+	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
 	{
-		//get all studentUids of person_id
-		$result = $this->BenutzerModel->loadWhere(['person_id' => $person_id]);
+		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$checkarray = [];
 		foreach ($data as $item)
 		{
-			//check if isStudent
-			$result = $this->StudentModel->isStudent($item->uid);
-
-			$isStudent = $this->getDataOrTerminateWithError($result);
-			if($isStudent)
+			if(in_array($item->studiengang_kz, $allowedStgs))
 			{
-				$checkarray[]  = $this->_checkAllowedStgsFromUid($item->uid, $allowedStgs);
+				return true;
 			}
-
 		}
-		if (!in_array(1, $checkarray))
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
-	}
 
-	private function _checkAllowedStgsFromUid($student_uid, $allowedStgs)
-	{
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		if (!in_array($studiengang_kz, $allowedStgs))
-		{
-			return 0;
-		}
-		else
-		{
-			return 1;
-		}
+		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
 	}
 }

application/controllers/api/frontend/v1/organisation/LocationApi.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class LocationApi extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getLocationsByCompanyType'=> self::PERM_LOGGED,
+		]);
+
+		$this->load->library('form_validation');
+
+		$this->load->model('organisation/standort_model', 'StandortModel');
+
+		$this->loadPhrases([
+			'global',
+			'ui',
+		]);
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+    public function getLocationsByCompanyType() {
+		$companyType = $this->input->get('companyType');
+		if (!isset($companyType)) {
+			$this->terminateWithError('companyType parameter is required', REST_Controller::HTTP_BAD_REQUEST);
+			return;
+		}
+
+		$result = $this->StandortModel->getByCompanyType($companyType);
+		
+		return $this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+	}
+}

application/controllers/api/frontend/v1/organisation/OrganizationalUnitApi.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class OrganizationalUnitApi extends FHCAPI_Controller
+{
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllOrganizationalUnits'=> array('basis/organisationseinheit:r'),
+		]);
+
+		$this->load->library('form_validation');
+
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		$this->loadPhrases([
+			'global'
+		]);
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getAllOrganizationalUnits()
+	{
+		$entitledOrganizationalUnitsShortCodes = $this->permissionlib->getOE_isEntitledFor('basis/organisationseinheit');
+
+		$this->OrganisationseinheitModel->db->where_in('oe_kurzbz', $entitledOrganizationalUnitsShortCodes);
+		$result = $this->OrganisationseinheitModel->load();
+		
+		$organization_units_result = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($organization_units_result);
+	}
+}

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

@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-		
+
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,40 +851,44 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$this->load->config('stv');
-		$tags = $this->config->item('stv_prestudent_tags');
 
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags)) {
-			$tags = array_keys($tags);
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
 
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->db->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 			}
-			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			$subQueryTag = "
+			  (
+				SELECT
+				  tag.prestudent_id,
+				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+				FROM (
+				  SELECT DISTINCT ON (n.notiz_id)
+					n.notiz_id AS id,
+					nt.typ_kurzbz,
+					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+					n.text AS notiz,
+					nt.style,
+					n.erledigt AS done,
+					nz.prestudent_id
+				  FROM public.tbl_notizzuordnung AS nz
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+				. $whereTags .
+				"
+				) AS tag
+				GROUP BY tag.prestudent_id
+			  ) AS tag_data_agg
+			";
 		}
-		$subQueryTag = "
-		  (
-			SELECT
-			  tag.prestudent_id,
-			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-			FROM (
-			  SELECT DISTINCT ON (n.notiz_id)
-				n.notiz_id AS id,
-				nt.typ_kurzbz,
-				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-				n.text AS notiz,
-				nt.style,
-				n.erledigt AS done,
-				nz.prestudent_id
-			  FROM public.tbl_notizzuordnung AS nz
-				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-			. $whereTags .
-			"
-			) AS tag
-			GROUP BY tag.prestudent_id
-		  ) AS tag_data_agg
-		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -907,11 +911,17 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
 
 
 		$this->PrestudentModel->addSelect("b.uid");
-		$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

application/controllers/dashboard/Admin.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class Admin extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'dashboard/admin:rw',
+				'preview' => 'dashboard/admin:r',
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/admin.php', []);
+	}
+
+	public function preview($dashboard_kurzbz = 'CIS')
+	{
+		$this->load->view('dashboard/preview.php', [
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
+	}
+}

application/controllers/dashboard/Api.php

@@ -1,76 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class Api extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'		=> 'dashboard/admin:rw',
-				'getNews'	=> 'dashboard/benutzer:r',
-                'getAmpeln'	=> 'dashboard/benutzer:r',
-			)
-		);
-
-		$this->load->library('AuthLib', null, 'AuthLib');
-
-		$this->_setAuthUID();
-	}
-
-	public function index()
-	{
-		echo 'Dashboard API Controller';
-	}
-
-	/**
-	 * Get News.
-	 */
-	public function getNews()
-	{
-		$limit =  $this->input->get('limit');
-
-		$this->load->model('content/News_model', 'NewsModel');
-
-		$result = $this->NewsModel->getAll($limit);
-
-		if (hasData($result))
-		{
-			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->terminateWithJsonError('fehler entdeckt');
-		}
-	}
-
-
-	/**
-	 * Get Ampeln.
-	 */
-	public function getAmpeln()
-	{
-
-		$this->load->model('content/Ampel_model', 'AmpelModel');
-		$result = $this->AmpelModel->getByUser($this->_uid);
-
-		if (hasData($result))
-		{
-			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->terminateWithJsonError('fehler entdeckt');
-		}
-	}
-
-	/**
-	 * Retrieve the UID of the logged user and checks if it is valid
-	 */
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid) show_error('User authentification failed');
-	}
-}

application/controllers/dashboard/Config.php

@@ -1,216 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Config
- *
- * @author bambi
- */
-class Config extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> 'dashboard/benutzer:r',
-				'dummy'							=> 'dashboard/benutzer:r',
-				'genWidgetId'					=> 'dashboard/benutzer:rw',
-				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
-				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
-				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
-				'funktionen'					=> 'dashboard/admin:r',
-				'preset'						=> 'dashboard/admin:r',
-				'presetBatch'					=> 'dashboard/admin:r'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->library('AuthLib', null, 'AuthLib');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-	
-	public function index()
-	{
-		$dashboard_kurzbz = $this->input->get('db');
-		$uid = $this->AuthLib->getAuthObj()->username;
-
-		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
-		if(!$dashboard) {
-			http_response_code(404);
-			$this->terminateWithJsonError(array(
-				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
-			));
-		}
-		
-		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
-		$this->outputJsonSuccess($mergedconfig);
-	}
-	
-	public function genWidgetId()
-	{
-		$dashboard_kurzbz = $this->input->get('db');
-		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
-		$this->outputJsonSuccess(array(
-			'widgetid' => $widgetid
-		));
-	}
-	
-	public function addWidgetsToPreset()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		
-		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-		
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
-		
-		$preset->preset = json_encode($preset_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if (isError($result)) {
-			http_response_code(500);
-			$this->terminateWithJsonError('preset could not be saved');
-		}
-		
-		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
-	}
-	
-	public function removeWidgetFromPreset()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$widgetid = $input->widgetid;
-				
-		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if ($preset === null) {
-			http_response_code(404);
-			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
-		}
-		
-		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
-		{
-			http_response_code(404);
-			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
-		}
-		
-		$preset->preset = json_encode($preset_decoded);
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if (isError($result))
-		{
-			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');
-		}
-		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
-	}
-
-	public function addWidgetsToUserOverride()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $this->AuthLib->getAuthObj()->username;
-		
-		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
-		$override_decoded = json_decode($override->override, true);
-
-		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdateOverride($override);
-		if (isError($result)) {
-			http_response_code(500);
-			$this->terminateWithJsonError('override could not be saved');
-		}
-		
-		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
-	}
-	
-	public function removeWidgetFromUserOverride()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $this->AuthLib->getAuthObj()->username;
-		$widgetid = $input->widgetid;
-		
-		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
-		if (empty($override)) {
-			http_response_code(404);
-			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
-		}
-		
-		$override_decoded = json_decode($override->override, true);
-		
-		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
-		{
-			http_response_code(404);
-			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
-		}
-		
-		$override->override = json_encode($override_decoded);
-		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
-		if (isError($result))
-		{
-			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');
-		}
-		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
-	}
-	
-	public function funktionen()
-	{
-		$funktionen = $this->FunktionModel->load();
-
-		if (isError($funktionen)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($funktionen)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($funktionen) ?: []);
-	}
-	
-	public function preset()
-	{
-		$db = $this->input->get('db');
-		$funktion = $this->input->get('funktion');
-
-		$conf = $this->DashboardLib->getPreset($db, $funktion);
-
-		if (!$conf)
-			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
-
-		return $this->outputJsonSuccess(json_decode($conf->preset, true));
-	}
-	
-	public function presetBatch()
-	{
-		$db = $this->input->get('db');
-		$funktionen = $this->input->get('funktionen');
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->DashboardLib->getPreset($db, $funktion);
-			if ($conf)
-			{
-				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
-			}
-			else
-				$result[$funktion] = [];
-		}
-
-		return $this->outputJsonSuccess($result);
-	}
-}

application/controllers/dashboard/Dashboard.php

@@ -1,86 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Widget
- *
- * @author chris
- */
-class Dashboard extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> 'dashboard/admin:r',
-				'create'						=> 'dashboard/admin:rw',
-				'update'						=> 'dashboard/admin:rw',
-				'delete'						=> 'dashboard/admin:rw'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-	
-	public function index()
-	{
-		$result = $this->DashboardModel->load();
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function create()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->insert($input);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function update()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->update($input->dashboard_id, $input);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function delete()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->delete($input->dashboard_id);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-}

application/controllers/dashboard/DashboardDemo.php

@@ -1,58 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- */
-class DashboardDemo extends Auth_Controller
-{
-    private $_uid;  // uid of the logged user
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // Set required permissions
-        parent::__construct(
-            array(
-                'index' => 'dashboard/benutzer:r',
-                'admin' => 'dashboard/admin:rw'
-            )
-        );
-
-        $this->load->library('AuthLib');
-        $this->load->library('WidgetLib');
-
-        $this->_setAuthUID(); // sets property uid
-
-        $this->setControllerId(); // sets the controller id
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-	public function index()
-	{
-		$this->load->view('dashboard/dashboard_demo.php', []);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-    public function admin()
-    {
-        $this->load->view('dashboard/dashboard_demo_admin.php', []);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-    /**
-     * Retrieve the UID of the logged user and checks if it is valid
-     */
-    private function _setAuthUID()
-    {
-        $this->_uid = getAuthUID();
-
-        if (!$this->_uid) show_error('User authentification failed');
-    }
-}

application/controllers/dashboard/Widget.php

@@ -1,134 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Widget
- *
- * @author chris
- */
-class Widget extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-				'getAll'						=> 'dashboard/admin:r',
-				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-				'setAllowed'					=> 'dashboard/admin:rw'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-	}
-	
-	public function index()
-	{
-		$widget_id = $this->input->get('id');
-
-		$widget = $this->WidgetModel->load($widget_id);
-
-		if (isError($widget) || !getData($widget))
-			return $this->outputJsonSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current(getData($widget));
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		return $this->outputJsonSuccess($widget);
-	}
-	
-	public function getAll()
-	{
-		$dashboard_id = $this->input->get('dashboard_id');
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
-
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
-
-		$tmpwidgets = getData($result) ?: [];
-		$widgets = array_map(function($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $tmpwidgets);
-
-		$this->outputJsonSuccess($widgets);
-	}
-	
-	public function getWidgetsForDashboard()
-	{
-		$db = $this->input->get('db');
-		$result = $this->WidgetModel->getForDashboard($db);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-
-		$tmpwidgets = getData($result) ?: [];
-		$widgets = array_map(function($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $tmpwidgets);
-
-		$this->outputJsonSuccess($widgets);
-	}
-	
-	public function setAllowed()
-	{
-		$input = $this->getPostJSON();
-
-		$dashboard_id = $input->dashboard_id;
-		$widget_id = $input->widget_id;
-		$action = $input->action;
-
-		if ($action == 'add') {
-			$result = $this->DashboardWidgetModel->insert([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		} elseif ($action == 'delete') {
-			$result = $this->DashboardWidgetModel->delete([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		} else {
-			http_response_code(404); // TODO(chris): 400?
-			$this->terminateWithJsonError([
-				'error' => 'action value invalid'
-			]);
-		}
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		return $this->outputJsonSuccess(getData($result));
-	}
-}

application/controllers/jobs/AbgabetoolJob.php

@@ -495,6 +495,10 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
+		if(!$retval) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -557,6 +561,8 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
+			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
+			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -575,6 +581,8 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
+				$relevantCounter++;
+
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -633,6 +641,11 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
+			if($relevantCounter == 0) {
+				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
+				continue;
+			}
+			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 

application/core/FHCAPI_Controller.php

@@ -154,6 +154,11 @@ class FHCAPI_Controller extends Auth_Controller
 		$this->returnObj['meta'][$key] = $value;
 	}
 
+	public function addTabulatorPaginationData($lastPage = 1)
+	{
+		$this->returnObj['last_page'] = $lastPage;
+	}
+
 	/**
 	 * @param string				$key
 	 * @return mixed

application/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

application/libraries/CustomFormValidationLib.php

@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2022 fhcomplete.net
+ * @license             GPLv3
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class CustomFormValidationLib extends CI_Form_validation
+{
+	public function __construct($rules = array())
+	{
+		parent::__construct($rules);
+
+		$this->_ci =& get_instance();
+	}
+
+	function explicit_integer($value)
+	{
+		if ($value === null) {
+			return true;
+		}
+
+		if ($value === '') {
+			return false;
+		}
+
+		if (filter_var($value, FILTER_VALIDATE_INT) !== false) {
+			return true;
+		}
+
+		return false;
+	}
+
+	function explicit_numeric($value)
+	{
+		if ($value === null) {
+			return true;
+		}
+
+		if ($value === '') {
+			return false;
+		}
+
+		if (is_numeric($value)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	function explicit_boolean($value)
+	{
+		if ($value === null) {
+			return true;
+		}
+
+		if ($value === '') {
+			return false;
+		}
+
+		if ($value === 'true' || $value === 'false' || $value === true || $value === false || $value === 1 || $value === 0) {
+			return true;
+		}
+
+		return false;
+	}
+
+	function does_exist($value, $params)
+	{
+		if ($value === null ) {
+			return true;
+		}
+
+		if ($value === '') {
+			return false;
+		}
+
+		$parts = explode('.', $params);
+		if (count($parts) !== 3) {
+			return false;
+		}
+
+		$subDatabase = $parts[0];
+		$table = $parts[1];
+		$field = $parts[2];
+
+		$result = $this->_ci->db->select('COUNT(*) as count')
+			->from("$subDatabase.$table")
+			->where($field, $value)
+			->get();
+
+		if ($result === false) {
+			return false;
+		}
+		
+		return $result->row()->count > 0;
+	}
+}

application/libraries/PermissionLib.php

@@ -50,6 +50,7 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
+	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -61,6 +62,8 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
+		$this->access_rights = null;
+
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -69,8 +72,10 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj)
+			if ($authObj) {
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
+				$this->access_rights = self::$bb->berechtigungen;
+			}
 		}
 	}
 
@@ -340,6 +345,16 @@ class PermissionLib
         }
     }
 
+	/**
+	 * Returns the access rights for the current user
+	 *
+	 * @return array|null
+	 */
+	public function getAccessRights()
+	{
+		return $this->access_rights;
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

application/libraries/dashboard/DashboardLib.php

@@ -49,7 +49,7 @@ class DashboardLib
 	
 	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,14 +57,31 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id, $uid)
+	public function getDefaultConfig($dashboard_id)
 	{
-		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+		$funktion_kurzbzs = [];
+		$rights = $this->_ci->permissionlib->getAccessRights();
+		if ($rights)
+			$funktion_kurzbzs = array_unique(array_map(function ($right) {
+				return $right->funktion_kurzbz;
+			}, $rights));
+		
+		$this->_ci->DashboardPresetModel->db
+			->group_start()
+				->where_in('funktion_kurzbz', $funktion_kurzbzs)
+				->or_where('funktion_kurzbz IS NULL')
+			->group_end();
+
+		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
+		
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard_id
+		]);
 		$defaultconfig = array();
 		
-		if (hasData($res_presets))
+		if (hasData($result))
 		{
-			$presets = getData($res_presets);
+			$presets = getData($result);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -137,8 +154,10 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel
-			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard->dashboard_id,
+			'funktion_kurzbz' => $funktion_kurzbz
+		]);
 		
 		if (hasData($result))
 		{
@@ -195,11 +214,11 @@ class DashboardLib
 	{
 		foreach ($addwigets as $widget)
 		{
-			if(!isset($widget->widgetid))
+			if(!isset($widget['widgetid']))
 			{
-				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
+				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
 			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
 		}
 	}
 	

application/libraries/requests/RoomRequest.php

@@ -0,0 +1,92 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class RoomRequest
+{
+    protected $_ci;
+
+    public function __construct()
+    {
+        $this->_ci =& get_instance();
+        $this->_ci->load->library('CustomFormValidationLib');
+    }
+
+     public function validate($method = 'create')
+    {
+       if ($method === 'create') {
+			$this->_ci->customformvalidationlib->set_rules('ort_kurzbz', 'kurzbezeichnung', 'required|is_unique[tbl_ort.ort_kurzbz]|max_length[16]|regex_match[/^[a-zA-Z0-9_.]+$/]', [
+				'required' => $this->_ci->p->t('ui', 'error_fieldRequired', ['field' =>  $this->_ci->p->t('gruppenmanagement', 'kurzbezeichnung')]),
+				'is_unique' => $this->_ci->p->t('ui', 'error_fieldUnique', ['field' =>  $this->_ci->p->t('gruppenmanagement', 'kurzbezeichnung')]),
+				'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('gruppenmanagement', 'kurzbezeichnung'), 'max' => 16]),
+				'regex_match' => $this->_ci->p->t('ui', 'error_fieldInvalidFormat', ['field' =>  $this->_ci->p->t('gruppenmanagement', 'kurzbezeichnung')])
+			]);
+		}
+		
+		$this->_ci->customformvalidationlib->set_rules('parent_ort_kurzbz', 'parent_ort_kurzbz', 'does_exist[public.tbl_ort.ort_kurzbz]|max_length[16]', [
+			'does_exist' => $this->_ci->p->t('ui', 'error_entryDoesExists', ['entry' =>  $this->_ci->p->t('ui', 'parentRoom')]),
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('ui', 'parentRoom'), 'max' => 16])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('oe_kurzbz', 'oe_kurzbz', 'does_exist[public.tbl_organisationseinheit.oe_kurzbz]|max_length[32]', [
+			'does_exist' => $this->_ci->p->t('ui', 'error_entryDoesExists', ['entry' =>  $this->_ci->p->t('lehre', 'organisationseinheit')]),
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('lehre', 'organisationseinheit'), 'max' => 32])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('standort_id', 'standort_id', 'explicit_integer|does_exist[public.tbl_standort.standort_id]', [
+			'does_exist' => $this->_ci->p->t('ui', 'error_entryDoesExists', ['entry' =>  $this->_ci->p->t('person', 'standort')]),
+		]);
+		$this->_ci->customformvalidationlib->set_rules('content_id', 'content_id', 'explicit_integer|does_exist[campus.tbl_content.content_id]', [
+			'explicit_integer' => $this->_ci->p->t('ui', 'error_fieldInteger', ['field' =>  $this->_ci->p->t('ui', 'contentId')]),
+			'does_exist' => $this->_ci->p->t('ui', 'error_entryDoesExists', ['entry' =>  $this->_ci->p->t('ui', 'contentId')])
+		]);
+
+		$this->_ci->customformvalidationlib->set_rules('lehre', 'lehre', 'explicit_boolean', [
+			'explicit_boolean' => $this->_ci->p->t('ui', 'error_fieldBoolean', ['field' =>  $this->_ci->p->t('ui', 'lehre')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('reservieren', 'reservieren', 'explicit_boolean', [
+			'explicit_boolean' => $this->_ci->p->t('ui', 'error_fieldBoolean', ['field' =>  $this->_ci->p->t('ui', 'reservieren')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('aktiv', 'aktiv', 'explicit_boolean', [
+			'explicit_boolean' => $this->_ci->p->t('ui', 'error_fieldBoolean', ['field' =>  $this->_ci->p->t('person', 'aktiv')])
+		]);
+		
+		$this->_ci->customformvalidationlib->set_rules('bezeichnung', 'bezeichnung', 'max_length[64]', [
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('ui', 'bezeichnung'), 'max' => 64])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('planbezeichnung', 'planbezeichnung', 'max_length[8]', [
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('ui', 'planbezeichnung'), 'max' => 8])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('max_person', 'maxPerson', 'explicit_integer', [
+			'explicit_integer' => $this->_ci->p->t('ui', 'error_fieldInteger', ['field' =>  $this->_ci->p->t('ui', 'maxPersons')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('stockwerk', 'stockwerk', 'explicit_integer', [
+			'explicit_integer' => $this->_ci->p->t('ui', 'error_fieldInteger', ['field' =>  $this->_ci->p->t('ui', 'stockwerk')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('m2', 'm2', 'explicit_numeric', [
+			'explicit_numeric' => $this->_ci->p->t('ui', 'error_fieldNumeric', ['field' =>  $this->_ci->p->t('ui', 'quadratmeter')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('dislozierung', 'dislozierung', 'explicit_numeric', [
+			'explicit_numeric' => $this->_ci->p->t('ui', 'error_fieldNumeric', ['field' =>  $this->_ci->p->t('ui', 'dislozierung')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('kosten', 'kosten', 'explicit_numeric', [
+			'explicit_numeric' => $this->_ci->p->t('ui', 'error_fieldNumeric', ['field' =>  $this->_ci->p->t('ui', 'kosten')])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('telefonklappe', 'telefonklappe', 'max_length[8]', [
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('person', 'telefonklappe'), 'max' => 8])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('gebteil', 'gebteil', 'max_length[32]', [
+			'max_length' => $this->_ci->p->t('ui', 'error_fieldMaxLength', ['field' =>  $this->_ci->p->t('ui', 'gebaudeteil'), 'max' => 32])
+		]);
+		$this->_ci->customformvalidationlib->set_rules('arbeitsplaetze', 'arbeitsplaetze', 'explicit_integer', [
+			'explicit_integer' => $this->_ci->p->t('ui', 'error_fieldInteger', ['field' =>  $this->_ci->p->t('ui', 'arbeitsplaetze')])
+		]);
+
+        return $this->_ci->customformvalidationlib->run();
+    }
+
+    public function errors()
+    {
+        return $this->_ci->customformvalidationlib->error_array();
+    }
+
+     
+}

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,6 +3,7 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -22,6 +23,7 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
+	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -69,6 +71,11 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
+
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$vertragsbestandteil = new VertragsbestandteilLohnguide();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -127,6 +134,12 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
+					'VertragsbestandteilLohnguide_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
+				break;
+
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -10,6 +10,7 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -0,0 +1,155 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilLohnguide extends Vertragsbestandteil
+{
+	protected $stellenbezeichnung;
+	protected $vordienstzeit;
+	protected $fachrichtung_kurzbz;
+	protected $modellstelle_kurzbz;
+	protected $kommentar_person;
+	protected $kommentar_modellstelle;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+
+	public function getStellenbezeichnung()
+	{
+		return $this->stellenbezeichnung;
+	}
+
+	public function setStellenbezeichnung($stellenbezeichnung): self
+	{
+		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
+		$this->stellenbezeichnung = $stellenbezeichnung;
+		return $this;
+	}
+
+	public function getVordienstzeit()
+	{
+		return $this->vordienstzeit;
+	}
+
+	public function setVordienstzeit($vordienstzeit): self
+	{
+		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
+		$this->vordienstzeit = $vordienstzeit;
+		return $this;
+	}
+
+	public function getFachrichtung_kurzbz()
+	{
+		return $this->fachrichtung_kurzbz;
+	}
+
+	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
+	{
+		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
+		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
+		return $this;
+	}
+
+	public function getModellstelle_kurzbz()
+	{
+		return $this->modellstelle_kurzbz;
+	}
+
+	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
+	{
+		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
+		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
+		return $this;
+	}
+
+	public function getKommentar_person()
+	{
+		return $this->kommentar_person;
+	}
+
+	public function setKommentar_person($kommentar_person): self
+	{
+		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
+		$this->kommentar_person = $kommentar_person;
+		return $this;
+	}
+
+	public function getKommentar_modellstelle()
+	{
+		return $this->kommentar_modellstelle;
+	}
+
+	public function setKommentar_modellstelle($kommentar_modellstelle): self
+	{
+		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
+		$this->kommentar_modellstelle = $kommentar_modellstelle;
+		return $this;
+	}
+
+	
+	
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
+		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
+		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
+		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
+		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
+		$this->fromdb = false;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'vordienstzeit' => $this->getVordienstzeit(),
+			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
+			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
+			'kommentar_person' => $this->getKommentar_person(),
+			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	/* public function validate()
+	{
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		}
+		
+		return parent::validate();
+	} */
+}

application/models/dashboard/Dashboard_Preset_model.php

@@ -11,57 +11,4 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
-
-	/**
-	 * Get Presets of given uid.
-	 * @param integer dashboard_id
-	 * @param string $uid
-	 * @return array
-	 */
-	public function getPresets($dashboard_id, $uid)
-	{
-		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
-		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
-		$sql = <<<EOSQL
-			SELECT 
-				* 
-			FROM 
-				dashboard.tbl_dashboard_preset 
-			WHERE 
-				dashboard_id = ? 
-			AND (
-					funktion_kurzbz IN (
-						SELECT 
-							DISTINCT funktion_kurzbz 
-						FROM 
-							public.tbl_benutzerfunktion 
-						WHERE 
-							uid = ? 
-						AND 
-							NOW()::date 
-						BETWEEN 
-							COALESCE(datum_von, '1970-01-01') 
-						AND 
-							COALESCE(datum_bis, '2170-12-31')
-					) 
-					OR 
-						funktion_kurzbz IS NULL
-				) 
-			ORDER BY 
-				funktion_kurzbz DESC
-EOSQL;
-		
-		return $this->execQuery($sql, array($dashboard_id, $uid));
-	}
-	
-	/**
-	 * Get Preset by Dashboard and Funktion
-	 * @param integer dashboard_id
-	 * @param string funktion_kurzbz
-	 * @return array
-	 */
-	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
-	{
-		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
-	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -402,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1

application/models/education/Paabgabe_model.php

@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/organisation/Standort_model.php

@@ -35,5 +35,15 @@ class Standort_model extends DB_Model
 
 		return $this->loadWhere(array("firma_id" => $firma_id));
 	}
+
+	public function getByCompanyType($companyType)
+	{
+		$query = "SELECT s.* FROM public.tbl_standort s
+				JOIN public.tbl_firma f ON s.firma_id = f.firma_id
+				JOIN public.tbl_adresse a ON s.adresse_id = a.adresse_id
+				WHERE f.firmentyp_kurzbz = ?;";
+
+		return $this->execReadOnlyQuery($query, [$companyType]);
+	}
 }
 

application/models/organisation/Studiengang_model.php

@@ -594,7 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/person/Benutzerfunktion_model.php

@@ -261,6 +261,42 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
+	/**
+	 * Get active Kompetenzfeldleitung bei UID.
+	 *
+	 * @param $uid
+	 * @return array|stdClass|null
+	 */
+	public function getKFLByUID($uid)
+	{
+		$query = '
+            SELECT
+			  	bf.uid,
+				bf.oe_kurzbz,
+  				oe.organisationseinheittyp_kurzbz
+            FROM
+			  	public.tbl_benutzerfunktion bf
+				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+  				JOIN public.tbl_benutzer b USING (uid)
+            WHERE
+                b.uid = ?
+              	AND b.aktiv = TRUE
+                AND funktion_kurzbz = \'Leitung\'
+               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
+              	AND (datum_von IS NULL OR datum_von <= now())
+              	AND (datum_bis IS NULL OR datum_bis >= now())
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		return $this->execQuery($query, $parameters_array);
+	}
+
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/system/Message_model.php

@@ -242,6 +242,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
+		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
 		$sql = <<<EOSQL
 			with filtered_messages as (
 				select
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;
 
-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -0,0 +1,11 @@
+<?php
+
+class VertragsbestandteilLohnguide_model extends DB_Model
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
+		$this->pk = 'vertragsbestandteil_id';
+	}
+}

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

@@ -37,7 +37,8 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

application/views/dashboard/admin.php

@@ -8,9 +8,15 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Dashboard.js'],
+		'primevue3' => true,
+		'vuedatepicker11' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css'
+			'public/css/components/dashboard.css',
+			'public/css/components/primevue.css',
 		],
 		'navigationcomponent' => true
 	)
@@ -25,7 +31,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
+			<dashboard-admin></dashboard-admin>
 		</div>
 	</div>
 

application/views/dashboard/preview.php

@@ -8,7 +8,12 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'vuedatepicker11' => true,
+		'primevue3' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -23,9 +28,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard</h1>
+				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
 			</div>
-			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/room_manager/index.php

@@ -0,0 +1,41 @@
+<?php
+$includesArray = array(
+	'title' => ucfirst($this->p->t('ui', 'roomManagerPageTitle')),
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'tabulator5' => true,
+	'fontawesome6' => true,
+	'primevue3' => true,
+	'navigationcomponent' => true,
+	'filtercomponent' => true,
+	'vuedatepicker11' => true,
+    'customJSs' => array(
+		'vendor/moment/luxonjs/luxon.min.js'
+	),
+	'customJSModules' => array(
+		'public/js/apps/RoomManagerApp.js'
+	),
+	'customCSSs' => array(
+        'public/css/components/primevue.css',
+		'public/css/components/verticalsplit.css',
+		'public/extensions/FHC-Core-Developer/css/FhcMain.css',
+		'public/css/components/calendar.css',
+		'public/css/components/vue-datepicker.css',
+		'public/css/roomManagerOverview.css'
+	)
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+	<core-navigation-cmpt></core-navigation-cmpt>
+	<router-view
+		cis-root="<?= CIS_ROOT; ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+	>
+	</router-view>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

cis/private/info/service_uebersicht.php

@@ -46,12 +46,13 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
+	include('../../../include/meta/jquery.php');
+	include('../../../include/meta/jquery-tablesorter.php');
+
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
+		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/testtool/menu.php

@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,6 +342,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
+			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
+
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,6 +1708,7 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
+	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1725,6 +1726,7 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
+	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/student/studentdetailoverlay.xul.php

@@ -802,6 +802,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
 								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
+								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -828,6 +832,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

content/student/studentoverlay.js.php

@@ -3550,9 +3550,19 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
+		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
+		case 'microcredential_4':
+		case 'microdegree_1':
+		case 'microdegree_2':
+		case 'microdegree_3':
+		case 'microdegree_4':
+		case 'microdegreeabschluss_1':
+		case 'microdegreeabschluss_2':
+		case 'microdegreeabschluss_3':
+		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/entwicklungsteam.class.php

@@ -364,9 +364,10 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT *
+			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
+					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -394,6 +395,7 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
+				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}

include/lehreinheitmitarbeiter.class.php

@@ -552,9 +552,41 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
+		// get relevant Studiensemester
+		$studiensemester_kurzbz_arr = [];
+
+		$qry = '
+			SELECT
+				studiensemester_kurzbz
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start BETWEEN
+				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+				'. $this->db_add_param($ende->format('Y-m-d'));
+
+		if ($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
+
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
+
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
+				SELECT
+					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -564,38 +596,104 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					 AND (
-					 	ss.start BETWEEN
-					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
+					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
+					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
-				AND lema.semesterstunden != 0
+					AND lema.semesterstunden != 0
 			)
 
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz
+				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode
 			ORDER BY
 				studiengang_kz;
 		';
 
 		if ($this->db_query($qry))
 		{
+			$additionalLehrgaenge = [];
+
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
+				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
+
+				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
+				{
+					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
+
+					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
+					{
+						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
+						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
+						{
+							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
+							{
+								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
+								if (
+									$studiengang_kz == $row->studiengang_kz
+									|| isset(
+										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
+									)
+								) continue;
+
+								// Lehrgang erstellen
+								$lg = new StdClass();
+								$lg->mitarbeiter_uid = $uid;
+								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
+								$lg->lgartcode = $lehrgang->lgartcode;
+								$lg->studiengang_kz = $lehrgang->studiengang_kz;
+								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
+								$lg->summe = $row->summe;
+								$lg->sws = $row->sws;
+								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
+								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
+							}
+						}
+					}
+
+					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
+					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
+					{
+						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
+
+						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
+						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
+						$sws = $row->sws/(count($addLehrgaenge) + 1);
+
+						// neue sws zuweisen
+						$obj->summe = $summeSws;
+						$obj->sws = $sws;
+
+						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
+						{
+							// sws fuer jeden verknuepften Lehrgang zuweisen
+							$lehrgang->summe = $summeSws;
+							$lehrgang->sws = $sws;
+
+							// neue lehrgang sws hinzufuegen
+							$this->result [] = $lehrgang;
+						}
+					}
+				}
+
 				$this->result []= $obj;
 			}
 			return true;
@@ -655,4 +753,63 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
+	/**
+	 * Get "connected" Lehrgaenge for equal sws distribution.
+	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
+	 * @return object success or error
+	 */
+	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
+	{
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
+
+		$qry = "
+			WITH gruppen AS (
+				SELECT
+					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
+					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
+				FROM
+					lehre.tbl_lehreinheitmitarbeiter lema
+					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
+					JOIN public.tbl_studiengang stg USING (studiengang_kz)
+					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
+				WHERE
+					bismelden
+					AND stg.melderelevant
+					AND stg.typ = 'l'
+					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
+			)
+			SELECT
+				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			FROM
+				gruppen gr
+			GROUP BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			ORDER BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
+
+		$lehrgaengeDistributions = [];
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				// group by properties
+				$lehrgaengeDistributions
+					[$row->mitarbeiter_uid]
+					[$row->studiensemester_kurzbz]
+					[$row->lehreinheit_id]
+					[$row->studiengang_kz]
+					= $row;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		return $lehrgaengeDistributions;
+	}
+
 }

include/lehrelisthelper.class.php

@@ -270,6 +270,8 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
+					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
+						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

include/ort.class.php

@@ -54,7 +54,7 @@ class ort extends basis_db
 	public $m2;				// numeric(8,2)
 	public $gebteil;		// varchar(32)
 	public $arbeitsplaetze;	// integer
-	
+	public $parent_ort_kurzbz; // varchar(16)
 	public $ort_kurzbz_old;	// string
 
 	/**
@@ -117,6 +117,7 @@ class ort extends basis_db
 			$ort_obj->oe_kurzbz			= $row->oe_kurzbz;
 			$ort_obj->gebteil			= $row->gebteil;
 			$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
+			$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
 			$this->result[] = $ort_obj;
 		}
 		return true;
@@ -185,6 +186,7 @@ class ort extends basis_db
 			$ort_obj->oe_kurzbz			= $row->oe_kurzbz;
 			$ort_obj->gebteil			= $row->gebteil;
 			$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
+			$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
 			$this->result[] = $ort_obj;
 		}
 		return true;
@@ -232,6 +234,7 @@ class ort extends basis_db
 			$this->oe_kurzbz		= $row->oe_kurzbz;
 			$this->m2				= $row->m2;
 			$this->arbeitsplaetze	= $row->arbeitsplaetze;
+			$this->parent_ort_kurzbz = $row->parent_ort_kurzbz;
 		}
 		else
 		{
@@ -287,7 +290,7 @@ class ort extends basis_db
 		{
 			//Neuen Datensatz anlegen
 			$qry = 'INSERT INTO public.tbl_ort (ort_kurzbz, bezeichnung, planbezeichnung, max_person, aktiv, lehre, reservieren, lageplan,
-				dislozierung, kosten, stockwerk, standort_id, telefonklappe, insertamum, insertvon, updateamum, updatevon, content_id,ausstattung,m2,gebteil,oe_kurzbz,arbeitsplaetze) VALUES ('.
+				dislozierung, kosten, stockwerk, standort_id, telefonklappe, insertamum, insertvon, updateamum, updatevon, content_id,ausstattung,m2,gebteil,oe_kurzbz,arbeitsplaetze,parent_ort_kurzbz) VALUES ('.
 				$this->db_add_param($this->ort_kurzbz).', '.
 				$this->db_add_param($this->bezeichnung).', '.
 				$this->db_add_param($this->planbezeichnung).', '.
@@ -310,7 +313,8 @@ class ort extends basis_db
 				$this->db_add_param($this->m2).','.
 				$this->db_add_param($this->gebteil).','.
 				$this->db_add_param($this->oe_kurzbz).','.
-				$this->db_add_param($this->arbeitsplaetze).');';
+				$this->db_add_param($this->arbeitsplaetze).','.
+				$this->db_add_param($this->parent_ort_kurzbz).');';
 		}
 		else
 		{
@@ -337,7 +341,8 @@ class ort extends basis_db
 				'm2='.$this->db_add_param($this->m2).', '.
 				'gebteil='.$this->db_add_param($this->gebteil).', '.
 				'oe_kurzbz='.$this->db_add_param($this->oe_kurzbz).', '.
-				'arbeitsplaetze='.$this->db_add_param($this->arbeitsplaetze).' '.
+				'arbeitsplaetze='.$this->db_add_param($this->arbeitsplaetze).', '.
+				'parent_ort_kurzbz='.$this->db_add_param($this->parent_ort_kurzbz).' '.
 				'WHERE ort_kurzbz = '.$this->db_add_param(($this->ort_kurzbz_old!='')?$this->ort_kurzbz_old:$this->ort_kurzbz).';';
 		}
 
@@ -455,7 +460,8 @@ class ort extends basis_db
 				$ort_obj->gebteil 			= $row->gebteil;
 				$ort_obj->oe_kurzbz 		= $row->oe_kurzbz;
 				$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
-	
+				$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
+
 				$this->result[] = $ort_obj;
 			}
 			return true;
@@ -523,6 +529,7 @@ class ort extends basis_db
 			$ort_obj->gebteil 			= $row->gebteil;
 			$ort_obj->oe_kurzbz 		= $row->oe_kurzbz;
 			$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
+			$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
 
 			$this->result[] = $ort_obj;
 		}
@@ -577,6 +584,8 @@ class ort extends basis_db
 			$ort_obj->oe_kurzbz			= $row->oe_kurzbz;
 			$ort_obj->gebteil			= $row->gebteil;
 			$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
+			$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
+
 			$this->result[] = $ort_obj;
 		}
 		return true;
@@ -634,6 +643,7 @@ class ort extends basis_db
 				$ort_obj->oe_kurzbz			= $row->oe_kurzbz;
 				$ort_obj->gebteil			= $row->gebteil;
 				$ort_obj->arbeitsplaetze	= $row->arbeitsplaetze;
+				$ort_obj->parent_ort_kurzbz = $row->parent_ort_kurzbz;
 				$this->result[] = $ort_obj;
 			}
 			return true;

include/prestudent.class.php

@@ -706,6 +706,7 @@ class prestudent extends person
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
 				$rolle->fgm = $row->fgm;
+				$rolle->faktiv = $this->db_parse_bool($row->faktiv);
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;

public/css/components/dashboard/news.css

@@ -193,3 +193,6 @@
 	word-break: break-word;
 }
 
+.news-list-item p {
+	word-break: break-word;
+}

public/css/roomManagerOverview.css

@@ -0,0 +1,41 @@
+html {
+    font-size: .75em;
+}
+
+nav.navbar.navbar-header,
+nav.navbar.navbar-left-side {
+    font-size: 18px
+}
+
+nav.navbar.navbar-left-side {
+        padding-top: 8px;
+    padding-bottom: 8px;
+}
+
+/* Relative sizing inside navbar */
+nav.navbar .nav-item {
+    font-size: 18px
+}
+
+nav.navbar .navbar-brand-icon {
+    font-size: 16px
+}
+
+nav.navbar .left-side-menu-link-entry {
+    font-size: 14px !important;
+}
+
+nav.navbar .nav-link {
+    font-size: 18px;
+    padding-top: 15px;
+    padding-bottom: 8px;
+}
+
+nav.navbar .dropdown-menu {
+    padding: 8px 0px;
+}
+
+nav.navbar .dropdown-item {
+    font-size: 16px;
+    padding: 4px 16px;
+}

public/js/api/factory/dashboard/board.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	list() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/board/list'
+		};
+	},
+	add(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/create',
+			params
+		};
+	},
+	update(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/update',
+			params
+		};
+	},
+	delete(dashboard_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/delete',
+			params: { dashboard_id }
+		};
+	}
+}

public/js/api/factory/dashboard/preset.js

@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	list(dashboard_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/preset/list/'
+				+ encodeURIComponent(dashboard_kurzbz)
+		};
+	},
+	getBatch(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/getBatch',
+			params
+		};
+	},
+	addWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/addWidget',
+			params
+		};
+	},
+	removeWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/removeWidget',
+			params
+		};
+	}
+};

public/js/api/factory/dashboard/user.js

@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/user/get/' + dashboard
+		};
+	},
+	addWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/addWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	},
+	removeWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/removeWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	}
+};

public/js/api/factory/dashboard/widget.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get(widget) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/get/' + widget
+		};
+	},
+	list(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/list/' + dashboard
+		};
+	},
+	listAllowed(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/listAllowed/' + dashboard
+		};
+	},
+	setAllowed(dashboard_id, widget_id, allowed) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/widget/setAllowed',
+			params: {
+				dashboard_id, widget_id, allowed
+			}
+		};
+	}
+};

public/js/api/factory/location.js

@@ -0,0 +1,10 @@
+
+export default {
+	getLocationsByCompanyType(companyType) {
+        return {
+            method: 'get',
+            url: '/api/frontend/v1/organisation/LocationApi/getLocationsByCompanyType',
+            params: { companyType }
+        };
+    }
+};

public/js/api/factory/messages/messages.js

@@ -17,13 +17,16 @@
 
 export default {
 	getMessages(params) {
+		let url = 'api/frontend/v1/messages/messages/getMessages'
+				+ '/' + params.id
+				+ '/' + params.type;
+			if(params.size && params.page) {
+				url += '/' + params.size
+				+ '/' + params.page;
+			}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getMessages/'
-				+ params.id + '/'
-				+ params.type + '/'
-				+ params.size + '/'
-				+ params.page
+			url: url
 		};
 	},
 	getVorlagen(){

public/js/api/factory/organizationalUnit.js

@@ -0,0 +1,8 @@
+export default {
+  getAllOrganizationalUnits() {
+    return {
+      method: "get",
+      url: "api/frontend/v1/organisation/organizationalUnitApi/getAllOrganizationalUnits",
+    };
+  },
+}

public/js/api/factory/ort.js

@@ -16,11 +16,52 @@
  */
 
 export default {
-	getContentID(ort_kurbz) {
+	getAllRooms(params) {
+
+        return {
+            method: 'get',
+            url: 'api/frontend/v1/Ort/getAllRooms',
+            params: {
+                "filter[oe_kurzbz]" : params?.organizationalUnitShortCode,
+                "filter[standort_id]" : params?.locationId,
+                "filter[gebteil]" : params?.buildingComponent,
+                "filter[lehre]" : params?.isForTrainingProgram,
+                "filter[reservieren]" : params?.isReservationNeeded,
+                "filter[aktiv]" : params?.isActive,
+				"filter[ort_kurzbz]" : params?.shortCode,
+				"filter[bezeichnung]" : params?.description,
+				"filter[planbezeichnung]" : params?.planDescription,
+				"filter[max_person]" : params?.maxPersons,
+				"filter[arbeitsplaetze]" : params?.workplace,
+				"filter[m2]" : params?.squareMeters,
+				"filter[org_organisationseinheittyp_kurzbz_org_bezeichnung_concat]" : params?.orgUnitConcatDescription,
+				"filter[kosten]" : params?.costs,
+				"filter[stockwerk]" : params?.floor,
+				"filter[parent_ort_kurzbz]" : params?.parentRoomShortCode,
+				"filter[ort_kurzbz_bezeichnung_concat]" : params?.ort_kurzbz_bezeichnung_concat,
+				"sort[ort_kurzbz]" : params?.sort?.ort_kurzbz,
+				"sort[bezeichnung]" : params?.sort?.bezeichnung,
+				"sort[planbezeichnung]" : params?.sort?.planbezeichnung,
+				"sort[max_person]" : params?.sort?.max_person,
+				"sort[arbeitsplaetze]" : params?.sort?.arbeitsplaetze,
+				"sort[m2]" : params?.sort?.m2,
+				"sort[org_organisationseinheittyp_kurzbz_org_bezeichnung_concat]" : params?.sort?.org_organisationseinheittyp_kurzbz_org_bezeichnung_concat,
+				"sort[lehre]" : params?.sort?.lehre,
+				"sort[reservieren]" : params?.sort?.reservieren,
+				"sort[aktiv]" : params?.sort?.aktiv,
+				"sort[kosten]" : params?.sort?.kosten,
+				"sort[stockwerk]" : params?.sort?.stockwerk,
+				"sort[parent_ort_kurzbz]" : params?.sort?.parent_ort_kurzbz,
+				"pagination[page]" : params?.pagination?.page,
+				"pagination[size]" : params?.pagination?.size,
+            }
+        }
+    },
+	getContentID(ort_kurzbz) {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Ort/ContentID',
-			params: { ort_kurzbz: ort_kurbz }
+			params: { ort_kurzbz: ort_kurzbz }
 		};
 	},
 	getRooms(datum, von, bis, typ, personenanzahl = 0) {
@@ -30,11 +71,37 @@ export default {
 			params: { datum, von, bis, typ, personenanzahl }
 		};
 	},
+	getRoom(ort_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getRoom/' + ort_kurzbz,
+		};
+	},
 	getRoomTypes() {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Ort/getTypes',
 			params: { }
 		};
+	},
+	createRoom(roomData) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Ort/createRoom',
+			params: roomData
+		}
+	},
+	updateRoom(roomId, roomData) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Ort/updateRoom/' + roomId,
+			params: roomData
+		}
+	},
+	deleteRoom(ort_kurzbz) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Ort/deleteRoom/' + ort_kurzbz,
+		}
 	}
 };

public/js/api/factory/roomToRoomType.js

@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getRoomToRoomTypeRelationsByRoomShortCode(roomShortCode) {
+        return {
+            method: 'get',
+            url: `api/frontend/v1/RoomToRoomTypeApi/getRoomToRoomTypeRelationsByRoomShortCode/${roomShortCode}`,
+        }
+    },
+    createRoomToRoomTypeRelation(roomShortCode, roomTypeShortCode, hierarchy) {
+        return {
+            method: 'post',
+            url: `api/frontend/v1/RoomToRoomTypeApi/createRoomToRoomTypeRelation`,
+            params: {
+                roomShortCode,
+                roomTypeShortCode,
+                hierarchy
+            },
+        }
+    },
+    deleteRoomToRoomTypeRelation(roomShortCode, roomTypeShortCode, hierarchy) {
+        return {
+            method: 'post',
+            url: `api/frontend/v1/RoomToRoomTypeApi/deleteRoomToRoomTypeRelation`,
+            params: {
+                roomShortCode,
+                roomTypeShortCode,
+                hierarchy
+            },
+        }
+    }
+};

public/js/api/factory/roomType.js

@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAllRoomTypes() {
+        return {
+            method: 'get',
+            url: 'api/frontend/v1/RoomTypeApi/getAllRoomTypes',
+        }
+    },
+    createRoomType(roomTypeData) {
+        return {
+            method: 'post',
+            url: 'api/frontend/v1/RoomTypeApi/createRoomType',
+            params: roomTypeData,
+        }
+    },
+};

public/js/apps/Dashboard/Admin.js

@@ -1,16 +1,67 @@
-import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import { CoreNavigationCmpt } from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
+
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const app = Vue.createApp({
-  name: 'AdminApp',
-  data: () => ({
-      appSideMenuEntries: {}
-    }),
-  components: {
-    CoreNavigationCmpt,
-    DashboardAdmin
-  }
+	name: 'DashboardAdminApp',
+	data: () => ({
+		appSideMenuEntries: {},
+		renderers: null
+	}),
+	components: {
+		CoreNavigationCmpt,
+		DashboardAdmin
+	},
+	provide() {
+		return {
+			// TODO(chris): move those two into the components that need it
+			renderers: Vue.computed(() => this.renderers),
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
+		};
+	},
+	created() {
+		this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => {
+				for (let rendertype of Object.keys(res.data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (res.data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
+					if (res.data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
+					if (res.data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
+
+					if (res.data[rendertype].calendarEventStyles) {
+						var head = document.head;
+						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = res.data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if (this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			})
+			.catch(this.$fhcAlert.handleSystemErrors);
+	}
 });
 app.use(PluginsPhrasen);
+app.directive('tooltip', primevue.tooltip);
 app.mount('#main');

public/js/apps/Dashboard/Preview.js

@@ -0,0 +1,17 @@
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import CoreDashboard from '../../components/Dashboard/Dashboard.js';
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+
+const app = Vue.createApp({
+  name: 'DashboardPreviewApp',
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    CoreDashboard
+  }
+});
+app.use(PluginsPhrasen);
+app.directive('tooltip', primevue.tooltip);
+app.mount('#main');

public/js/apps/RoomManagerApp.js

@@ -0,0 +1,57 @@
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import RoomManagerOverview from "../components/RoomManager/RoomManagerOverview.js";
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
+
+import FhcAlert from "../plugins/FhcAlert.js";
+import Phrasen from "../plugins/Phrasen.js";
+import FhcApi from "../plugins/Api.js";
+
+import {capitalize} from "../helpers/StringHelpers.js";
+
+const ciPath =
+  FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, "") +
+  FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+  history: VueRouter.createWebHistory(),
+  routes: [
+    {
+      name: "overview",
+      path: `/${ciPath}/RoomManager`,
+      component: RoomManagerOverview,
+    },
+  ],
+});
+
+const app = Vue.createApp({
+  components: {
+    RoomManagerOverview,
+    CoreNavigationCmpt
+  },
+});
+
+
+app.config.globalProperties.$capitalize = capitalize;
+
+app.use(router)
+  .use(primevue.config.default, { zIndex: { overlay: 9999 } })
+  .use(FhcAlert)
+  .use(Phrasen)
+  .use(FhcApi)
+  .mount("#main");

public/js/components/Bootstrap/Confirm.js

@@ -17,7 +17,7 @@ export default {
 		</template>
 		<template v-slot:footer>
 			<button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
-			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'cancel')}}</button>
 		</template>
 	</bs-modal>`
 }

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -180,7 +180,7 @@ export const AbgabetoolAssistenz = {
 					// 	frozen: true,
 					// 	width: 40
 					// },
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 100, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -226,7 +226,7 @@ export const AbgabetoolAssistenz = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2026_02_26"
+				persistenceID: "abgabetool_2026_03_16"
 			},
 			abgabeTableEventHandlers: [
 			{
@@ -645,7 +645,7 @@ export const AbgabetoolAssistenz = {
 			actionButtons.className = "d-flex gap-3"; // you can keep Bootstrap gap if loaded
 			actionButtons.style.display = "flex";
 			actionButtons.style.alignItems = "stretch"; // buttons stretch to full height
-			actionButtons.style.justifyContent = "center";
+			actionButtons.style.justifyContent = "start";
 			actionButtons.style.height = "100%"; // full grid cell height
 
 			const val = cell.getValue();
@@ -675,8 +675,20 @@ export const AbgabetoolAssistenz = {
 				createButton('fa fa-timeline', 'abgabetool/c4termineTimeLine', () => this.openTimeline(val))
 			);
 
+			if(val.latestTerminWithUpload) {
+				actionButtons.append(
+					createButton('fa fa-download', 'abgabetool/c4downloadLatestAbgabe', () => this.downloadAbgabe(val.latestTerminWithUpload.paabgabe_id, val.student_uid, val.projektarbeit_id))
+				)
+			}
+
 			return actionButtons;
 		},
+		downloadAbgabe(paabgabe_id, student_uid, projektarbeit_id) {
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}&projektarbeit_id=${projektarbeit_id}`;
+
+			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
+			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+		},
 
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -780,6 +792,8 @@ export const AbgabetoolAssistenz = {
 					// TODO: mehrsprachig englisch
 					projekt.note_bez = opt.bezeichnung
 				}
+
+				const latestTerminWithUpload = this.findLatestTerminWithUpload(projekt)
 				
 				return {
 					...projekt,
@@ -787,6 +801,7 @@ export const AbgabetoolAssistenz = {
 					details: {
 						student_uid: projekt.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
+						latestTerminWithUpload: latestTerminWithUpload ?? null
 					},
 					pkz: this.buildPKZ(projekt),
 					beurteilung: projekt.beurteilungLink ?? null,
@@ -800,6 +815,15 @@ export const AbgabetoolAssistenz = {
 				}
 			})
 		},
+		findLatestTerminWithUpload(projekt) {
+			const withAbgabedatumSorted = projekt?.abgabetermine?.filter(t => t.abgabedatum != null)?.sort((a,b) => a < b)
+
+			if(withAbgabedatumSorted.length) {
+				return withAbgabedatumSorted[0]
+			}
+
+			return null
+		},
 		createInfoString(data) {
 			let str = '';
 
@@ -1413,9 +1437,12 @@ export const AbgabetoolAssistenz = {
 		
 		<div id="abgabetable" style="max-height:40vw;">
 			<div class="row">
-				<div class="col-auto">
+				<div class="col-auto me-auto">
 					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 				</div>
+				<div class="col-auto">
+					<label class="col-form-label">{{$capitalize($p.t('lehre/studiengang'))}}:</label>
+				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$capitalize($p.t('lehre/studiengang'))" 
@@ -1430,6 +1457,9 @@ export const AbgabetoolAssistenz = {
 						</template>
 					</Dropdown>
 				</div>
+				<div class="col-auto">
+					<label class="col-form-label">{{$capitalize($p.t('lehre/note'))}}:</label>
+				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$p.t('lehre/note')" 

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

@@ -667,8 +667,10 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loading=true
 
-			const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+			const projektarbeiten = this.projektarbeiten?.retval ?? this.projektarbeiten
 
+			const pa = projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+			
 			let paIsBenotet = false
 			if(pa.note !== undefined && pa.note !== null) {
 				// check if the note is not defined as a non final projektarbeit note

public/js/components/Dashboard/Admin.js

@@ -3,15 +3,20 @@ import DashboardAdminEdit from "./Admin/Edit.js";
 import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
+import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
+import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
+
 export default {
+	name: 'DashboardAdmin',
 	components: {
 		DashboardAdminEdit,
 		DashboardAdminWidgets,
-		DashboardAdminPresets
+		DashboardAdminPresets,
 	},
 	provide() {
 		return {
-			adminMode: true
+			adminMode: true,
+			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
 		};
 	},
 	data() {
@@ -22,9 +27,6 @@ export default {
 		};
 	},
 	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		},
 		dashboard() {
 			return this.dashboards.find(el => el.dashboard_id == this.current);
 		}
@@ -35,33 +37,50 @@ export default {
 			BsPrompt.popup('New Dashboard name').then(
 				name => {
 					_name = name;
-					return axios.post(this.apiurl + '/Dashboard/create', {
+					const params = {
 						dashboard_kurzbz: name
-					})
-				}
-			).then(res => {
-				let newDashboard = {
-					dashboard_id: res.data.retval,
-					dashboard_kurzbz: _name,
-					beschreibung: ''
-				};
-				this.dashboards.push(newDashboard);
-				this.current = newDashboard.dashboard_id;
-			}).catch(err => err !== undefined ? console.error('ERROR:', err) : 0);
+					};
+					return this.$api
+						.call(ApiDashboardBoard.add(params))
+						.then(response =>{
+							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+
+							let newDashboard = {
+								dashboard_id: response.data,
+								dashboard_kurzbz: _name,
+								beschreibung: ''
+							};
+							this.dashboards.push(newDashboard);
+							this.current = newDashboard.dashboard_id;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+					});
 		},
 		dashboardUpdate(dashboard) {
-			// TODO(chris): Loading or message
-			axios.post(this.apiurl + '/Dashboard/update', dashboard).then(() => {
-				let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
-				old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
-				old.beschreibung = dashboard.beschreibung;
-			}).catch(err => console.error('ERROR:', err));
+			return this.$api
+				.call(ApiDashboardBoard.update(dashboard))
+				.then(response =>{
+
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+
+					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
+					old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
+					old.beschreibung = dashboard.beschreibung;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			axios.post(this.apiurl + '/Dashboard/delete', {dashboard_id}).then(() => {
-				this.current = -1;
-				this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-			}).catch(err => console.error('ERROR:', err));
+			return this.$api
+				.call(ApiDashboardBoard.delete(dashboard_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.current = -1;
+					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
+				});
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
@@ -72,22 +91,35 @@ export default {
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Dashboard').then(res => {
-			this.dashboards = res.data.retval;
-		}).catch(err => console.error('ERROR:', err));
+		this.$api
+			.call(ApiDashboardBoard.list())
+			.then(result => {
+				this.dashboards = result.data.retval;
+				for (const dashboard of this.dashboards) {
+					this.$api
+						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
+						.then(res => {
+							dashboard.widgetSetup = res.data;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				}
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `<div class="dashboard-admin">
+
 		<div class="input-group">
-			<label for="dashbaord-select" class="input-group-text">Dashboard:</label>
-			<select id="dashbaord-select" class="form-select" v-model="current">
+			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
+			<select id="dashboard-select" class="form-select" v-model="current">
 				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
 		</div>
+
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">Edit</button>
+					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
 				</li>
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
@@ -101,7 +133,7 @@ export default {
 					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
 				</div>
 				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
-					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @change="test" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
 				</div>
 				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
 					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>

public/js/components/Dashboard/Admin/Edit.js

@@ -18,7 +18,8 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm.popup('Sure?').then(() => this.$emit('delete', this.dashboard_id)).catch();
+			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
 	template: `<div class="dashboard-admin-edit px-3">
@@ -31,8 +32,8 @@ export default {
 			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">Delete</button>
-			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">Update</button>
+			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Admin/Presets.js

@@ -1,6 +1,7 @@
 import DashboardSection from "../Section.js";
 import DashboardWidgetPicker from "../Widget/Picker.js";
 import ObjectUtils from "../../../helpers/ObjectUtils.js";
+import ApiDashboardPreset from "../../../api/factory/dashboard/preset.js";
 
 export default {
 	components: {
@@ -17,9 +18,6 @@ export default {
 		tmpLoading: ''
 	}),
 	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		},
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
@@ -28,6 +26,7 @@ export default {
 		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
+				widget.id = 'loading_' + String((new Date()).valueOf());
 				delete widget.custom;
 				widget.preset = 1;
 				let loading = {...widget};
@@ -36,130 +35,153 @@ export default {
 					if (section.name == section_name)
 						section.widgets.push(loading);
 				});
-				
-				axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
-					db: this.dashboard,
+
+				const params = {
+					dashboard: this.dashboard,
 					funktion_kurzbz: section_name,
-					widgets: [widget]
-				}).then(result => {
-					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
-					widget.id = newId;
-					widget.custom = 1;
-					this.sections.forEach(section => {
-						if (section.name == section_name) {
-							section.widgets.splice(section.widgets.indexOf(loading),1);
-							section.widgets.push(widget);
-						}
-					});
-				}).catch(error => {
-					console.error('ERROR: ', error);
-					alert('ERROR: ' + error.response.data.retval);
-				});
-			}).catch(() => {});
+					widget
+				};
+
+				return this.$api
+					.call(ApiDashboardPreset.addWidget(params))
+					.then(result => {
+						let newId = result.data;
+						widget.id = newId;
+						widget.custom = 1;
+						this.sections.forEach(section => {
+							if (section.name == section_name) {
+								section.widgets.splice(section.widgets.indexOf(loading),1);
+								section.widgets.push(widget);
+							}
+						});
+						this.funktionen.forEach(funktion => {
+							if(funktion.funktion_kurzbz === section_name && funktion.has_preset < 1) {
+								funktion.has_preset = 1;
+							}
+						});
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			})
+			.catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				for (var i in this.sections) {
-					if (this.sections[i].name == section_name) {
-						for (var wid in this.sections[i].widgets) {
-							if (this.sections[i].widgets[wid].id == k) {
-								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
-								// NOTE(chris): remove internal props
-								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
-									if (payload[k][prop])
-										delete payload[k][prop];
-								break;
-							}
-						}
+				const section = this.sections.find(section => section.name == section_name);
+				for (var wid in section.widgets) {
+					if (section.widgets[wid].id == k) {
+						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
+						// NOTE(chris): remove internal props
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
+							if (payload[k][prop])
+								delete payload[k][prop];
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 				delete payload[k].custom;
 			}
-			axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgets: payload
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name) {
-						section.widgets.forEach((widget, i) => {
-							if (payload[widget.id]) {
-								payload[widget.id].id = widget.id;
-								payload[widget.id].index = widget.index;
-								section.widgets[i] = payload[widget.id];
-								section.widgets[i].custom = 1;
-							}
-						});
-					}
-				});
-			}).catch(error => {
-				// TODO(chris): revert placement on failure
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			this.$api
+				.call(Object.entries(payload).map(([key, widget]) => [
+					key,
+					ApiDashboardPreset.addWidget({
+						dashboard: this.dashboard,
+						funktion_kurzbz: section_name,
+						widget
+					})
+				]))
+				.then(result => {
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.forEach((widget, i) => {
+								if (payload[widget.id]) {
+									payload[widget.id].id = widget.id;
+									payload[widget.id].index = widget.index;
+									section.widgets[i] = payload[widget.id];
+									section.widgets[i].custom = 1;
+								}
+							});
+						}
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		widgetRemove(section_name, id) {
-			axios.post(this.apiurl + '/Config/removeWidgetFromPreset', {
+			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgetid: id
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets = section.widgets.filter(widget => widget.id != id);
-				});
-			}).catch(error => {
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			};
+			return this.$api
+				.call(ApiDashboardPreset.removeWidget(params))
+				.then(result => {
+					this.sections.forEach(section => {
+						if (section.name == section_name)
+							section.widgets = section.widgets.filter(widget => widget.id != id);
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadSections(evt) {
 			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
 			this.sections = [];
 			this.tmpLoading = funktionen.join('###');
-			axios.get(this.apiurl + '/Config/presetBatch', {params: {
+
+			const params = {
 				db: this.dashboard,
 				funktionen
-			}}).then(res => {
-				if (this.tmpLoading !== funktionen.join('###'))
-					return; // NOTE(chris): prevent race condition
-				for (var section in res.data.retval) {
-					let widgets = [];
-					for (var wid in res.data.retval[section]) {
-						res.data.retval[section][wid].id = wid;
-						res.data.retval[section][wid].custom = 1;
-						widgets.push(res.data.retval[section][wid]);
+			};
+
+			return this.$api
+				.call(ApiDashboardPreset.getBatch(params))
+				.then(result => {
+					if (this.tmpLoading !== funktionen.join('###'))
+						return; // NOTE(chris): prevent race condition
+					for (var section in result.data) {
+						let widgets = [];
+						for (var wid in result.data[section]) {
+							result.data[section][wid].id = wid;
+							result.data[section][wid].custom = 1;
+							widgets.push(result.data[section][wid]);
+						}
+						this.sections.push({
+							name: section,
+							widgets
+						});
 					}
-					this.sections.push({
-						name: section,
-						widgets
-					});
-				}
-			}).catch(err => console.error('ERROR:', err));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+		},
+		loadFunktionen() {
+			this.$api
+				.call(ApiDashboardPreset.list(this.dashboard))
+				.then(result => {
+					this.funktionen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Config/funktionen').then(res => {
-			this.funktionen = {general: 'GENERAL'};
-			res.data.retval.forEach(funktion => {
-				this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
-			});
-		}).catch(err => console.error('ERROR:', err));
+		this.loadFunktionen();
 	},
 	watch: {
 		dashboard() {
 			// TODO(chris): this should be done without a watcher
 			this.loadSections({target:this.$refs.funktionenList});
+			this.loadFunktionen();
 		}
 	},
 	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
 				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
-					<option v-for="name,id in funktionen" :key="id" :value="id">{{ name }}</option>
+					<option
+						v-for="funktion in funktionen"
+						:key="funktion.funktion_kurzbz"
+						:value="funktion.funktion_kurzbz"
+						:class="(funktion.has_preset > 0) ? 'fw-bold' : ''"
+					>{{ funktion.beschreibung }}</option>
 				</select>
 			</div>
 			<div class="col-9">

public/js/components/Dashboard/Admin/Widgets.js

@@ -1,3 +1,5 @@
+import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
+
 export default {
 	emits: [
 		"change",
@@ -7,34 +9,25 @@ export default {
 		dashboard_id: Number,
 		widgets: Array
 	},
-	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		}
-	},
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
-			axios.post(this.apiurl + '/Widget/setAllowed', {
-				dashboard_id: this.dashboard_id,
-				widget_id,
-				action: allow ? 'add' : 'delete'
-			}).catch(err => console.error('ERROR: ' + err));
+
+			this.$api
+				.call(ApiDashboardWidget.setAllowed(this.dashboard_id, widget_id, allow))
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Widget/getAll', {
-			params:{
-				dashboard_id: this.dashboard_id
-			}
-		}).then(
-			result => {
-				this.$emit('assignWidgets', result.data.retval.map(el => ({
+		this.$api
+			.call(ApiDashboardWidget.list(this.dashboard_id))
+			.then(result => {
+				this.$emit('assignWidgets', result.data.map(el => ({
 					...el,
-					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
+					allowed: !!el.allowed
 				})));
-			}
-		).catch(err => console.error('ERROR:', err));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="dashboard-admin-widgets">

public/js/components/Dashboard/Dashboard.js

@@ -2,7 +2,8 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
-import ApiDashboard from '../../api/factory/cis/dashboard.js';
+import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
+import ApiDashboardUser from '../../api/factory/dashboard/user.js';
 
 export default {
 	name: 'Dashboard',
@@ -20,181 +21,147 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name && value.uid && value.timezone
+				return value && value.name && value.timezone
 			}
 		}
 	},
 	data() {
 		return {
-			sections: [],
-			widgets: null,
-			editMode: false,
-			viewDataInternal: this.viewData
+			widgets: [],
+			originalWidgets: {},
+			widgetsSetup: null,
+			editMode: false
 		}
 	},
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgets),
+			widgetsSetup: Vue.computed(() => this.widgetsSetup),
 			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
-	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		}
-	},
 	methods: {
 		widgetAdd(section_name, widget) {
-			if (this.widgets === null) {
-				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
-					db: this.dashboard
-				}}).then(res => {
-					res.data.retval.forEach(widget => {
-						widget.arguments = JSON.parse(widget.arguments);
-						widget.setup = JSON.parse(widget.setup);
-					});
-					this.widgets = res.data.retval;
-				}).catch(err => console.error('ERROR:', err));
-			}
-			this.$refs.widgetpicker.getWidget().then(widget_id => {
-				widget.widget = widget_id;
-				widget.id = 'loading_' + String((new Date()).valueOf());
-				let loading = {...widget};
-				loading.loading = true;
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets.push(loading);
-				});
-				
-				axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
-					db: this.dashboard,
-					funktion_kurzbz: section_name,
-					widgets: [widget]
-				}).then(result => {
-					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
-					widget.id = newId;
-					this.sections.forEach(section => {
-						if (section.name == section_name) {
-							section.widgets.splice(section.widgets.indexOf(loading),1);
-							section.widgets.push(widget);
-						}
-					});
-				}).catch(error => {
-					console.error('ERROR: ', error);
-					alert('ERROR: ' + error.response.data.retval);
-				});
-			}).catch(() => {});
+			// TODO(chris): remove section_name? (change order of params => get rid of it)
+			this.$refs.widgetpicker
+				.getWidget()
+				.then(widget_id => {
+					widget.widget = widget_id;
+					widget.id = 'loading_' + String((new Date()).valueOf());
+					let loading = { ...widget };
+					loading.loading = true;
+					this.widgets.push(loading);
+					
+					this.$api
+						.call(ApiDashboardUser.addWidget(this.dashboard, widget))
+						.then(result => {
+							widget.id = result.data;
+							this.widgets.splice(this.widgets.indexOf(loading), 1);
+							this.widgets.push(widget);
+							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(widget));
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				})
+				.catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				for (var i in this.sections) {
-					if (this.sections[i].name == section_name) {
-						for (var wid in this.sections[i].widgets) {
-							if (this.sections[i].widgets[wid].id == k) {
-								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
-								// NOTE(chris): remove internal props
-								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1,preset:1})
-									if (payload[k][prop])
-										delete payload[k][prop];
-								break;
-							}
-						}
+				for (var wid in this.widgets) {
+					if (this.widgets[wid].id == k) {
+						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
+						// NOTE(chris): remove internal props
+						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
+							if (payload[k][prop])
+								delete payload[k][prop];
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 			}
-			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgets: payload
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name) {
-						section.widgets.forEach((widget, i) => {
-							if (payload[widget.id]) {
-								payload[widget.id].id = widget.id;
-								payload[widget.id].index = widget.index;
-								section.widgets[i] = payload[widget.id];
+			this.$api
+				.call(Object.entries(payload).map(([key, widget]) => [
+					key,
+					ApiDashboardUser.addWidget(this.dashboard, widget)
+				]))
+				.then(result => {
+					const failed = result
+						.filter(o => o.status == 'rejected')
+						.map(o => o.reason.config.errorHeader);
+
+					this.widgets.forEach((widget, i) => {
+						if (failed.includes(widget.id)) {
+							this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
+							/** NOTE(chris): if you wanna hide or unhide a
+							 * preset and it fails: switch around the hidden
+							 * value to revert it properly (checkboxes can't
+							 * really handle it otherwise)
+							 */
+							if (payload[widget.id].hidden !== undefined) {
+								this.widgets[i].hidden = payload[widget.id].hidden;
+								this.$nextTick(() => {
+									this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
+								});
 							}
-						});
-					}
-				});
-			}).catch(error => {
-				// TODO(chris): revert placement on failure
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+						} else if (payload[widget.id]) {
+							payload[widget.id].id = widget.id;
+							payload[widget.id].index = widget.index;
+							this.widgets[i] = payload[widget.id];
+							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(this.widgets[i]));
+						}
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		widgetRemove(section_name, id) {
-			axios.post(this.apiurl + '/Config/removeWidgetFromUserOverride', {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgetid: id
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets = section.widgets.filter(widget => widget.id != id);
-				});
-			}).catch(error => {
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			this.$api
+				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
+				.then(() => {
+					this.widgets = this.widgets.filter(widget => widget.id != id);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
 		this.$p.loadCategory('dashboard');
-		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
-			params: {
-				db: this.dashboard
-			}
-		}).then(res => {
-			this.widgets = res.data.retval;
-		}).catch(err => console.error('ERROR:', err));
 
-		axios.get(this.apiurl + '/Config', {params:{
-			db: this.dashboard
-		}}).then(res => {
-			for (var name in res.data.retval) {
-				let widgets = [];
-				let remove = [];
-				for (var wid in res.data.retval[name].widgets) {
-					res.data.retval[name].widgets[wid].id = wid;
-					if (res.data.retval[name].widgets[wid].custom || res.data.retval[name].widgets[wid].preset)
-						widgets.push(res.data.retval[name].widgets[wid]);
-					else
+		this.$api
+			.call(ApiDashboardWidget.listAllowed(this.dashboard))
+			.then(res => {
+				this.widgetsSetup = res.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiDashboardUser.get(this.dashboard))
+			.then(res => {
+				const widgets = [];
+				const remove = [];
+
+				for (var wid in res.data.general.widgets) {
+					let widget = res.data.general.widgets[wid];
+					widget.id = wid;
+					if (widget.custom || widget.preset) {
+						widgets.push(widget);
+						this.originalWidgets[wid] = structuredClone(widget);
+					} else {
 						remove.push(wid);
+					}
 				}
-				this.sections.push({
-					name: name,
-					widgets: widgets
-				});
-				remove.forEach(wid => this.widgetRemove(name, wid));
-			}
-			this.sections = this.sections.sort((section1, section2) => {
-				if(section1.name == 'custom')
-					return 1;
-				if (section2.name == 'custom')
-					return -1;
-				return section2.widgets.length - section1.widgets.length;
-			});
-		}).catch(err => console.error('ERROR:', err));
-	},
-	async beforeMount() {
-		if (!this.viewData.name || !this.viewData.uid) {
-			const res = await this.$api.call(ApiDashboard.getViewData());
-			this.viewDataInternal = res.data
-		}	
+
+				remove.forEach(wid => this.widgetRemove('general', wid));
+
+				this.widgets = widgets;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="core-dashboard">
-		<h3 v-show="viewDataInternal?.name">
-			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
+		<h3>
+			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
+		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Item.js

@@ -1,5 +1,5 @@
 import BsModal from "../Bootstrap/Modal.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
 export default {
@@ -70,6 +70,14 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
+		visible: {
+			get() {
+				return !this.hidden;
+			},
+			set(value) {
+				this.$emit('remove', this.hidden);
+			}
+		}
 	},
 	methods: {
 		unpin(){
@@ -142,8 +150,14 @@ export default {
 			this.isLoading = false;
 		},
 	},
+	setup() {
+		const { actions } = useCachedWidgetLoader();
+		return {
+			loadWidget: actions.load
+		};
+	},
 	async created() {
-		this.widget = await CachedWidgetLoader.loadWidget(this.id);
+		this.widget = await this.loadWidget(this.id);
 		let component = (await import(this.widget.setup.file)).default;
 		this.$options.components["widget" + this.widget.widget_id] = component;
 		this.component = "widget" + this.widget.widget_id;
@@ -185,7 +199,7 @@ export default {
 			</a>
 			<Transition>
 				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
 				</div>
 			</Transition>
 		</div>

public/js/components/Dashboard/Section.js

@@ -1,7 +1,7 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
 export default {
@@ -125,23 +125,23 @@ export default {
 		},
 		checkResizeLimit(item, w, h) {
 			// NOTE(chris): widgets needs to be loaded for this to work
-			let widget = CachedWidgetLoader.getWidget(item.widget);
+			let widget = this.widgetState[item.widget];
 			if (widget) {
-				let minmaxW = widget.setup.width;
+				let minmaxW = { ...widget.setup.width };
 				if (minmaxW.max)
 					minmaxW.min = minmaxW.min || 1;
 				else
-					minmaxW = {min:minmaxW,max:minmaxW};
+					minmaxW = { min: minmaxW, max: minmaxW };
 				if (w < minmaxW.min)
 					w = minmaxW.min; 
 				if (w > minmaxW.max)
 					w = minmaxW.max;
 
-				let minmaxH = widget.setup.height;
+				let minmaxH = { ...widget.setup.height };
 				if (minmaxH.max)
 					minmaxH.min = minmaxH.min || 1;
 				else
-					minmaxH = {min:minmaxH,max:minmaxH};
+					minmaxH = { min: minmaxH, max: minmaxH };
 				if (h < minmaxH.min)
 					h = minmaxH.min;
 				if (h > minmaxH.max)
@@ -151,7 +151,7 @@ export default {
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup('Are you sure you want to delete this widget?').then(() => this.$emit('widgetRemove', this.name, item.id));
+				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
@@ -199,6 +199,13 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
+	setup() {
+		const { state: widgetState } = useCachedWidgetLoader();
+
+		return {
+			widgetState
+		};
+	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;

public/js/components/Form/Input.js

@@ -170,6 +170,7 @@ export default {
 				return this.$attrs.modelValue;
 			},
 			set(v) {
+				this.clearValidationForThisName()
 				if (!this.$attrs.hasOwnProperty('modelValue'))
 					this.modelValueDummy = v;
 				this.$emit('update:modelValue', v);
@@ -242,9 +243,9 @@ export default {
 	template: `
 	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
 		<label v-if="label && lcType != 'radio' && lcType != 'checkbox'" :class="!noAutoClass && 'form-label'" :for="idCmp">{{label}}</label>
-		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
-		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)"></textarea>
-		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
+		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)">
+		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)"></textarea>
+		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)">
 			<slot></slot>
 		</select>
 		<component

public/js/components/Messages/Details/NewMessage/Modal.js

@@ -133,6 +133,7 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
+					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
@@ -203,24 +204,6 @@ export default {
 		},
 	},
 	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal);
-				}
-			}
-		},
 		messageId: {
 			immediate: true,
 			handler: async function (newMessageId) {
@@ -231,6 +214,7 @@ export default {
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
+						this.editor.setContent(this.replyData[0].replyBody);
 						this.formData.subject = this.replyData[0].replySubject;
 						this.formData.body = this.replyData[0].replyBody;
 						this.formData.relationmessage_id = newMessageId;
@@ -290,19 +274,6 @@ export default {
 
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-
-		//case of reply
-		if(this.messageId) {
-			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
-				.then(result => {
-					this.replyData = result.data;
-					this.formData.subject = this.replyData[0].replySubject;
-					this.formData.body = this.replyData[0].replyBody;
-					this.formData.relationmessage_id = this.messageId;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
 	},
 	async mounted() {
 		this.initTinyMCE();

public/js/components/Messages/Details/NewMessage/NewDiv.js

@@ -64,7 +64,16 @@ export default {
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
 				//height: 800,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
+				plugins: 'link',
+				link_context_toolbar: true,
+				automatic_uploads: true,
+				default_link_target: "_blank",
+				link_title: true,
+				target_list: [
+					{ title: 'New tab', value: '_blank' },
+					{ title: 'Same tab', value: '_self' }
+				],
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -98,7 +107,8 @@ export default {
 			return this.$api
 				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					if(this.openMode == "inSamePage")
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
 					this.resetForm();
 					this.messageSent = true;
@@ -114,19 +124,17 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
+					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(){
-			console.log("subj" + this.formData.subject);
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
 			data.append('ids', JSON.stringify(this.id));
 
-			console.log("subj" + this.formData.subject);
-
 			return this.$api
 				.call(ApiMessages.getPreviewText(
 					this.typeId, data))
@@ -195,6 +203,7 @@ export default {
 				.call(ApiMessages.getReplyData(messageId))
 				.then(result => {
 					this.replyData = result.data;
+					this.editor.setContent(this.replyData[0].replyBody);
 					this.formData.subject = this.replyData[0].replySubject;
 					this.formData.body = this.replyData[0].replyBody;
 					this.formData.relationmessage_id = messageId;
@@ -202,27 +211,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
-	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal);
-				}
-			}
-		},
-	},
 	created(){
 		const missingparamsmsgs = [];
 		if(!this.typeId)
@@ -291,17 +279,8 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		//case of reply
-		if(this.messageId != null) {
+		if(this.messageId) {
 			this.loadReplyData(this.messageId);
-/*			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
-				.then(result => {
-					this.replyData = result.data;
-					this.formData.subject = this.replyData[0].replySubject;
-					this.formData.body = this.replyData[0].replyBody;
-					this.formData.relationmessage_id = this.messageId;
-				})
-				.catch(this.$fhcAlert.handleSystemError);*/
 		}
 
 	},
@@ -499,10 +478,10 @@ export default {
 						
 						<div class="row">
 							<div class="col-6" style="border-right: 1px">
-								You can safely close this window.
+								You can safely close this window/tab.
 							</div>
 							<div class="col-6">
-								Sie können dieses Fenster schließen.
+								Fenster/Reiter kann geschlossen werden!
 							</div>
 						</div>
 				</div>

public/js/components/Messages/Details/TableMessages.js

@@ -65,7 +65,14 @@ export default {
 		buildTreemap(messages) {
 			if (!messages || !messages.data || messages.data.length === 0)
 			{
-				return {data: [], last_page: 0};
+				if(this.tabulatorOptions.pagination)
+				{
+					return {data: [], last_page: 0};
+				}
+				else
+				{
+					return [];
+				}
 			}
 
 			const last_page = messages.meta.count;
@@ -106,7 +113,15 @@ export default {
 				// to avoid endless loop
 				if (iteration > messages.length) break;
 			}
-			return {data: messageNested, last_page: last_page};
+
+			if(this.tabulatorOptions.pagination)
+			{
+				return {data: messageNested, last_page: last_page};
+			}
+			else
+			{
+				return messageNested;
+			}
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
@@ -252,7 +267,7 @@ export default {
 						frozen: true
 					}
 				],
-				pagination: true,
+				pagination: false,
 				paginationMode: "remote",
 				paginationSize: 15,
 				paginationInitialPage: 1,

public/js/components/Messages/Messages.js

@@ -82,14 +82,16 @@ export default {
 				this.$refs.modalMsg.show();
 			}
 			else if (this.openMode == "inSamePage"){
-				console.log("in same Page");
 				this.isVisibleDiv = true;
-				if(messageId)
-					this.$refs.templateNewDivMessage.loadReplyData(messageId);
-				else
-					this.$refs.templateNewDivMessage.resetForm();
 
-				this.$refs.templateNewDivMessage.showTemplate();
+				this.$nextTick(() => {
+					if(messageId)
+						this.$refs.templateNewDivMessage.loadReplyData(messageId);
+					else
+						this.$refs.templateNewDivMessage.resetForm();
+
+					this.$refs.templateNewDivMessage.showTemplate();
+				});
 			}
 			else
 				console.log("no valid openMode");

public/js/components/RoomManager/RoomFormModal.js

@@ -0,0 +1,562 @@
+import ApiRoom from "../../../js/api/factory/ort.js";
+import ApiLocation from "../../../js/api/factory/location.js";
+import ApiOrganizationalUnit from "../../../js/api/factory/organizationalUnit.js";
+
+import BsModal from "../Bootstrap/Modal.js";
+import CoreForm from "../Form/Form.js";
+import FormInput from "../Form/Input.js";
+
+export default {
+  name: "RoomFormModal",
+  components: {
+    BsModal,
+    CoreForm,
+    FormInput,
+  },
+  props: {
+    isVisible: {
+      type: Boolean,
+      required: true,
+    },
+    editedRoomShortCode: {
+      type: String,
+      default: null,
+    },
+  },
+  emits: ["hideBsModal", "roomCreated", "roomUpdated"],
+  watch: {
+    isVisible(newValue) {
+      if (newValue) {
+        this.$refs.roomFormModal.show();
+      } else {
+        this.$refs.roomFormModal.hide();
+      }
+    },
+    editedRoomShortCode(newValue) {
+      if (newValue) {
+        this.editRoom(newValue);
+      } else {
+        this.resetRoomForm();
+      }
+    }, 
+  },
+  data: () => {
+    return {
+      isEditInProgress: false,
+      organizationalUnits: [],
+      filteredOrganizationalUnits: [],
+      locations: [],
+      rooms: [],
+      filteredRooms: [],
+      editedRoom: null,
+      roomFormData: {
+        aktiv: true,
+      },
+    };
+  },
+  computed: {
+    dropdownParsedOrganizationalUnits() {
+      return this.organizationalUnits.map((unit) => {
+        return {
+          label: `${unit.bezeichnung} (${unit.organisationseinheittyp_kurzbz})`,
+          value: unit.oe_kurzbz,
+        };
+      });
+    },
+    dropdownParsedRooms() {
+      return this.rooms.map((room) => {
+        let label = room.ort_kurzbz;
+        if (room.bezeichnung && room.bezeichnung !== '') {
+          label += ` - ${room.bezeichnung}`;
+        }
+
+        return {
+          label,
+          value: room.ort_kurzbz,
+        };
+      });
+    },
+  },
+  methods: {
+    filterOrganizationalUnits(event) {
+      let defaultItem = {
+        label: this.$p.t("ui", "dropdownEmptyOption"),
+        value: null,
+      };
+
+      const query = event.query.toLowerCase();
+      if (!query) {
+        return (this.filteredOrganizationalUnits = [
+          defaultItem,
+          ...this.dropdownParsedOrganizationalUnits,
+        ]);
+      }
+
+      return (this.filteredOrganizationalUnits = [defaultItem].concat(
+        this.dropdownParsedOrganizationalUnits.filter((unit) => {
+          return unit.label.toLowerCase().includes(query);
+        }),
+      ));
+    },
+    async filterRooms(event) {
+      this.rooms = await this.fetchRooms(event.query);
+
+      let defaultItem = {
+        label: this.$p.t("ui", "dropdownEmptyOption"),
+        value: null,
+      };
+
+      const query = event.query.toLowerCase();
+      if (!query) {
+        return (this.filteredRooms = [
+          defaultItem,
+          ...this.dropdownParsedRooms,
+        ]);
+      }
+
+      return (this.filteredRooms = [defaultItem]
+        .concat(this.dropdownParsedRooms)
+        .filter((room) => {
+          return room.label?.toLowerCase().includes(query);
+        }));
+    },
+    createRoom() {
+      return this.$refs.roomForm
+        .call(ApiRoom.createRoom(this.getApiCallParsedRoomFormData()))
+        .then((response) => {
+          this.$fhcAlert.alertSuccess(this.$p.t("ui", "successSave"));
+          this.$emit("roomCreated");
+          this.resetRoomForm();
+          this.hideRoomFormModal();
+        });
+    },
+    async editRoom(roomShortCode) {
+      let getLocationsResponse = await this.$api.call(
+        ApiRoom.getRoom(roomShortCode),
+      );
+      if (getLocationsResponse.meta.status === "success") {
+        this.editedRoom = getLocationsResponse.data;
+      } else {
+        this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingRoomData"));
+        return;
+      }
+
+      this.isEditInProgress = true;
+
+      let orgUnitData = null;
+      let orgUnit = this.organizationalUnits.find(
+        (unit) => unit.oe_kurzbz === this.editedRoom.oe_kurzbz,
+      );
+      if (orgUnit) {
+        orgUnitData = {
+          label: `${orgUnit.bezeichnung} (${orgUnit.organisationseinheittyp_kurzbz})`,
+          value: orgUnit.oe_kurzbz,
+        };
+      }
+
+      let potentialParentRooms = await this.fetchRooms(
+        this.editedRoom.parent_ort_kurzbz,
+      );
+
+      let parentRoomData = null;
+      let parentRoom = potentialParentRooms.find(
+        (room) => room.ort_kurzbz === this.editedRoom.parent_ort_kurzbz,
+      );
+      if (parentRoom) {
+        this.rooms.push(parentRoom);
+        let label = parentRoom.ort_kurzbz;
+        if (parentRoom.bezeichnung && parentRoom.bezeichnung !== '') {
+          label += ` - ${parentRoom.bezeichnung}`;
+        }
+
+        parentRoomData = {
+          label,
+          value: parentRoom.ort_kurzbz,
+        };
+      }
+
+      this.roomFormData = {
+        parentRoom: parentRoomData,
+        locationId: this.editedRoom.standort_id,
+        organizationalUnit: orgUnitData,
+        contentId: this.editedRoom.content_id,
+        kurzbezeichnung: this.editedRoom.ort_kurzbz,
+        bezeichnung: this.editedRoom.bezeichnung,
+        planbezeichnung: this.editedRoom.planbezeichnung,
+        aktiv: this.editedRoom.aktiv,
+        lehre: this.editedRoom.lehre,
+        reservieren: this.editedRoom.reservieren,
+        maxPerson: this.editedRoom.max_person,
+        stockwerk: this.editedRoom.stockwerk,
+        lageplan: this.editedRoom.lageplan,
+        dislozierung: this.editedRoom.dislozierung,
+        kosten: this.editedRoom.kosten,
+        ausstattung: this.editedRoom.ausstattung,
+        telefonklappe: this.editedRoom.telefonklappe,
+        quadratmeter: this.editedRoom.m2,
+        gebaudeteil: this.editedRoom.gebteil,
+        arbeitsplaetze: this.editedRoom.arbeitsplaetze,
+      };
+
+      this.$refs.roomFormModal.show();
+    },
+    updateRoom() {
+      return this.$refs.roomForm
+        .call(
+          ApiRoom.updateRoom(
+            this.editedRoom.ort_kurzbz,
+            this.getApiCallParsedRoomFormData(),
+          ),
+        )
+        .then((response) => {
+          this.$fhcAlert.alertSuccess(this.$p.t("ui", "successSave"));
+          this.$emit("roomUpdated");
+          this.resetRoomForm();
+          this.hideRoomFormModal();
+        });
+    },
+    getApiCallParsedRoomFormData() {
+      return {
+        parent_ort_kurzbz: this.roomFormData.parentRoom?.value,
+        standort_id: this.roomFormData.locationId,
+        oe_kurzbz:
+          this.roomFormData.organizationalUnit?.value !== ""
+            ? this.roomFormData.organizationalUnit?.value
+            : null,
+        content_id:
+          this.roomFormData.contentId !== ""
+            ? this.roomFormData.contentId
+            : null,
+        ort_kurzbz: this.roomFormData.kurzbezeichnung,
+        bezeichnung: this.roomFormData.bezeichnung,
+        planbezeichnung: this.roomFormData.planbezeichnung,
+        aktiv: this.roomFormData.aktiv,
+        lehre: this.roomFormData.lehre,
+        reservieren: this.roomFormData.reservieren,
+        max_person:
+          this.roomFormData.maxPerson !== ""
+            ? this.roomFormData.maxPerson
+            : null,
+        stockwerk:
+          this.roomFormData.stockwerk !== ""
+            ? this.roomFormData.stockwerk
+            : null,
+        lageplan: this.roomFormData.lageplan,
+        dislozierung:
+          this.roomFormData.dislozierung === ""
+            ? null
+            : this.roomFormData.dislozierung,
+        kosten:
+          this.roomFormData.kosten !== "" ? this.roomFormData.kosten : null,
+        ausstattung: this.roomFormData.ausstattung,
+        telefonklappe: this.roomFormData.telefonklappe,
+        m2:
+          this.roomFormData.quadratmeter !== ""
+            ? this.roomFormData.quadratmeter
+            : null,
+        gebteil: this.roomFormData.gebaudeteil,
+        arbeitsplaetze:
+          this.roomFormData.arbeitsplaetze !== ""
+            ? this.roomFormData.arbeitsplaetze
+            : null,
+      };
+    },
+    hideRoomFormModal() {
+      this.$refs.roomFormModal.hide();
+      this.$emit("hideBsModal");
+      this.resetRoomForm();
+    },
+    resetRoomForm() {
+      this.$refs.roomForm.clearValidation();
+      this.isEditInProgress = false;
+      this.editedRoom = null;
+      this.roomFormData = {
+        aktiv: true,
+      };
+    },
+    async fetchRooms(roomSearchTerm = "") {
+      let getRoomsResponse = await this.$api.call(
+        ApiRoom.getAllRooms({
+          ort_kurzbz_bezeichnung_concat: roomSearchTerm,
+          pagination: {
+            page: 1,
+            size: 100,
+          },
+        }),
+      );
+      if (getRoomsResponse.meta.status === "success") {
+        return getRoomsResponse.data;
+      } else {
+        this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingRooms"));
+      }
+
+      return [];
+    },
+    setDefaultLocationOption() {
+      this.locations.unshift({
+        standort_id: null,
+        bezeichnung: this.$p.t("ui", "dropdownEmptyOption"),
+      });
+    },
+  },
+  async created() {
+    let getLocationsResponse = await this.$api.call(
+      ApiLocation.getLocationsByCompanyType("Intern"),
+    );
+    if (getLocationsResponse.meta.status === "success") {
+      this.locations = getLocationsResponse.data;
+    } else {
+      this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingLocations"));
+    }
+
+    let getAllOrganizationalUnitsResponse = await this.$api.call(
+      ApiOrganizationalUnit.getAllOrganizationalUnits(),
+    );
+    if (getAllOrganizationalUnitsResponse.meta.status === "success") {
+      this.organizationalUnits = getAllOrganizationalUnitsResponse.data.sort(
+        (a, b) => a.bezeichnung.localeCompare(b.bezeichnung),
+      );
+    } else {
+      this.$fhcAlert.alertError(
+        this.$p.t("ui", "errorLoadingOrganizationalUnits"),
+      );
+    }
+
+    this.rooms = await this.fetchRooms();
+  },
+   mounted() {
+    this.$p
+      .loadCategory([
+        "global",
+        "lehre",
+        "ui",
+        "gruppenmanagement",
+        "core",
+        "person",
+      ])
+      .then(() => {
+        this.phrasesLoaded = true;
+        this.setDefaultLocationOption();
+      });
+  },
+  template: /* html */ `
+  <bs-modal ref="roomFormModal" size="sm" @hideBsModal="() => { $emit('hideBsModal'); resetRoomForm(); }" class="modal-lg">
+			<template #title>
+				<p v-if="!editedRoom" class="fw-bold mt-3">{{$capitalize($p.t('ui', 'createRoomModalTitle'))}}</p>
+				<p v-else class="fw-bold mt-3">{{$capitalize($p.t('ui', 'editRoomModalTitle'))}}</p>
+			</template>
+      <template #default>
+        <core-form ref="roomForm" class="row g-3 pb-3">
+          <div class="row mb-3">
+            <form-input
+              v-model="roomFormData.parentRoom"
+              :label="$capitalize($p.t('ui/parentRoom'))"
+              :suggestions="filteredRooms"
+              :optionValue="(option) => option.value"
+              :optionLabel="(option) => option.label"
+              :delay="500"
+              @complete="filterRooms"
+              dropdown
+              forceSelection
+              type="autocomplete"
+              name="parent_ort_kurzbz"
+              >
+            </form-input>
+          </div>
+          <div class="row mb-3">
+            <div class="col">
+              <form-input
+                v-model="roomFormData.organizationalUnit"
+                :label="$capitalize($p.t('lehre/organisationseinheit'))"
+                :suggestions="filteredOrganizationalUnits"
+                :optionValue="(option) => option.value"
+                :optionLabel="(option) => option.label" 
+                @complete="filterOrganizationalUnits"
+                dropdown
+                forceSelection
+                type="autocomplete"
+                name="oe_kurzbz"  
+                >
+              </form-input>
+            </div>
+            <div class="col">
+              <form-input
+                v-model="roomFormData.locationId"
+                :label="$capitalize($p.t('person/standort'))"
+                type="select"
+                id="location"
+                name="standort_id"
+                >
+                <option
+                  v-for="location in locations"
+                  :key="location.standort_id"
+                  :value="location.standort_id"
+                  >
+                  {{location.bezeichnung}}
+                </option>
+              </form-input>
+            </div>
+          </div>
+          <div class="row mb-3">
+            <div class="col">
+              <form-input
+                  v-model="roomFormData.lehre"
+                  :label="$capitalize($p.t('ui', 'lehre'))"
+                  type="checkbox"
+                  name="lehre"  
+                >
+              </form-input>
+            </div>
+            <div class="col">
+              <form-input
+                v-model="roomFormData.reservieren"
+                :label="$capitalize($p.t('ui', 'reservieren'))"
+                type="checkbox"
+                name="reservieren"  
+                >
+              </form-input>
+            </div>
+            <div class="col">
+              <form-input
+                v-model="roomFormData.aktiv"
+                :label="$capitalize($p.t('person', 'aktiv'))"
+                type="checkbox"
+                name="aktiv"  
+                >
+              </form-input>
+            </div>
+          </div>
+          <div v-if='!this.editedRoom' class="row mb-3">
+            <form-input
+              v-model="roomFormData.kurzbezeichnung"
+              :label="$capitalize($p.t('gruppenmanagement', 'kurzbezeichnung'))"
+              type="text"
+              name="ort_kurzbz"  
+              >
+            </form-input>
+          </div>
+          <div class="row mb-3">
+            <form-input
+              v-model="roomFormData.bezeichnung"
+              :label="$capitalize($p.t('ui', 'bezeichnung'))"
+              type="text"
+              name="bezeichnung"  
+              >
+            </form-input>
+          </div>
+          <div class="row mb-3">
+            <form-input
+              v-model="roomFormData.planbezeichnung"
+              :label="$capitalize($p.t('ui', 'planbezeichnung'))"
+              type="text"
+              name="planbezeichnung"  
+              >
+            </form-input>
+          </div>
+          <div class="row mb-3">
+            <div class="col">
+              <form-input
+                v-model.number="roomFormData.maxPerson"
+                :label="$capitalize($p.t('ui', 'maxPersons'))"
+                name="max_person"  
+                >
+              </form-input>
+            </div>
+            <div class="col">
+              <form-input
+                  v-model.number="roomFormData.stockwerk"
+                  :label="$capitalize($p.t('ui', 'stockwerk'))"
+                  name="stockwerk"  
+                  >
+              </form-input>
+            </div>
+            <div class="col">
+              <form-input
+                v-model.number="roomFormData.quadratmeter"
+                :label="$capitalize($p.t('ui', 'quadratmeter'))"
+                name="m2"  
+                >
+              </form-input>
+            </div>
+          </div>
+          <div class="row mb-3">
+            <div class='col'>
+              <form-input
+                v-model="roomFormData.telefonklappe"
+                :label="$capitalize($p.t('person', 'telefonklappe'))"
+                name="telefonklappe"  
+                >
+              </form-input>
+            </div>
+            <div class='col'>
+              <form-input
+                v-model.number="roomFormData.arbeitsplaetze"
+                :label="$capitalize($p.t('ui', 'arbeitsplaetze'))"
+                name="arbeitsplaetze"  
+                >
+              </form-input>
+            </div>
+            <div class='col'>
+              <form-input
+                v-model="roomFormData.kosten"
+                :label="$capitalize($p.t('ui', 'kosten'))"
+                type="text"
+                name="kosten"  
+                >
+              </form-input>
+            </div>
+          </div>
+          <div class="row mb-3">
+            <div class='col'>
+              <form-input
+                v-model="roomFormData.gebaudeteil"
+                :label="$capitalize($p.t('ui', 'gebaudeteil'))"
+                type="text"
+                name="gebteil"  
+                >
+              </form-input>
+            </div>
+            <div class='col'>
+              <form-input
+                v-model.number="roomFormData.contentId"
+                :label="$capitalize($p.t('ui', 'contentId'))"
+                name="content_id"  
+                >
+              </form-input>
+            </div>
+            <div class='col'>
+              <form-input
+                v-model.number="roomFormData.dislozierung"
+                :label="$capitalize($p.t('ui', 'dislozierung'))"
+                name="dislozierung"  
+                >
+              </form-input>
+            </div>
+          </div>
+          <div class="row mb-3">
+            <form-input
+              v-model="roomFormData.lageplan"
+              :label="$capitalize($p.t('ui', 'lageplan'))"
+              type="textarea"
+              name="lageplan"  
+              >
+            </form-input>
+          </div>
+          <div class="row mb-3">
+            <form-input
+              v-model="roomFormData.ausstattung"
+              :label="$capitalize($p.t('ui', 'ausstattung'))"
+              type="textarea"
+              name="ausstattung"  
+              >
+            </form-input>
+          </div>
+          <div class="col d-flex justify-content-end gap-2">
+            <button type="button" class="btn btn-secondary" @click="hideRoomFormModal">{{$p.t('ui', 'abbrechen')}}</button>
+            <button type="button" class="btn btn-primary" @click="isEditInProgress ? updateRoom() : createRoom()">{{$p.t('ui', 'speichern')}}</button>
+          </div>
+        </core-form>
+      </template>
+		</bs-modal>
+  `,
+};

public/js/components/RoomManager/RoomManagerOverview.js

@@ -0,0 +1,707 @@
+import ApiRoom from "../../../js/api/factory/ort.js";
+import ApiLocation from "../../../js/api/factory/location.js";
+import ApiOrganizationalUnit from "../../../js/api/factory/organizationalUnit.js";
+
+import { CoreFilterCmpt } from "../filter/Filter.js";
+import CoreForm from "../Form/Form.js";
+import FormInput from "../Form/Input.js";
+import RoomFormModal from "./RoomFormModal.js";
+import RoomTypeFormModal from "./RoomTypeFormModal.js";
+
+export default {
+  name: "RoomManagerOverview",
+  components: {
+    CoreFilterCmpt,
+    CoreForm,
+    FormInput,
+    RoomFormModal,
+    RoomTypeFormModal,
+  },
+  props: {
+    permissions: Object,
+  },
+  provide() {
+    return {
+      cisRoot: this.cisRoot,
+      hasBasisOrtWPermission: this.permissions["basis/ort_w"] || false,
+    };
+  },
+  watch: {
+    filterData: {
+      handler(newValue) {
+        this.reloadTableData();
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      phrasesLoaded: false,
+      filterData: {
+        locationId: null,
+        organizationalUnit: null,
+        buildingComponent: null,
+        isForTrainingProgram: null,
+        isReservationNeeded: null,
+        isActive: null,
+      },
+      locations: [],
+      organizationalUnits: [],
+      filteredOrganizationalUnits: [],
+      buildingComponents: [
+        {
+          label: "A",
+          value: "A",
+        },
+        {
+          label: "B",
+          value: "B",
+        },
+        {
+          label: "C",
+          value: "C",
+        },
+        {
+          label: "D",
+          value: "D",
+        },
+        {
+          label: "E",
+          value: "E",
+        },
+        {
+          label: "F",
+          value: "F",
+        },
+      ],
+      isRoomFormModalVisible: false,
+      isRoomTypeFormModalVisible: false,
+      editedRoomShortCode: null,
+      editedRoomForRoomTypeManagement: null,
+    };
+  },
+  computed: {
+    hasBasisOrtWPermission() {
+      return this.permissions["basis/ort_w"] || false;
+    },
+    tabulatorOptions() {
+      const options = {
+        ajaxURL: "dummy",
+        ajaxRequestFunc: async (url, config, params) => {
+          let shortCodeFilter = params?.filter?.find(
+            (filter) => filter.field === "ort_kurzbz",
+          );
+          let descriptionFilter = params?.filter?.find(
+            (filter) => filter.field === "bezeichnung",
+          );
+          let planDescriptionFilter = params?.filter?.find(
+            (filter) => filter.field === "planbezeichnung",
+          );
+          let maxPersonsFilter = params?.filter?.find(
+            (filter) => filter.field === "max_person",
+          );
+          let workplaceFilter = params?.filter?.find(
+            (filter) => filter.field === "arbeitsplaetze",
+          );
+          let squareMetersFilter = params?.filter?.find(
+            (filter) => filter.field === "m2",
+          );
+          let orgUnitConcatFilter = params?.filter?.find(
+            (filter) => filter.field === "org_organisationseinheittyp_kurzbz_org_bezeichnung_concat",
+          );
+          let isForTrainingProgramFilter = params?.filter?.find(
+            (filter) => filter.field === "lehre",
+          );
+          let reservationNeededFilter = params?.filter?.find(
+            (filter) => filter.field === "reservieren",
+          );
+          let isActiveFilter = params?.filter?.find(
+            (filter) => filter.field === "aktiv",
+          );
+          let costsFilter = params?.filter?.find(
+            (filter) => filter.field === "kosten",
+          );
+          let floorFilter = params?.filter?.find(
+            (filter) => filter.field === "stockwerk",
+          );
+          let parentRoomFilter = params?.filter?.find(
+            (filter) => filter.field === "parent_ort_kurzbz",
+          );
+
+          let isForTrainingProgramValue = null;
+          if (this.filterData.isForTrainingProgram === true) {
+            isForTrainingProgramValue = true;
+          } else {
+            if (isForTrainingProgramFilter?.value === true) {
+              isForTrainingProgramValue = true;
+            } else if (isForTrainingProgramFilter?.value === false) {
+              isForTrainingProgramValue = false;
+            }
+          }
+
+          let reservationNeededValue = null;
+          if (this.filterData.isReservationNeeded === true) {
+            reservationNeededValue = true;
+          } else {
+            if (reservationNeededFilter?.value === true) {
+              reservationNeededValue = true;
+            } else if (reservationNeededFilter?.value === false) {
+              reservationNeededValue = false;
+            }
+          }
+
+          let isActiveValue = null;
+          if (this.filterData.isActive === true) {
+            isActiveValue = true;
+          } else {
+            if (isActiveFilter?.value === true) {
+              isActiveValue = true;
+            } else if (isActiveFilter?.value === false) {
+              isActiveValue = false;
+            }
+          }
+
+          let shortCodeSorter = params?.sort?.find((sort) => sort.field === "ort_kurzbz");
+          let descriptionSorter = params?.sort?.find((sort) => sort.field === "bezeichnung");
+          let planDescriptionSorter = params?.sort?.find((sort) => sort.field === "planbezeichnung");
+          let maxPersonsSorter = params?.sort?.find((sort) => sort.field === "max_person");
+          let workplaceSorter = params?.sort?.find((sort) => sort.field === "arbeitsplaetze");
+          let squareMetersSorter = params?.sort?.find((sort) => sort.field === "m2");
+          let orgUnitConcatSorter = params?.sort?.find((sort) => sort.field === "org_organisationseinheittyp_kurzbz_org_bezeichnung_concat");
+          let lehreSorter = params?.sort?.find((sort) => sort.field === "lehre");
+          let reservierenSorter = params?.sort?.find((sort) => sort.field === "reservieren");
+          let aktivSorter = params?.sort?.find((sort) => sort.field === "aktiv");
+          let costsSorter = params?.sort?.find((sort) => sort.field === "kosten");
+          let floorSorter = params?.sort?.find((sort) => sort.field === "stockwerk");
+          let parentRoomSorter = params?.sort?.find((sort) => sort.field === "parent_ort_kurzbz");
+
+          return this.$api.call(
+            ApiRoom.getAllRooms({
+              organizationalUnitShortCode:
+                this.filterData.organizationalUnit?.value,
+              locationId: this.filterData.locationId,
+              buildingComponent: this.filterData.buildingComponent,
+              isForTrainingProgram: isForTrainingProgramValue,
+              isReservationNeeded: reservationNeededValue,
+              isActive: isActiveValue,
+              shortCode: shortCodeFilter?.value,
+              description: descriptionFilter?.value,
+              planDescription: planDescriptionFilter?.value,
+              maxPersons: maxPersonsFilter?.value,
+              workplace: workplaceFilter?.value,
+              squareMeters: squareMetersFilter?.value,
+              orgUnitConcatDescription: orgUnitConcatFilter?.value,
+              costs: costsFilter?.value,
+              floor: floorFilter?.value,
+              parentRoomShortCode: parentRoomFilter?.value,
+              sort: {
+                ort_kurzbz: shortCodeSorter?.dir,
+                bezeichnung: descriptionSorter?.dir,
+                planbezeichnung: planDescriptionSorter?.dir,
+                max_person: maxPersonsSorter?.dir,
+                arbeitsplaetze: workplaceSorter?.dir,
+                m2: squareMetersSorter?.dir,
+                org_organisationseinheittyp_kurzbz_org_bezeichnung_concat: orgUnitConcatSorter?.dir,
+                lehre: lehreSorter?.dir,
+                reservieren: reservierenSorter?.dir,
+                aktiv: aktivSorter?.dir,
+                kosten: costsSorter?.dir,
+                stockwerk: floorSorter?.dir,
+                parent_ort_kurzbz: parentRoomSorter?.dir,
+              },
+              pagination: {
+                page: params.page,
+                size: params.size,
+              },
+            }),
+          );
+        },
+        ajaxResponse: (url, params, response) => response,
+        persistenceID: "room_manager_overview_table",
+        selectableRows: true,
+        index: "ort_kurzbz",
+        columns: [
+          {
+            title: this.$capitalize(
+              this.$p.t("gruppenmanagement", "kurzbezeichnung"),
+            ),
+            field: "ort_kurzbz",
+            headerFilter: true,
+            width: 100,
+          },
+          {
+            title: this.$capitalize(
+              this.$p.t("gruppenmanagement", "bezeichnung"),
+            ),
+            field: "bezeichnung",
+            headerFilter: true,
+            width: 200,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "planbezeichnung")),
+            field: "planbezeichnung",
+            headerFilter: true,
+            width: 150,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "maxPersons")),
+            field: "max_person",
+            headerFilter: true,
+            width: 80,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "arbeitsplaetze")),
+            field: "arbeitsplaetze",
+            headerFilter: true,
+            width: 80,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "quadratmeter")),
+            field: "m2",
+            headerFilter: true,
+            width: 100,
+          },
+          {
+            title: this.$capitalize(this.$p.t("lehre", "organisationseinheit")),
+            field: "org_organisationseinheittyp_kurzbz_org_bezeichnung_concat",
+            formatter: function (cell) {
+              let data = cell.getRow().getData();
+              let value = null;
+              if (data.org_organisationseinheittyp_kurzbz) {
+                value = `[${data.org_organisationseinheittyp_kurzbz}]`;
+              }
+              if (data.org_bezeichnung) {
+                value += ` ${data.org_bezeichnung}`;
+              }
+
+              return value;
+            },
+            sorter: function (a, b, aRow, bRow, column, dir, sorterParams) {
+              let aData = aRow.getData();
+              let bData = bRow.getData();
+
+              let aFull = (
+                aData.org_organisationseinheittyp_kurzbz +
+                " " +
+                aData.org_bezeichnung
+              ).toLowerCase().trim();
+              let bFull = (
+                bData.org_organisationseinheittyp_kurzbz +
+                " " +
+                bData.org_bezeichnung
+              ).toLowerCase().trim();
+
+              return aFull.localeCompare(bFull);
+            },
+            headerFilter: true,
+            width: 180,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "lehre")),
+            field: "lehre",
+            headerFilter: true,
+            headerFilterParams: {
+              tristate: true,
+              elementAttributes: { value: "true" },
+            },
+            formatter: "tickCross",
+            hozAlign: "center",
+            formatterParams: {
+              tickElement: '<i class="fa fa-check text-success"></i>',
+              crossElement: '<i class="fa fa-xmark text-danger"></i>',
+            },
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "reservieren")),
+            field: "reservieren",
+            headerFilter: true,
+            headerFilterParams: {
+              tristate: true,
+              elementAttributes: { value: "true" },
+            },
+            formatter: "tickCross",
+            hozAlign: "center",
+            formatterParams: {
+              tickElement: '<i class="fa fa-check text-success"></i>',
+              crossElement: '<i class="fa fa-xmark text-danger"></i>',
+            },
+          },
+          {
+            title: this.$capitalize(this.$p.t("gruppenmanagement", "aktiv")),
+            field: "aktiv",
+            headerFilter: true,
+            headerFilterParams: {
+              tristate: true,
+              elementAttributes: { value: "true" },
+            },
+            formatter: "tickCross",
+            hozAlign: "center",
+            formatterParams: {
+              tickElement: '<i class="fa fa-check text-success"></i>',
+              crossElement: '<i class="fa fa-xmark text-danger"></i>',
+            },
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "kosten")),
+            field: "kosten",
+            headerFilter: true,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "stockwerk")),
+            field: "stockwerk",
+            headerFilter: true,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "parentRoom")),
+            field: "parent_ort_kurzbz",
+            headerFilter: true,
+            width_: 120,
+          },
+          {
+            title: this.$capitalize(this.$p.t("global", "actions")),
+            field: "actions",
+            width: 120,
+            formatter: (cell, formatterParams, onRendered) => {
+              let container = document.createElement("div");
+              container.className = "d-flex gap-2 justify-content-center";
+
+              let roomTypeBtn = document.createElement("button");
+              roomTypeBtn.className = "btn btn-outline-secondary btn-action";
+              roomTypeBtn.innerHTML = '<i class="fa fa-layer-group"></i>';
+              roomTypeBtn.title = this.$capitalize(
+                this.$p.t("ui", "btn_editRoomType"),
+              );
+              roomTypeBtn.addEventListener("click", (event) =>
+                this.editRoomType(cell.getData().ort_kurzbz),
+              );
+
+              if (!this.hasBasisOrtWPermission) {
+                container.append(roomTypeBtn);
+                return container;
+              }
+
+              let button = document.createElement("button");
+
+              button = document.createElement("button");
+              button.className = "btn btn-outline-secondary btn-action";
+              button.innerHTML = '<i class="fa fa-edit"></i>';
+              button.title = this.$capitalize(this.$p.t("ui", "btn_editRoom"));
+              button.addEventListener("click", (event) =>
+                this.editRoom(cell.getData().ort_kurzbz),
+              );
+              container.append(button);
+
+              container.append(roomTypeBtn);
+
+              button = document.createElement("button");
+              button.className =
+                "btn btn-outline-secondary btn-action bg-danger";
+              button.innerHTML = '<i class="fa fa-xmark text-white"></i>';
+              button.title = this.$capitalize(
+                this.$p.t("ui", "btn_deleteRoom"),
+              );
+              button.addEventListener("click", () => {
+                let isDeletionConfirmed = confirm(
+                  this.$p.t("ui", "deleteRoomConfirmation"),
+                );
+                if (!isDeletionConfirmed) return;
+
+                this.deleteRoom(cell.getData().ort_kurzbz);
+              });
+              container.append(button);
+
+              return container;
+            },
+            frozen: true,
+          },
+        ],
+        layout: "fitColumns",
+        pagination: true,
+        paginationMode: "remote",
+        paginationSize: 100,
+        maxHeight: "700px",
+        filterMode: "remote",
+        sortMode: "remote",
+      };
+      return options;
+    },
+    tabulatorEvents() {
+      const events = [
+        {
+          event: "renderComplete",
+          handler: async () => {},
+        },
+        {
+          event: "cellClick",
+          handler: async (e, cell) => {
+            let updateableFieldsByClick = ["lehre", "reservieren", "aktiv"];
+            for (let field of updateableFieldsByClick) {
+              if (cell.getField() === field) {
+                let updatedValue = !cell.getValue();
+                this.$refs.roomManagerOverviewTable.tabulator.updateData([
+                  {
+                    ort_kurzbz: cell.getData().ort_kurzbz,
+                    [field]: updatedValue,
+                  },
+                ]);
+                this.partialRoomUpdate(
+                  cell.getData().ort_kurzbz,
+                  field,
+                  updatedValue,
+                );
+                this.$refs.roomManagerOverviewTable.tabulator.replaceData("/");
+              }
+            }
+          },
+        },
+      ];
+      return events;
+    },
+    dropdownParsedOrganizationalUnits() {
+      return this.organizationalUnits
+        .map((unit) => {
+          return {
+            label: `[${unit.organisationseinheittyp_kurzbz}] ${unit.bezeichnung}`,
+            value: unit.oe_kurzbz,
+          };
+        })
+        .sort((a, b) => a.label.localeCompare(b.label));
+    },
+  },
+  methods: {
+    filterOrganizationalUnits(event) {
+      let defaultItem = {
+        label: this.$p.t("ui", "dropdownEmptyOption"),
+        value: null,
+      };
+
+      const query = event.query.toLowerCase();
+      if (!query) {
+        return (this.filteredOrganizationalUnits = [
+          defaultItem,
+          ...this.dropdownParsedOrganizationalUnits,
+        ]);
+      }
+
+      return (this.filteredOrganizationalUnits = [defaultItem]
+        .concat(this.dropdownParsedOrganizationalUnits)
+        .filter((unit) => {
+          return unit.label.toLowerCase().includes(query);
+        }));
+    },
+    showRoomFormModal() {
+      this.isRoomFormModalVisible = true;
+    },
+    editRoom(roomShortCode) {
+      this.editedRoomShortCode = roomShortCode;
+    },
+    deleteRoom(roomShortCode) {
+      this.$api
+        .call(ApiRoom.deleteRoom(roomShortCode))
+        .then((response) => {
+          if (response.meta.status === "success") {
+            this.reloadTableData();
+            this.$fhcAlert.alertSuccess(
+              this.$p.t("ui", "roomDeletedSuccessfully"),
+            );
+          } else {
+            this.reloadTableData();
+            this.$fhcAlert.alertError(this.$p.t("ui", "errorDeletingRoom"));
+          }
+        })
+        .catch((error) => {
+          this.$fhcAlert.alertError(this.$p.t("ui", "errorDeletingRoom"));
+        });
+    },
+    showRoomTypeFormModal() {
+      this.isRoomTypeFormModalVisible = true;
+    },
+    editRoomType(roomShortCode) {
+      this.editedRoomForRoomTypeManagement = roomShortCode;
+    },
+    async reloadTableData() {
+      this.$refs.roomManagerOverviewTable.tabulator.replaceData("/");
+    },
+    handleRoomUpdated() {
+      this.editedRoomShortCode = null;
+      this.reloadTableData();
+    },
+    async partialRoomUpdate(roomShortCode, attribute, value) {
+      let response = await this.$api.call(
+        ApiRoom.updateRoom(roomShortCode, {
+          [attribute]: value,
+        }),
+      );
+      if (response.meta.status === "success") {
+        this.$fhcAlert.alertSuccess(this.$p.t("ui", "successUpdate"));
+        this.reloadTableData();
+      } else {
+        this.$fhcAlert.alertError(this.$p.t("ui", "errorUpdatingRoom"));
+      }
+    },
+    setDefaultBuildingComponentOption() {
+      this.buildingComponents.unshift({
+        label: this.$p.t("ui", "dropdownEmptyOption"),
+        value: null,
+      });
+    },
+    setDefaultLocationOption() {
+      this.locations.unshift({
+        standort_id: null,
+        bezeichnung: this.$p.t("ui", "dropdownEmptyOption"),
+      });
+    },
+  },
+  async created() {
+    let getLocationsResponse = await this.$api.call(
+      ApiLocation.getLocationsByCompanyType("Intern"),
+    );
+    if (getLocationsResponse.meta.status === "success") {
+      this.locations = getLocationsResponse.data;
+    } else {
+      this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingLocations"));
+    }
+
+    let getAllOrganizationalUnitsResponse = await this.$api.call(
+      ApiOrganizationalUnit.getAllOrganizationalUnits(),
+    );
+    if (getAllOrganizationalUnitsResponse.meta.status === "success") {
+      this.organizationalUnits = getAllOrganizationalUnitsResponse.data.sort(
+        (a, b) => a.bezeichnung.localeCompare(b.bezeichnung),
+      );
+    } else {
+      this.$fhcAlert.alertError(
+        this.$p.t("ui", "errorLoadingOrganizationalUnits"),
+      );
+    }
+  },
+  mounted() {
+    this.$p
+      .loadCategory([
+        "global",
+        "lehre",
+        "ui",
+        "gruppenmanagement",
+        "core",
+        "person",
+      ])
+      .then(() => {
+        this.phrasesLoaded = true;
+        this.setDefaultBuildingComponentOption();
+        this.setDefaultLocationOption();
+      });
+  },
+  template: /* html */ `
+  <div class="container mt-4">
+    <h1 class='mb-5'>{{ $capitalize($p.t("ui", "roomManagerOverviewHeading")) }}</h1>
+    <div v-if="hasBasisOrtWPermission" class="row mb-3">
+      <div class="col d-flex justify-content-between">
+        <a class="btn btn-primary mb-3" @click="showRoomFormModal">{{$capitalize($p.t('ui', 'addRoomButton'))}}</a>
+      </div>
+    </div>
+    <core-filter-cmpt  
+        v-if="phrasesLoaded"
+        ref="roomManagerOverviewTable"
+        table-only	 
+        :side-menu="false"	 
+        :tabulator-options="tabulatorOptions"
+        :tabulator-events="tabulatorEvents"	 
+    >
+      <template #search>
+        <slot name="filterzuruecksetzen">
+          <core-form class="d-flex flex-column flex-md-row align-items-md-end gap-3">
+            <div>
+              <form-input
+                :label="$capitalize($p.t('lehre/organisationseinheit'))"
+                :suggestions="filteredOrganizationalUnits"
+                :optionValue="(option) => option.value"
+                :optionLabel="(option) => option.label" 
+                @complete="filterOrganizationalUnits"
+                @itemSelect="(option) => { filterData.organizationalUnit = option.value; }"
+                dropdown
+                forceSelection
+                type="autocomplete"
+                name="organizationalUnitShortCode"  
+                >
+              </form-input>
+            </div>
+            <div>
+              <form-input
+                v-model="filterData.locationId"
+                :label="$capitalize($p.t('person', 'standort'))"
+                type="select"
+                id="location"
+                name="location"
+                >
+                <option
+                  v-for="location in locations"
+                  :key="location.standort_id"
+                  :value="location.standort_id"
+                  >
+                  {{location.bezeichnung}}
+                </option>
+              </form-input>
+            </div>
+            <div>
+              <form-input
+                v-model="filterData.buildingComponent"
+                :label="$capitalize($p.t('ui', 'buildingComponent'))"
+                type="select"
+                id="buildingComponent"
+                name="buildingComponent"
+                >
+                <option
+                  v-for="component in buildingComponents"
+                  :key="component"
+                  :value="component.value"
+                  >
+                  {{component.label}}
+                </option>
+              </form-input>
+            </div>
+            <div>
+               <form-input
+                v-model="filterData.isForTrainingProgram"
+                :label="$capitalize($p.t('ui', 'lehre'))"
+                type="checkbox"
+                name="filterIsForTrainingProgram"
+                dropdown
+              ></form-input>
+            </div>
+            <div>
+              <form-input
+                v-model="filterData.isReservationNeeded"
+                :label="$capitalize($p.t('ui', 'reservieren'))"
+                type="checkbox"
+                name="filterIsReservationNeeded"
+                dropdown
+              ></form-input>
+            </div>
+            <div>
+              <form-input
+                v-model="filterData.isActive"
+                :label="$capitalize($p.t('person', 'aktiv'))"
+                type="checkbox"
+                name="filterIsActive"
+                dropdown
+              ></form-input>
+            </div>
+          </core-form>
+        </slot>
+      </template>
+    </core-filter-cmpt> 
+    <room-form-modal
+      :isVisible="isRoomFormModalVisible"
+      :editedRoomShortCode="editedRoomShortCode"
+      @hideBsModal="() => { isRoomFormModalVisible = false; editedRoomShortCode = null; }"
+      @roomCreated="handleRoomUpdated"
+      @roomUpdated="handleRoomUpdated"
+    />
+    <room-type-form-modal
+      :isVisible="isRoomTypeFormModalVisible"
+      :editedRoomShortCode="editedRoomForRoomTypeManagement"
+      @hideBsModal="() => { isRoomTypeFormModalVisible = false; editedRoomForRoomTypeManagement = null; }"
+    />
+  </div>
+  `,
+};

public/js/components/RoomManager/RoomTypeFormModal.js

@@ -0,0 +1,369 @@
+import ApiRoomType from "../../../js/api/factory/roomType.js";
+import ApiRoomToRoomType from "../../../js/api/factory/roomToRoomType.js";
+
+import { CoreFilterCmpt } from "../filter/Filter.js";
+
+import BsModal from "../Bootstrap/Modal.js";
+import CoreForm from "../Form/Form.js";
+import FormInput from "../Form/Input.js";
+
+export default {
+  name: "RoomTypeFormModal",
+  components: {
+    BsModal,
+    CoreForm,
+    FormInput,
+    CoreFilterCmpt,
+  },
+  inject: ["hasBasisOrtWPermission"],
+  props: {
+    isVisible: {
+      type: Boolean,
+      required: true,
+    },
+    editedRoomShortCode: {
+      type: String,
+      default: null,
+    },
+  },
+  emits: [
+    "hideBsModal",
+    "roomTypeCreated",
+    "roomToRoomTypeCreated",
+    "roomToRoomTypeDeleted",
+  ],
+  watch: {
+    isVisible(newValue) {
+      if (newValue) {
+        this.$refs.roomTypeFormModal.show();
+      } else {
+        this.$refs.roomTypeFormModal.hide();
+      }
+    },
+    async editedRoomShortCode(newValue) {
+      if (newValue) {
+        await this.$refs.roomTypesTable.reloadTable();
+        this.$refs.roomTypeFormModal.show();
+      } else {
+        this.resetRoomTypeForm();
+      }
+    },
+  },
+  data: () => {
+    return {
+      phrasesLoaded: false,
+      isEditInProgress: false,
+      editedRoom: null,
+      isRoomTypeFormVisible: false,
+      roomTypeFormData: {
+        aktiv: true,
+      },
+      roomToRoomTypeFormData: {},
+      roomTypes: [],
+      filteredRoomTypes: [],
+    };
+  },
+  computed: {
+    tabulatorOptions() {
+      const options = {
+        ajaxURL: "dummy",
+        ajaxRequestFunc: async () =>
+          this.$api.call(
+            ApiRoomToRoomType.getRoomToRoomTypeRelationsByRoomShortCode(
+              this.editedRoomShortCode,
+            ),
+          ),
+        ajaxResponse: (url, params, response) => response.data,
+        persistenceID: "room_type_assignment_table",
+        selectableRows: true,
+        columns: [
+          {
+            title: this.$capitalize(this.$p.t("ui", "roomType")),
+            field: "raumtyp_kurzbz",
+            width: 150,
+          },
+          {
+            title: this.$capitalize(this.$p.t("ui", "hierarchy")),
+            field: "hierarchie",
+            width: 50,
+          },
+          {
+            title: this.$capitalize(this.$p.t("gruppenmanagement", "beschreibung")),
+            field: "raumtyp_beschreibung",
+          },
+          {
+            title: this.$capitalize(this.$p.t("global", "actions")),
+            field: "actions",
+            width: 50,
+            formatter: (cell, formatterParams, onRendered) => {
+              if (!this.hasBasisOrtWPermission) return "";
+
+              let container = document.createElement("div");
+              container.className = "d-flex justify-content-center";
+
+              let button = document.createElement("button");
+
+              button = document.createElement("button");
+              button.className =
+                "btn btn-outline-secondary btn-action bg-danger";
+              button.innerHTML = '<i class="fa fa-xmark text-white"></i>';
+              button.title = this.$p.t(
+                "ui",
+                "btn_deleteRoomToRoomTypeRelation",
+              );
+              button.addEventListener("click", () => {
+                let isDeletionConfirmed = confirm(
+                  this.$p.t("ui", "deleteRoomToRoomTypeRelationConfirmation"),
+                );
+                if (!isDeletionConfirmed) return;
+
+                this.deleteRoomToRoomTypeRelation(
+                  cell.getData().ort_kurzbz,
+                  cell.getData().raumtyp_kurzbz,
+                  cell.getData().hierarchie,
+                );
+              });
+              container.append(button);
+
+              return container;
+            },
+            frozen: true,
+            visible: this.hasBasisOrtWPermission,
+          },
+        ],
+        layout: "fitColumns",
+      };
+      return options;
+    },
+    tabulatorEvents() {
+      const events = [
+        {
+          event: "renderComplete",
+          handler: async () => {},
+        },
+      ];
+      return events;
+    },
+    dropdownParsedRoomTypes() {
+      return this.roomTypes.map((roomType) => {
+        return {
+          label: `${roomType.raumtyp_kurzbz} - ${roomType.beschreibung}`,
+          value: roomType.raumtyp_kurzbz,
+        };
+      });
+    },
+  },
+  methods: {
+    filterRoomTypes(event) {
+      let defaultItem = {
+        label: this.$p.t("ui", "dropdownEmptyOption"),
+        value: null,
+      };
+
+      const query = event.query.toLowerCase();
+      if (!query) {
+        return (this.filteredRoomTypes = [
+          defaultItem,
+          ...this.dropdownParsedRoomTypes,
+        ]);
+      }
+
+      return (this.filteredRoomTypes = [defaultItem]
+        .concat(this.dropdownParsedRoomTypes)
+        .filter((roomType) => {
+          return roomType.label?.toLowerCase().includes(query);
+        }));
+    },
+    createRoomType() {
+      return this.$refs.roomTypeForm
+        .call(
+          ApiRoomType.createRoomType({
+            kurzbezeichnung: this.roomTypeFormData.shortCode,
+            beschreibung: this.roomTypeFormData.description,
+          }),
+        )
+        .then((response) => {
+          this.$fhcAlert.alertSuccess(this.$p.t("ui", "successSave"));
+          this.$emit("roomTypeCreated");
+          this.resetRoomTypeForm();
+          this.isRoomTypeFormVisible = false;
+          this.fetchRoomTypes();
+        });
+    },
+    createRoomToRoomTypeRelation() {
+      return this.$refs.roomToRoomTypeForm
+        .call(
+          ApiRoomToRoomType.createRoomToRoomTypeRelation(
+            this.editedRoomShortCode,
+            this.roomToRoomTypeFormData.roomType?.value,
+            this.roomToRoomTypeFormData.hierarchy,
+          ),
+        )
+        .then((response) => {
+          this.$fhcAlert.alertSuccess(this.$p.t("ui", "successSave"));
+          this.$emit("roomToRoomTypeCreated");
+          this.resetRoomTypeForm();
+          this.$refs.roomTypesTable.tabulator.replaceData("/");
+        });
+    },
+    deleteRoomToRoomTypeRelation(roomShortCode, roomTypeShortCode, hierarchy) {
+      return this.$api
+        .call(
+          ApiRoomToRoomType.deleteRoomToRoomTypeRelation(
+            roomShortCode,
+            roomTypeShortCode,
+            hierarchy
+          ),
+        )
+        .then((response) => {
+          this.$fhcAlert.alertSuccess(this.$p.t("ui", "successDelete"));
+          this.$emit("roomToRoomTypeDeleted");
+          this.resetRoomTypeForm();
+          this.$refs.roomTypesTable.tabulator.replaceData("/");
+        });
+    },
+    hideRoomTypeFormModal() {
+      this.$refs.roomTypeFormModal.hide();
+      this.$emit("hideBsModal");
+      this.resetRoomTypeForm();
+    },
+    resetRoomTypeForm() {
+      this.$refs.roomTypeForm?.clearValidation();
+
+      this.isEditInProgress = false;
+      this.isRoomTypeFormVisible = false;
+
+      this.editedRoom = null;
+      this.roomTypeFormData = {
+        aktiv: true,
+      };
+    },
+    async fetchRoomTypes() {
+      let getRoomTypesResponse = await this.$api.call(
+        ApiRoomType.getAllRoomTypes(),
+      );
+      if (getRoomTypesResponse.meta.status === "success") {
+        this.roomTypes = getRoomTypesResponse.data;
+      } else {
+        this.$fhcAlert.alertError(this.$p.t("ui", "errorLoadingRoomTypes"));
+      }
+    },
+  },
+  async created() {
+    this.fetchRoomTypes();
+
+    this.$p
+      .loadCategory(["global", "lehre", "ui", "gruppenmanagement", "core", "person"])
+      .then(() => {
+        this.phrasesLoaded = true;
+      });
+  },
+  template: /* html */ `
+  <bs-modal 
+    ref="roomTypeFormModal"
+    :bodyClass="'pt-4'"
+    @hideBsModal="() => { $emit('hideBsModal'); resetRoomTypeForm(); }" 
+    size="sm" 
+    class="modal-lg"
+    >
+			<template #title>
+				<p class="fw-bold mt-3">{{$capitalize($p.t('ui', 'assignRoomTypeToRoomModalTitle'))}}</p>
+			</template>
+      <template #default>
+        <div class="d-flex justify-content-end mb-1">
+          <a 
+            v-if="!isRoomTypeFormVisible && hasBasisOrtWPermission" 
+            :title='$capitalize($p.t("ui", "createRoomType"))' 
+            @click.prevent="isRoomTypeFormVisible = !isRoomTypeFormVisible"
+            href="#"
+            class="btn btn-primary rounded-circle">
+            <i
+              class="fa fa-plus"
+            ></i> 
+          </a>
+        </div>
+        <div v-if="isRoomTypeFormVisible && hasBasisOrtWPermission" class="row g-3 pb-3">
+          <core-form ref="roomTypeForm">
+            <div class="row">
+              <div class="col">
+                <p class="fw-bold">{{$capitalize($p.t('ui', 'createRoomTypeFormTitle'))}}</p>
+              </div>
+            </div>
+            <div class="row mb-3">
+              <div class="col">
+                <form-input
+                  v-model="roomTypeFormData.shortCode"
+                  :label="$capitalize($p.t('gruppenmanagement', 'kurzbezeichnung'))"
+                  type="text"
+                  name="kurzbezeichnung"  
+                  >
+                </form-input>
+              </div>
+              <div class="col">
+                <form-input
+                  v-model="roomTypeFormData.description"
+                  :label="$capitalize($p.t('gruppenmanagement', 'beschreibung'))"
+                  type="text"
+                  name="beschreibung"  
+                  >
+                </form-input>
+              </div>
+            </div>
+            <div class="col d-flex justify-content-end gap-2">
+              <button type="button" class="btn btn-secondary" @click="isRoomTypeFormVisible = false">{{$p.t('ui', 'abbrechen')}}</button>
+              <button type="button" class="btn btn-primary" @click="createRoomType()">{{$p.t('ui', 'speichern')}}</button>
+            </div>
+          </core-form>
+        </div>
+        <div v-if="!isRoomTypeFormVisible && hasBasisOrtWPermission" class="row g-3 pb-3">
+          <core-form ref="roomToRoomTypeForm">
+            <div class="row">
+              <div class="col-8">
+                <form-input
+                  v-model="roomToRoomTypeFormData.roomType"
+                  :label="$capitalize($p.t('ui/roomType'))"
+                  :suggestions="filteredRoomTypes"
+                  :optionValue="(option) => option.value"
+                  :optionLabel="(option) => option.label" 
+                  @complete="filterRoomTypes"
+                  dropdown
+                  forceSelection
+                  type="autocomplete"
+                  name="roomTypeShortCode"  
+                  >
+                </form-input>
+              </div>
+              <div class="col">
+                  <form-input
+                    v-model="roomToRoomTypeFormData.hierarchy"
+                    :label="$capitalize($p.t('ui', 'hierarchy'))"
+                    type="number"
+                    name="hierarchy"  
+                    >
+                  </form-input>
+                </div>
+              <div class="col justify-content-end align-items-end d-flex">
+                <button type="button" class="btn btn-primary" @click="createRoomToRoomTypeRelation()">{{$p.t('ui', 'speichern')}}</button>
+              </div>
+            </div>
+          </core-form>
+        </div>
+        <hr v-if="hasBasisOrtWPermission" class="mb-3 mt-0" />
+        <div class="row my-1">
+          <div class="col">
+            <p class="fw-bold">{{$capitalize($p.t('ui', 'assignedRoomTypesTitle'))}}</p>
+          </div>
+        </div>
+        <core-filter-cmpt
+            v-if="phrasesLoaded"
+            ref="roomTypesTable"
+            table-only	 
+            :side-menu="false"
+            :tabulator-options="tabulatorOptions"
+            :tabulator-events="tabulatorEvents"	 
+        >
+      </core-filter-cmpt> 
+      </template>
+		</bs-modal>
+  `,
+};

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

@@ -74,6 +74,24 @@ export default {
 				],
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
+				],
+				'microcredential.xml.php' : [
+					'microcredentialzertifikat_1',
+					'microcredentialzertifikat_2',
+					'microcredentialzertifikat_3',
+					'microcredentialzertifikat_4',
+					'microcredential_1',
+					'microcredential_2',
+					'microcredential_3',
+					'microcredential_4',
+					'microdegree_1',
+					'microdegree_2',
+					'microdegree_3',
+					'microdegree_4',
+					'microdegreeabschluss_1',
+					'microdegreeabschluss_2',
+					'microdegreeabschluss_3',
+					'microdegreeabschluss_4',
 				]
 			},
 			documentDropdownObject: {}

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

@@ -14,6 +14,9 @@ export default {
 	inject: {
 		defaultSemester: {
 			from: 'defaultSemester'
+		},
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	computed: {
@@ -95,8 +98,9 @@ export default {
 			this.formData.themenbereich = null;
 			this.formData.projekttyp_kurzbz = null;
 			this.formData.firma = null;
-			this.formData.lehrveranstaltung_id = null;
-			this.formData.lehreinheit_id = null;
+			// dont reset these form fields for UX reasons
+			// this.formData.lehrveranstaltung_id = null;
+			// this.formData.lehreinheit_id = null;
 			this.formData.beginn = null;
 			this.formData.ende = null;
 			this.formData.freigegeben = true;
@@ -109,7 +113,7 @@ export default {
 		getFormData(newProjektarbeit, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
 
 			this.additional_lehrveranstaltung_id = additional_lehrveranstaltung_id;
-			this.studiensemester = studiensemester_kurzbz || this.defaultSemester;
+			this.studiensemester = studiensemester_kurzbz || this.currentSemester;
 			this.newProjektarbeit = newProjektarbeit;
 
 			this.$api

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

@@ -121,7 +121,6 @@ export default {
 				height: 'auto',
 				minHeight: '100',
 				selectableRows: true,
-				selectableRows: 1,
 				index: 'betreuer_id',
 				persistence:{
 					columns: true, //persist column layout

public/js/components/Vertraege/Vertragsverwaltung.js

@@ -71,7 +71,6 @@ export default {
 							:mitarbeiter_uid="this.mitarbeiter_uid"
 							typeHeader="mitarbeiter"
 							:domain="config.domain"
-							fotoEditable
 							@redirectToLeitung="handleSelection"
 						>
 							<template #uid>{{tile_MaUid}}</template>

public/js/components/filter/Filter.js

@@ -280,7 +280,7 @@ export const CoreFilterCmpt = {
 				});
 			}
 
-			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
+			if (tabulatorOptions.selectable || tabulatorOptions.selectableRows || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
 				this.tabulatorHasSelector = true;
 
 			if (this.idField) {
@@ -358,7 +358,7 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulatorHasSelector = this.tabulatorOptions.selectable || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
+			this.tabulatorHasSelector = this.tabulatorOptions.selectable || this.tabulatorOptions.selectableRows || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
 			this.tabulator.setData(this.filteredData);
 			this._setHeaderFilter()

public/js/composables/Dashboard/CachedWidgetLoader.js

@@ -1,29 +1,36 @@
-let __widgets = {};
-let __widgetsStarted = {};
-let __path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard/Widget';
+import ApiWidget from "../../api/factory/dashboard/widget.js";
 
-export default {
-	getWidget(id) {
-		return __widgets[id];
-	},
-	loadWidget(id) {
-		if (__widgets[id])
-			return Promise.resolve(__widgets[id]);
-		if (__widgetsStarted[id])
-			return __widgetsStarted[id];
-		if (!__path)
-			return Promise.reject('Widget could not be loaded because there is no path yet!');
+const promises = Vue.ref([]);
+const stateRef = Vue.ref([]);
+const state = Vue.readonly(stateRef);
 
-		__widgetsStarted[id] = new Promise((resolve, reject) => {
-			axios.get(__path, {params:{id}}).then(res => {
-				__widgets[id] = res.data.retval;
-				__widgetsStarted[id] = undefined;
-				resolve(__widgets[id]);
-			}).catch(error => reject(error.response.data.retval.error));
-		});
-		return __widgetsStarted[id];
-	},
-	setPath(path) {
-		__path = path;
+export function useCachedWidgetLoader() {
+	const $api = Vue.inject('$api');
+	const $fhcAlert = Vue.inject('$fhcAlert');
+
+	function load(id) {
+		if (state.value[id])
+			return Promise.resolve(state.value[id]);
+
+		if (!promises.value[id])
+			promises.value[id] = new Promise((resolve, reject) => {
+				$api
+					.call(ApiWidget.get(id))
+					.then(res => {
+						stateRef.value[id] = res.data;
+						promises.value[id] = undefined;
+						resolve(state.value[id]);
+					})
+					.catch($fhcAlert.handleSystemError);
+			});
+
+		return promises.value[id];
 	}
+
+	return {
+		state,
+		actions: {
+			load
+		}
+	};
 }

public/js/helpers/ObjectUtils.js

@@ -1,31 +1,72 @@
-export default {
-	/**
-	* Performs a deep merge of objects and returns new object. Does not modify
-	* objects (immutable) and merges arrays via concatenation.
-	*
-	* @param {...object} objects - Objects to merge
-	* @returns {object} New object with merged key/values
-	*/
-	mergeDeep(...objects) {
-		const isObject = obj => obj && typeof obj === 'object';
-		
-		return objects.reduce((prev, obj) => {
-			Object.keys(obj).forEach(key => {
-				const pVal = prev[key];
-				const oVal = obj[key];
-				
-				if (Array.isArray(pVal) && Array.isArray(oVal)) {
-					prev[key] = pVal.concat(...oVal);
-				}
-				else if (isObject(pVal) && isObject(oVal)) {
-					prev[key] = this.mergeDeep(pVal, oVal);
-				}
-				else {
-					prev[key] = oVal;
-				}
-			});
+/**
+ * Performs a deep merge of objects and returns new object. Does not modify
+ * objects (immutable) and merges arrays via concatenation.
+ *
+ * @param {...object} objects - Objects to merge
+ * @returns {object} New object with merged key/values
+ */
+function mergeDeep(...objects) {
+	const isObject = obj => obj && typeof obj === 'object';
+	
+	return objects.reduce((prev, obj) => {
+		Object.keys(obj).forEach(key => {
+			const pVal = prev[key];
+			const oVal = obj[key];
 			
-			return prev;
-		}, {});
-	}
+			if (Array.isArray(pVal) && Array.isArray(oVal)) {
+				prev[key] = pVal.concat(...oVal);
+			}
+			else if (isObject(pVal) && isObject(oVal)) {
+				prev[key] = this.mergeDeep(pVal, oVal);
+			}
+			else {
+				prev[key] = oVal;
+			}
+		});
+		
+		return prev;
+	}, {});
+}
+
+/**
+ * Extends VUEs toRaw() function to nested Proxies
+ * @see https://www.reddit.com/r/javascript/comments/10gzynk/deep_cloning_objects_in_javascript_the_modern_way/
+ *
+ * @param object		sourceObj - Object to transform
+ * @returns object
+ */
+function deepToRaw(sourceObj) {
+	const objectIterator = input => {
+		if (Array.isArray(input))
+			return input.map(objectIterator);
+		if (Vue.isRef(input) || Vue.isReactive(input) || Vue.isProxy(input))
+			return objectIterator(Vue.toRaw(input));
+		if (input && typeof input === 'object') {
+			/** use custom handling of 'Date' objects to avoid data loss if treating it like any other object.
+			 * reminder:
+			 * typeof (new Date())        ==> 'object'
+			 * Object.keys(new Date())    ==> []
+			 */
+			if (input instanceof Date)
+				return input;
+
+			return Object.keys(input).reduce((acc, key) => {
+				acc[key] = objectIterator(input[key]);
+				return acc;
+			}, {});
+		}
+
+		return input;
+	};
+	
+	return objectIterator(sourceObj);
+}
+
+export {
+	mergeDeep,
+	deepToRaw
+}
+export default {
+	mergeDeep,
+	deepToRaw
 }

public/js/plugins/Api.js

@@ -430,16 +430,16 @@ export default {
 
 		fhcApiAxios.interceptors.response.use(
 			response => {
-				if (response.config?.errorHandling == 'off'
-					|| response.config?.errorHandling === false
-					|| response.config?.errorHandling == 'fail')
+				const errorConfig = get_error_handler(response.config);
+
+				if (!errorConfig.success)
 					return clean_return_value(response);
 
-				// NOTE(chris): loop through errors
-				if (response.data.errors)
-					response.data.errors = response.data.errors.filter(
-						err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
-					);
+				const errors = popHandleableErrors(errorConfig, response.data.errors);
+
+				for (var type in errors) {
+					errorConfig.handler[type](errors[type]);
+				}
 
 				return clean_return_value(response);
 			},

rdf/prestudentrolle.rdf.php

@@ -144,6 +144,7 @@ foreach($ps->result as $row)
 			<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
 			<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
 			<ROLLE:fgm><![CDATA['.$row->fgm.']]></ROLLE:fgm>
+			<ROLLE:faktiv><![CDATA['.($row->faktiv?'Ja':'Nein').']]></ROLLE:faktiv>
       	</RDF:Description>
       </RDF:li>
 	';

skin/styles/tw.css

@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #00639C;
+	background-color: #71787D;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 10px;
+	padding: 0 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 10px;
+	padding: 0 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;