BUG: add fix for room deletion with attached sub rooms

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'
 				)
 			)
 		),
@@ -383,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/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/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/Konto.php

@@ -48,8 +48,7 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto',
-			'lehre'
+			'konto'
 		]);
 	}
 
@@ -113,7 +112,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen($studiensemester_kurzbz = null)
+	public function getBuchungstypen()
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -123,7 +122,6 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -496,43 +494,4 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
-
-	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
-	{
-		if (is_null($studiensemester_kurzbz))
-		{
-			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
-		}
-		else
-		{
-			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-				$studiensemester_akt = $studiensemester_kurzbz;
-			else
-				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
-		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
-
-		$oehStandardbetrag = null;
-		if (hasData($oehBeitrag))
-		{
-			$oeh = getData($oehBeitrag)[0];
-			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
-			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
-		}
-
-		if ($oehStandardbetrag !== null)
-		{
-			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
-				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
-				{
-					$buchungstyp->standardbetrag = $oehStandardbetrag;
-				}
-				return $buchungstyp;
-			}, $data);
-		}
-	}
 }

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/core/Notiz_Controller.php

@@ -417,7 +417,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');

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/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/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/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); ?>

include/konto.class.php

@@ -25,7 +25,6 @@
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
 require_once(dirname(__FILE__).'/'.EXT_FKT_PATH.'/generateZahlungsreferenz.inc.php');
-require_once(dirname(__FILE__).'/variable.class.php');
 
 class konto extends basis_db
 {
@@ -433,8 +432,6 @@ class konto extends basis_db
 
 		$qry.=" ORDER BY beschreibung";
 
-		$oehBeitrag = $this->_getOEHBeitrag();
-
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -443,15 +440,7 @@ class konto extends basis_db
 
 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
-				{
-					$typ->standardbetrag = $oehBeitrag;
-				}
-				else
-				{
-					$typ->standardbetrag = $row->standardbetrag;
-				}
-
+				$typ->standardbetrag = $row->standardbetrag;
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -1001,43 +990,6 @@ class konto extends basis_db
 			return false;
 		}
 	}
-
-	private function _getOEHBeitrag()
-	{
-		if(!is_user_logged_in())
-		{
-			return false;
-		}
-
-		$variablen_obj = new variable();
-		$variablen_obj->loadVariables(get_uid());
-
-		$qry = "WITH semstart AS (
-					SELECT start FROM public.tbl_studiensemester
-					WHERE studiensemester_kurzbz = '". $this->db_escape($variablen_obj->variable->semester_aktuell) . "'
-				)
-				SELECT * FROM bis.tbl_oehbeitrag oehb
-				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
-				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
-				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
-				ORDER BY semvon.start
-				LIMIT 1";
-
-		if ($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$summe = ($row->studierendenbeitrag + $row->versicherung) * -1;
-				return number_format((float)$summe, 2, '.', '');
-			}
-			return false;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
-			return false;
-		}
-	}
 }
 
 ?>

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;

public/css/Studentenverwaltung.css

@@ -2,7 +2,6 @@
 @import './SvgIcons.css';
 @import './components/searchbar/searchbar.css';
 @import './components/verticalsplit.css';
-@import './components/horizontalsplit.css';
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';
@@ -198,6 +197,10 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
+}
+
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;

public/css/components/horizontalsplit.css

@@ -1,75 +0,0 @@
-:root {
-	--fhc-horizontalsplit-hsplitter-bg-color: var(--fhc-background, #eee);
-	--fhc-horizontalsplit-hsplitter-border-color: var(--fhc-border, #eee);
-	--fhc-horizontalsplit-hsplitter-splitactions-color: var(--fhc-dark, #000);
-}
-
-.horizontalsplit-container {
-	display: flex;
-	flex-direction: row;
-	overflow: hidden;
-	max-height: 100%;
-	padding: 0px;
-}
-
-.horizontalsplitted {
-	overflow: auto;
-	flex-shrink: 0;
-}
-
-.horizontalsplitter {
-	flex-shrink: 0;
-	width: 16px;
-	cursor: col-resize;
-	user-select: none;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.horizontalsplitter.left {
-	border-left: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-right: 3px;
-}
-
-.horizontalsplitter.right {
-	border-right: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-left: 3px;
-}
-
-.splitactions.horizontal {
-	background-color: var(--fhc-horizontalsplit-hsplitter-bg-color);
-	color: var(--fhc-horizontalsplit-hsplitter-splitactions-color);
-	display: flex;
-	flex-direction: column;
-	padding: 5px 0 5px 0;
-}
-
-.splitactions.horizontal.left {
-	border-radius: 0 40% 40% 0;
-}
-
-.splitactions.horizontal.right {
-	border-radius: 40% 0 0 40%;
-}
-
-.splitactions.horizontal .splitaction {
-	width: 14px;
-	height: 28px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.splitactions.horizontal .splitaction.resize {
-	cursor: col-resize;
-}
-
-#content {
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
-}
-
-#content > div:first-child {
-	margin-top: 30px;
-}

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/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/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/api/factory/stv/konto.js

@@ -38,10 +38,6 @@ export default {
 		};
 	},
 	insert(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -56,10 +52,6 @@ export default {
 		};
 	},
 	edit(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
@@ -73,14 +65,10 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen(studiensemester_kurzbz) {
-		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
-		if (!!studiensemester_kurzbz)
-			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
-
+	getBuchungstypen() {
 		return {
 			method: 'get',
-			url: url
+			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
 		};
-	},
+	}
 };

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/Messages/Details/NewMessage/Modal.js

@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -313,7 +313,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -338,7 +338,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3 tiny-90">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"

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

@@ -62,7 +62,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',

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

@@ -30,7 +30,6 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
-			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -196,7 +195,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p?.t?.('messages', key) || key;
+							return this.$p.t('messages', key);
 						},
 					},
 					{
@@ -306,6 +305,8 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
+
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -356,12 +357,6 @@ export default {
 				});*/
 	},
 	created(){
-		this.$p
-			.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz'])
-			.then(() => {
-				this.arePhrasesLoaded = true;
-			});
-
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
@@ -386,7 +381,6 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
-						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -419,7 +413,6 @@ export default {
 				<div class="col-sm-12 pt-6">
 					<core-filter-cmpt
 						ref="table"
-						v-if="arePhrasesLoaded"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
 						table-only

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.js

@@ -18,7 +18,6 @@
 import CoreSearchbar from "../searchbar/searchbar.js";
 import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
-import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
 import AppMenu from "../AppMenu.js";
 import AppConfig from "../AppConfig.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
@@ -38,7 +37,6 @@ export default {
 		CoreSearchbar,
 		NavLanguage,
 		VerticalSplit,
-		HorizontalSplit,
 		AppMenu,
 		AppConfig,
 		StvVerband,
@@ -237,10 +235,6 @@ export default {
 					}
 				}
 			}
-		},
-		sidebarCollapsed(newVal) {
-			if(newVal) this.$refs.hSplit.collapseLeft()
-			else this.$refs.hSplit.showBoth()
 		}
 	},
 	methods: {
@@ -638,30 +632,23 @@ export default {
 						</app-menu>
 					</div>
 				</aside>
-				<horizontal-split ref="hSplit" :defaultRatio="[15, 85]">
-					<template #left>
-						<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100  w-100">
-							<div class="offcanvas-header justify-content-end px-1 d-md-none">
-								<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
-							</div>
-							<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-							<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
-						</nav>
-					</template>
-					<template #right>
-						<main>
-							<vertical-split :defaultRatio="[50, 50]">
-								<template #top>
-									<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
-								</template>
-								<template #bottom>
-									<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
-								</template>
-							</vertical-split>
-						</main>
-					</template>
-				</horizontal-split>
-				
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
 			</div>
 		</div>
 		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>

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

@@ -83,8 +83,6 @@ export default {
 				});
 		},
 		open() {
-
-			this.getBuchungstypen(this.currentSemester);
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
@@ -107,7 +105,7 @@ export default {
 			const text = typ.standardtext || '';
 			const creditpoints = typ.credit_points || '';
 
-			if (!this.data.betrag || this.data.betrag == '-0.00' || this.data.betrag !== amount)
+			if (!this.data.betrag || this.data.betrag == '-0.00')
 				this.data.betrag = amount;
 
 			if (!this.data.buchungstext)
@@ -115,18 +113,7 @@ export default {
 
 			if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null))
 				this.data.credit_points = creditpoints;
-		},
-		getBuchungstypen(studiensemester_kurzbz)
-		{
-			this.$api
-				.call(ApiKonto.getBuchungstypen(studiensemester_kurzbz))
-				.then(result => {
-					this.lists.buchungstypen = result.data;
-					if (this.data.buchungstyp_kurzbz)
-						this.checkDefaultBetrag(this.data.buchungstyp_kurzbz);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
+		}
 	},
 	template: `
 	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
@@ -179,7 +166,6 @@ export default {
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
-					@change="getBuchungstypen(data.studiensemester_kurzbz)"
 					name="studiensemester_kurzbz"
 					:label="$p.t('lehre/studiensemester')"
 					>

public/js/components/Vertraege/List/Details.js

@@ -41,8 +41,8 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Betrag", field: "betrag", headerFilter: true,
+					{title: "Typ", field: "type"},
+					{title: "Betrag", field: "betrag",
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -51,14 +51,14 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Bezeichnung", field: "bezeichnung", headerFilter: true},
-					{title: "Studiensemester", field: "studiensemester_kurzbz", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Pruefung_id", field: "pruefung_id", visible: false, headerFilter: true},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung"},
+					{title: "Studiensemester", field: "studiensemester_kurzbz"},
+					{title: "Pruefung_id", field: "pruefung_id", visible: false},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -110,10 +110,10 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '250',
+				height: '200',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details-2026050501'
+				persistenceID: 'core-contracts-details-2026021701'
 			},
 			tabulatorEvents: [
 				{
@@ -137,7 +137,7 @@ export default {
 
 						setHeader('type', this.$p.t('global', 'typ'));
 						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-						setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
+						setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
 						setHeader('betrag', this.$p.t('ui', 'betrag'));
 						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/List/Status.js

@@ -47,13 +47,12 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status-2026050501',
+				persistenceID: 'core-contracts-status-2026021701',
 				columns: [
-					{title: "Status", field: "bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Status", field: "bezeichnung"},
 					{
 						title: "Datum",
 						field: "datum",
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -67,15 +66,14 @@ export default {
 							});
 						}
 					},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true},
-					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false, headerFilter: true},
-					{title: "User", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "insertvon", field: "insertvon", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false},
+					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
+					{title: "User", field: "mitarbeiter_uid", visible: false},
+					{title: "insertvon", field: "insertvon", visible: false},
 					{
 						title: "insertamum",
 						field: "insertamum",
 						visible: false,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -89,12 +87,11 @@ export default {
 							});
 						}
 					},
-					{title: "updatevon", field: "updatevon", visible: false, headerFilter: true},
+					{title: "updatevon", field: "updatevon", visible: false},
 					{
 						title: "updateamum",
 						field: "updateamum",
 						visible: false,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -151,7 +148,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '250',
+				height: '200',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 			},

public/js/components/Vertraege/List/Unassigned.js

@@ -30,11 +30,10 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Typ", field: "type", width: 100},
 					{
 						title: "Betrag",
 						field: "betrag1",
-						headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -42,29 +41,28 @@ export default {
 							}
 							return parseFloat(value).toFixed(2);
 						}},
-					{title: "Bezeichnung", field: "bezeichnung", width: 150, headerFilter: true},
-					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", width: 150},
+					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
 					{
 						title: "VertragsstundenStudiensemester",
 						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false,
-						headerFilter: true
+						visible: false
 					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 250,
+				height: 150,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned-2026050501'
+				persistenceID: 'core-contracts-unassigned-2026021701'
 			},
 			tabulatorEvents: [
 				{
@@ -102,7 +100,7 @@ export default {
 
 							setHeader('type', this.$p.t('global', 'typ'));
 							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-							setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
+							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
 							setHeader('betrag1', this.$p.t('ui', 'betrag'));
 							setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 							setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/Vertraege.js

@@ -20,6 +20,9 @@ export default {
 		ContractStati
 	},
 	inject: {
+/*		cisRoot: {
+			from: 'cisRoot'
+		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -51,9 +54,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 300, headerFilter: true},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300},
 					{
-						title: "Betrag", field: "betrag", width: 100, headerFilter: true,
+						title: "Betrag", field: "betrag", width: 100,
 						formatter: function (cell) {
 							let value = cell.getValue();
 
@@ -63,13 +66,12 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Status", field: "status", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
+					{title: "Status", field: "status", width: 100},
 					{
 						title: "Vertragsdatum",
 						field: "vertragsdatum",
 						width: 128,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -80,11 +82,11 @@ export default {
 							});
 						}
 					},
-					{title: "VertragId", field: "vertrag_id", visible: false, headerFilter: true},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
-					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false, headerFilter: true},
-					{title: "Anmerkung", field: "anmerkung", visible: false, headerFilter: true},
-					{title: "isAbgerechnet", field: "isabgerechnet", visible: false, headerFilter: true},
+					{title: "VertragId", field: "vertrag_id", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "isAbgerechnet", field: "isabgerechnet", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -138,13 +140,11 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-2026050501',
+				persistenceID: 'core-contracts-2026021701',
 			};
 			return options;
 		},
 		tabulatorEvents() {
-			const vm = this;
-
 			const events = [
 				{
 					event: 'tableBuilt',
@@ -177,11 +177,28 @@ export default {
 						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				},
+/*				{
+					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
+					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
+					event: 'rowClick',
+					handler: (e, row) => {
+						if (this.dataPrintHonorar != null && this.dataPrintHonorar.multiselect != null) {
+							const selectedContract = row.getData().vertrag_id;
+							const status = row.getData().status;
+							const bezeichnung =	row.getData().bezeichnung;
+
+							this.toggleRowClick(selectedContract, status, bezeichnung);
+						}
+					}
+				},*/
 				{
 					event: 'rowClick',
-					handler: function (e, row) {
+					handler: (e, row) => {
+						if (!this.dataPrintHonorar?.multiselect) return;
+
 						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
-						vm.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+
+						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
 					}
 				},
 				{
@@ -225,6 +242,8 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
+/*			if(this.dataPrintHonorar?.multiselect)
+				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -251,6 +270,7 @@ export default {
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					//window.scrollTo(0, 0);
 					this.reload();
 					this.contractSelected.vertrag_id = null;
 				})
@@ -498,9 +518,19 @@ export default {
 					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
 			window.open(linkToPdf, '_blank');
 		},
+/*		toggleRowClick(contractId, status, bezeichnung) {
+			const index = this.arraySelectedContracts.findIndex(
+				([id]) => id === contractId
+			);
+			if (index !== -1) {
+				this.arraySelectedContracts.splice(index, 1);
+			} else {
+				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
+			}
+		},*/
 		toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
+			if (!this.dataPrintHonorar?.multiselect) return;
 
-			const isMulti = this.dataPrintHonorar?.multiselect === true;
 			const isCtrl = event.ctrlKey || event.metaKey;
 
 			const entry = {
@@ -510,29 +540,28 @@ export default {
 				vertragstyp_bezeichnung
 			};
 
-			// allow MultiSelect just in case event multiActionPrintHonorarvertrag
-			const allowMultiClick = isMulti && isCtrl;
-
-			if (!allowMultiClick) {
+			// Single click
+			if (!isCtrl) {
 				this.arraySelectedContracts = [entry];
-
-				//just mark last selected row as selected
-				this.$refs.table.tabulator.deselectRow();
-				this.$refs.table.tabulator.selectRow(vertrag_id);
 				return;
 			}
 
+			// CTRL / CMD → toggle
 			const index = this.arraySelectedContracts.findIndex(
 				e => e.vertrag_id === vertrag_id
 			);
 
 			if (index === -1) {
 				this.arraySelectedContracts.push(entry);
+				//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
 			} else {
 				this.arraySelectedContracts.splice(index, 1);
 			}
-
-		}
+		},
+/*		clearSelection(){
+			this.arraySelectedContracts = [];
+			this.$refs.table.tabulator.deselectRow();
+		}*/
 	},
 	created() {
 		Promise.all([
@@ -558,6 +587,88 @@ export default {
 		});
 		this.getFormattedDate();
 	},
+	/*
+	TODO(Manu) delete after check
+
+		<div class="row mb-3">
+			<form-input
+				type="DatePicker"
+				:label="$p.t('vertrag/datum_vertrag')"
+				name="vertragsdatum"
+				v-model="formData.vertragsdatum"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				>
+			</form-input>
+		</div>
+
+		<div class="row mb-3">
+			<form-input
+				type="text"
+				:label="$p.t('ui/bezeichnung')"
+				name="bezeichnung"
+				v-model="formData.bezeichnung"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="select"
+				:label="$p.t('global/typ')"
+				v-model="formData.vertragstyp_kurzbz"
+				name="vertragstyp_kurzbz"
+				>
+				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+				<option
+					v-for="entry in listContractTypes"
+					:key="entry.vertragstyp_kurzbz"
+					:value="entry.vertragstyp_kurzbz"
+					>
+					{{entry.bezeichnung}}
+				</option>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('ui/betrag')"
+				name="betrag"
+				v-model="formData.betrag"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden"
+				v-model="formData.vertragsstunden"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden_studiensemester_kurzbz"
+				v-model="formData.vertragsstunden_studiensemester_kurzbz"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="textarea"
+				:label="$p.t('global/anmerkung')"
+				name="anmerkung"
+				v-model="formData.anmerkung"
+				>
+			</form-input>
+		</div>
+	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 

public/js/components/horizontalsplit/horizontalsplit.js

@@ -1,147 +0,0 @@
-export default {
-	name: 'HorizontalSplit',
-	props: {
-		defaultRatio: {
-			type: Array,
-			default: () => [50, 50]
-		}
-	},
-	data: function () {
-		return {
-			availWidth: 0,
-			leftwidth: 0,
-			rightwidth: 0,
-			mousePosX: 0,
-			resize: false,
-			hsplitterOffset: 0,
-			selfOffsetLeft: 0
-		};
-	},
-	template: `
-    <div ref="horizontalsplit" class="horizontalsplit-container">
-        <div ref="leftpanel" class="horizontalsplitted"
-             :style="{ width: this.leftwidthcss }">
-            <slot name="left">
-                <p>Left Panel</p>
-            </slot>
-        </div>
-        <div ref="hsplitter" class="horizontalsplitter"
-             :class="this.leftOrRightClass" @mousedown="this.dragStart">
-            <div class="splitactions horizontal" :class="this.leftOrRightClass">
-            	<span @click="this.collapseRight" class="splitaction">
-                    <i class="fas fa-angle-right text-muted"></i>
-                </span>
-                <span @dblclick="this.showBoth" class="splitaction resize">
-                    <i class="fas fa-grip-lines-vertical text-muted"></i>
-                </span>
-                <span @click="this.collapseLeft" class="splitaction">
-                    <i class="fas fa-angle-left text-muted"></i>
-                </span>
-            </div>
-        </div>
-        <div ref="rightpanel" class="horizontalsplitted"
-             :style="{ width: this.rightwidthcss }">
-            <slot name="right">
-                <p/>
-            </slot>
-        </div>
-    </div>
-    `,
-	mounted: function () {
-		this.calcWidths();
-		this.trackHorizontalSplitterOffsetLeft();
-		window.addEventListener('resize', this.calcWidths);
-	},
-	updated: function () {
-		this.trackHorizontalSplitterOffsetLeft();
-	},
-	beforeDestroy: function () {
-		window.removeEventListener('resize', this.calcWidths);
-	},
-	methods: {
-		calcWidths: function () {
-			var oldavailWidth = this.availWidth;
-			this.selfOffsetLeft = this.$refs.horizontalsplit.offsetLeft;
-			this.availWidth = this.$refs.horizontalsplit.offsetWidth - this.$refs.hsplitter.offsetWidth;
-
-			if ((this.leftwidth === 0 && this.rightwidth === 0) || oldavailWidth === 0) {
-				this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			} else {
-				this.leftwidth = Math.floor(((this.leftwidth * 100) / oldavailWidth) / 100 * this.availWidth);
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		collapseLeft: function () {
-			this.calcWidths();
-			this.leftwidth = 0;
-			this.rightwidth = this.availWidth;
-		},
-		collapseRight: function () {
-			this.calcWidths();
-			this.leftwidth = this.availWidth;
-			this.rightwidth = 0;
-		},
-		showBoth: function () {
-			this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		isCollapsed: function () {
-			if (this.leftwidth === 0) {
-				return 'left';
-			} else if (this.rightwidth === 0) {
-				return 'right';
-			} else {
-				return false;
-			}
-		},
-		dragStart: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.addEventListener('mouseup', this.dragEnd);
-			window.addEventListener('mousemove', this.drag);
-			this.resize = true;
-			this.mousePosX = e.clientX;
-		},
-		drag: function (e) {
-			if (!this.resize) {
-				return;
-			}
-			e.preventDefault();
-			e.stopPropagation();
-			var offsetX = e.clientX - this.mousePosX;
-			this.leftwidth = this.leftwidth + offsetX;
-			if (this.leftwidth < 0) {
-				this.leftwidth = 0;
-			}
-			if (this.leftwidth > this.availWidth) {
-				this.leftwidth = this.availWidth;
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-			this.mousePosX = e.clientX;
-		},
-		dragEnd: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.removeEventListener('mousemove', this.drag);
-			window.removeEventListener('mouseup', this.dragEnd);
-			this.resize = false;
-			this.mousePosX = e.clientX;
-		},
-		trackHorizontalSplitterOffsetLeft: function () {
-			this.hsplitterOffset = this.$refs.hsplitter.offsetLeft;
-		}
-	},
-	computed: {
-		leftOrRightClass: function () {
-			return ((this.hsplitterOffset - this.selfOffsetLeft) <= Math.floor(this.availWidth / 2))
-				? 'left'
-				: 'right';
-		},
-		leftwidthcss: function () {
-			return this.leftwidth + 'px';
-		},
-		rightwidthcss: function () {
-			return this.rightwidth + 'px';
-		}
-	}
-};

public/js/components/verticalsplit/verticalsplit.js

@@ -1,11 +1,5 @@
 export default {
     name: 'VerticalSplit',
-    props: {
-        defaultRatio: {
-            type: Array,
-            default: () => [50, 50]
-        }
-    },
     data: function() {
       return {          
           availHeight: 0,
@@ -56,22 +50,17 @@ export default {
     updated: function() {
         this.trackVerticalSplitterOffsetTop();
     },
-    beforeDestroy: function () {
-        window.removeEventListener('resize', this.calcHeights);
-    },
     methods: {
         calcHeights: function() {
             var windowheight = window.innerHeight;
             var oldavailHeight = this.availHeight;
             this.selfOffsetTop = this.$refs.verticalsplit.offsetTop;
             this.availHeight = windowheight - this.selfOffsetTop - this.$refs.vsplitter.offsetHeight;
-           
             if( (this.topheight === 0 && this.bottomheight === 0) || oldavailHeight === 0 ) {
-                this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
+                this.topheight = Math.floor(this.availHeight/2);
             } else {
                 this.topheight = Math.floor( ((((this.topheight * 100) / oldavailHeight) / 100) * this.availHeight) );
             }
-            
             this.bottomheight = this.availHeight - this.topheight;
         },
         collapseTop: function() {
@@ -85,8 +74,8 @@ export default {
             this.bottomheight = 0;
         },
         showBoth: function() {
-            this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
-            this.bottomheight = this.availHeight - this.topheight
+            this.topheight = Math.floor(this.availHeight/2);
+            this.bottomheight = Math.floor(this.availHeight/2);
         },
         isCollapsed: function() {
             if( this.topheight === 0 ) {

system/dbupdate_3.4.php

@@ -94,7 +94,7 @@ require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
-
+require_once('dbupdate_3.4/76663_tempus_rekursive_raum_struktur.php');
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 

system/dbupdate_3.4/76663_tempus_rekursive_raum_struktur.php

@@ -0,0 +1,22 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if(!$result = @$db->db_query("SELECT parent_ort_kurzbz FROM public.tbl_ort LIMIT 1;"))
+{
+	$qry = 'ALTER TABLE public.tbl_ort ADD COLUMN parent_ort_kurzbz VARCHAR(16);';
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_ort: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' public.tbl_ort: parent_ort_kurzbz added successfully.<br>';
+}
+
+$result = $db->db_query("SELECT constraint_name FROM information_schema.table_constraints 
+	WHERE table_name='tbl_ort' AND constraint_type='FOREIGN KEY' AND constraint_name='fk_parent_ort_kurzbz'");
+if($db->db_num_rows($result)==0)
+{
+	$qry = "ALTER TABLE public.tbl_ort ADD CONSTRAINT fk_parent_ort_kurzbz FOREIGN KEY(parent_ort_kurzbz) REFERENCES public.tbl_ort(ort_kurzbz);";
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_ort: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Added foreign key constraint fk_parent_ort_kurzbz to public.tbl_ort';
+}

vilesci/stammdaten/raum_details.php

@@ -67,6 +67,7 @@
 	$gebteil='';
 	$m2='';
 	$arbeitsplaetze='';
+	$parent_ort_kurzbz = '';
 
 	$neu = "true";
 
@@ -93,6 +94,7 @@
 		$oe_kurzbz = $_POST["oe_kurzbz"];
 		$gebteil = $_POST["gebteil"];
 		$arbeitsplaetze = $_POST["arbeitsplaetze"];
+		$parent_ort_kurzbz = $_POST["parent_ort_kurzbz"];
 
 		$sg_update = new ort();
 		$sg_update->ort_kurzbz = $ort_kurzbz;
@@ -115,6 +117,7 @@
 		$sg_update->gebteil = $gebteil;
 		$sg_update->oe_kurzbz = $oe_kurzbz;
 		$sg_update->arbeitsplaetze = $arbeitsplaetze;
+		$sg_update->parent_ort_kurzbz = $parent_ort_kurzbz;
 		$sg_update->updateamum = date('Y-m-d H:i:s');
 		$sg_update->updatevon = $user;
 
@@ -161,6 +164,7 @@
 		$m2 = $sg->m2;
 		$oe_kurzbz = $sg->oe_kurzbz;
 		$arbeitsplaetze = $sg->arbeitsplaetze;
+		$parent_ort_kurzbz = $sg->parent_ort_kurzbz;
 		$neu = "false";
 	}
 
@@ -402,6 +406,8 @@
 						<td><input class="detail" type="text" name="telefonklappe" size="3" maxlength="8" value="'.$telefonklappe.'" onchange="submitable()"></td>
 						<td>Anz. Arbeitsplätze</td>
 						<td><input class="detail" type="text" name="arbeitsplaetze" size="3" maxlength="8" value="'.$arbeitsplaetze.'" onchange="submitable()"></td>
+						<td>Parent Raum Kurzbz</td>
+						<td><input type="text" name="parent_ort_kurzbz" size="10" onchange="submitable()" value="'.$parent_ort_kurzbz.'" /></td>
 					</tr>
 					<tr>
 						<td valign="top">Lageplan</td>

vilesci/stammdaten/raum_uebersicht.php

@@ -244,6 +244,7 @@ if (isset($_GET['sendform']))
 			<th>Aktiv</th>
 			<th>Kosten</th>
 			<th>Stockwerk</th>
+			<th>Parent Ort Kurzbz</th>
 	   </tr>
 	</thead>
 	<tbody>';
@@ -287,6 +288,7 @@ if (isset($_GET['sendform']))
 		
 		$htmlstr .= "		<td>".$twraum->kosten."</td>\n";
 		$htmlstr .= "		<td>".$twraum->stockwerk."</td>\n";
+		$htmlstr .= "		<td><a href='raum_details.php?ort_kurzbz=".$twraum->parent_ort_kurzbz."' target='detail_raum'>".$twraum->parent_ort_kurzbz."</a></td>\n";
 	
 		$htmlstr .= "	</tr>\n";
 	}