lecture collision check bug fix

- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus

application/config/Events.php

@@ -33,5 +33,27 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
+//Tempus Renderers:
+Events::on('loadTempusRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["reservierung"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadTempusRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["lehreinheit"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+
 
 

application/config/navigation.php

@@ -208,7 +208,14 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                )
+                ),
+				'dashboardadmin' => array(
+					'link' => site_url('dashboard/Admin'),
+					'description' => 'Dashboard Admin',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'dashboard/admin:r'
+				)
 			)
 		)
 	)

application/config/tempus.php

@@ -0,0 +1,3 @@
+<?php
+
+$config['send_update_mails'] = false;

application/controllers/Tempus.php

@@ -0,0 +1,40 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Tempus extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+
+		$this->load->view('Tempus', [
+			'permissions' => [
+				'admin' => $this->permissionlib->isBerechtigt('admin')
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
+				'timezone' => $this->config->item('timezone')
+			]
+		]);
+	}
+}

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

@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller
 
 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-           
+			'GetTempusRenderers' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -66,6 +66,26 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}
 
+	public function GetTempusRenderers(){
+		$renderer_paths = [];
+		Events::trigger(
+				'loadRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+
+		Events::trigger(
+				'loadTempusRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+		$this->terminateWithSuccess($renderer_paths);
+	}
+
 	
 	
 

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

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

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

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

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

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

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

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

application/controllers/api/frontend/v1/lv/Gruppe.php

@@ -118,54 +118,17 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->_ci->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->GruppeModel->db->group_start();
-			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->group_end();
-		}
-		$this->_ci->GruppeModel->db->group_end();
-
-		$gruppen_result = $this->_ci->GruppeModel->load();
-
-		$gruppen_array = array();
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
 
 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
 
+		$gruppen_array = array();
+
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);
 
-		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->_ci->LehrverbandModel->addOrder('verband');
-		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->_ci->LehrverbandModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehrverbandModel->db->group_start();
-			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->group_end();
-		}
-		$this->_ci->LehrverbandModel->db->group_end();
-		$lehrverband_result = $this->_ci->LehrverbandModel->load();
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
 
 		$lehrverband_array = array();
 

application/controllers/api/frontend/v1/tempus/Config.php

@@ -0,0 +1,116 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+
+class Config extends FHCAPI_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'getHeader' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+	}
+
+	public function get()
+	{
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+
+		$config = [];
+
+		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$config['ignore_kollision'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_kollision'),
+			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
+
+		];
+
+		$config['kollision_student'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'kollision_student'),
+			"value" => ($data['kollision_student'] ?? 'false') === 'true'
+		];
+
+		$config['ignore_reservierung'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_reservierung'),
+			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
+
+		];
+
+		$config['ignore_zeitsperre'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
+			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
+		];
+
+
+
+		$this->terminateWithSuccess($config);
+	}
+	public function getHeader()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
+		$this->_ci->KalenderStatusModel->addOrder('sort');
+		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
+		$visible_status = $this->_ci->KalenderStatusModel->load();
+
+		$visible_status = getData($visible_status);
+
+		$config['visible_status']['all'] = 'Alle';
+
+		foreach ($visible_status as $status)
+		{
+			$config['visible_status'][$status->status_kurzbz] = $status->status;
+		}
+
+		$this->terminateWithSuccess($config);
+	}
+
+	public function set()
+	{
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_kollision',
+			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'kollision_student',
+			$this->input->post('kollision_student') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_reservierung',
+			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_zeitsperre',
+			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
+		);
+		$this->terminateWithSuccess();
+	}
+
+
+}

application/controllers/api/frontend/v1/tempus/Coursepicker.php

@@ -0,0 +1,254 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Coursepicker extends FHCAPI_Controller
+{
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'search' => self::PERM_LOGGED,
+			'getByStg' => self::PERM_LOGGED
+		]);
+
+		$this->_ci = &get_instance();
+		$this->load->library('form_validation');
+
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+
+		$this->loadPhrases(['ui']);
+	}
+
+	public function search()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		//TODO Where weiter anpassen z.B. Fachbereich
+		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
+												tbl_lehreinheit.unr,
+												tbl_lehreinheit.lvnr,
+												tbl_lehreinheit.lehrfach_id,
+												lehrfach.kurzbz AS lehrfach,
+												lehrfach.bezeichnung AS lehrfach_bez,
+												lehrfach.farbe AS lehrfach_farbe,
+												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+												lema.mitarbeiter_uid AS lektor_uid,
+												tbl_mitarbeiter.kurzbz AS lektor,
+												tbl_studiengang.studiengang_kz,
+												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+												lvb.semester,
+												lvb.verband,
+												lvb.gruppe,
+												lvb.gruppe_kurzbz,
+												tbl_lehreinheit.raumtyp,
+												tbl_lehreinheit.raumtypalternativ,
+												tbl_lehreinheit.stundenblockung,
+												tbl_lehreinheit.wochenrythmus,
+												lema.semesterstunden,
+												lema.planstunden,
+												tbl_lehreinheit.start_kw,
+												tbl_lehreinheit.anmerkung,
+												tbl_lehreinheit.studiensemester_kurzbz');
+
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehreinheitModel->db->group_start();
+			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
+				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
+			}
+			$this->_ci->LehreinheitModel->db->group_end();
+
+		}
+		$this->_ci->LehreinheitModel->db->group_end();
+		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
+		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
+
+		$result = $this->_ci->LehreinheitModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+	public function getByStg()
+	{
+		//TODO check einbauen ob studiensemester und stg vorhanden ist
+		$stg = $this->input->get('stg');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		if (is_null($stg) || is_null($studiensemester_kurzbz))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->_ci->LehreinheitModel->addSelect('
+			tbl_lehreinheit.lehreinheit_id,
+			tbl_lehreinheit.unr,
+			tbl_lehreinheit.lvnr,
+			tbl_lehreinheit.lehrfach_id,
+			lehrfach.kurzbz AS lehrfach,
+			lehrfach.bezeichnung AS lehrfach_bez,
+			lehrfach.farbe AS lehrfach_farbe,
+			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+			lema.mitarbeiter_uid AS lektor_uid,
+			ma.kurzbz AS lektor,
+			tbl_person.vorname,
+			tbl_person.nachname,
+			tbl_studiengang.studiengang_kz,
+			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+			lvb.semester,
+			lvb.verband,
+			lvb.gruppe,
+			lvb.gruppe_kurzbz,
+			tbl_lehreinheit.raumtyp,
+			tbl_lehreinheit.raumtypalternativ,
+			tbl_lehreinheit.stundenblockung,
+			tbl_lehreinheit.wochenrythmus,
+			lema.semesterstunden,
+			lema.planstunden,
+			tbl_lehreinheit.start_kw,
+			tbl_lehreinheit.anmerkung,
+			tbl_lehreinheit.studiensemester_kurzbz
+		');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
+
+		$result = $this->_ci->LehreinheitModel->loadWhere(array(
+			'tbl_lehrform.verplanen' => true,
+			'tbl_studiengang.studiengang_kz' => $stg,
+			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$result = hasData($result) ? getData($result) : array();
+		$grouped = array();
+
+		foreach ($result as $row)
+		{
+			$unr = $row->unr;
+			if (!isset($grouped[$unr]))
+			{
+				$grouped[$unr] = (object)array(
+					'unr' => $row->unr,
+					'lehrfach_id' => $row->lehrfach_id,
+					'lehrfach_bez' => $row->lehrfach_bez,
+					'lehrfach_farbe' => $row->lehrfach_farbe,
+					'studiengang_kz' => $row->studiengang_kz,
+					'studiengang' => $row->studiengang,
+					'semester' => $row->semester,
+					'verband' => $row->verband,
+					'gruppe' => $row->gruppe,
+					'gruppe_kurzbz' => $row->gruppe_kurzbz,
+					'raumtyp' => $row->raumtyp,
+					'raumtypalternativ' => $row->raumtypalternativ,
+					'anmerkung' => $row->anmerkung,
+					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
+					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
+					'lektoren' => array(),
+					'lehreinheit_id' => array(),
+					'lvnr' => array(),
+					'lehrfach' => array(),
+					'lehrform' => array(),
+					'stundenblockung' => array(),
+					'wochenrythmus' => array(),
+					'planstunden' => array(),
+					'start_kw' => array(),
+					'verplant' => array(),
+					'offenestunden' => array(),
+					'lehrverband' => array(),
+					'lem' => array(),
+					'verplant_gesamt' => 0,
+				);
+			}
+
+			$group = $grouped[$unr];
+
+			$group->lektoren[$row->lektor_uid] = (object)array(
+				'uid' => $row->lektor_uid,
+				'kurzbz' => trim($row->lektor),
+				'name' => $row->vorname . ' ' . $row->nachname,
+			);
+
+			$group->lehreinheit_id[] = $row->lehreinheit_id;
+			$group->lvnr[] = $row->lvnr;
+			$group->lehrfach[] = $row->lehrfach;
+			$group->lehrform[] = $row->lehrform;
+			$group->stundenblockung[] = $row->stundenblockung;
+			$group->wochenrythmus[] = $row->wochenrythmus;
+			$group->planstunden[] = $row->planstunden;
+			$group->start_kw[] = $row->start_kw;
+			$group->verplant[] = isset($row->verplant) ? $row->verplant : 0;
+			$group->offenestunden[] = isset($row->offenestunden) ? $row->offenestunden : 0;
+			$group->verplant_gesamt += isset($row->verplant) ? $row->verplant : 0;
+
+			$lvb = $row->studiengang . '-' . $row->semester;
+
+			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
+				$lvb .= $row->verband;
+
+			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
+				$lvb .= $row->gruppe;
+
+			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
+
+			$group->lem[] = array(
+				'lehreinheit_id' => $row->lehreinheit_id,
+				'mitarbeiter_uid' => $row->lektor_uid,
+			);
+		}
+
+		foreach ($grouped as $group)
+		{
+			$group->lektoren = array_values($group->lektoren);
+			$group->lehrverband = array_values(array_unique($group->lehrverband));
+			$group->lehrfach = $this->_formatArr($group->lehrfach);
+			$group->lehrform = $this->_formatArr($group->lehrform);
+			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
+			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
+			$group->planstunden = $this->_formatArr($group->planstunden);
+			$group->start_kw = $this->_formatArr($group->start_kw);
+			$group->verplant = $this->_formatArr($group->verplant);
+			$group->offenestunden = $this->_formatArr($group->offenestunden);
+		}
+
+		$this->terminateWithSuccess(array_values($grouped));
+	}
+
+	private function _formatArr($arr)
+	{
+		$values = array_values(array_unique($arr));
+		$formatted = implode(' ', $values);
+
+		if (count($formatted) > 1)
+			$formatted .= ' ?';
+
+		return $formatted;
+	}
+
+
+}

application/controllers/api/frontend/v1/tempus/Kalender.php

@@ -0,0 +1,416 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Kalender extends FHCAPI_Controller
+{
+
+	private $_ci;
+	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
+	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
+
+	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStunden' => self::PERM_LOGGED,
+			'getPlan' => self::PERM_LOGGED,
+			'getPlanByOrt' => self::PERM_LOGGED,
+			'getRaumvorschlag' => self::PERM_LOGGED,
+			'getHistory' => 'lehre/lvplan:rw',
+			'deleteEntry' => 'lehre/lvplan:rw',
+			'syncToLecturer' => 'lehre/lvplan:rw',
+			'syncToStudent' => 'lehre/lvplan:rw',
+			'getPlanLecturer' =>'lehre/lvplan:rw',
+			'getPlanStudent' => 'lehre/lvplan:rw',
+			'getZeitwuensche' => self::PERM_LOGGED,
+			'getZeitsperren' => self::PERM_LOGGED,
+			'updateKalenderEvent' => 'lehre/lvplan:rw',
+			'addKalenderEvent' => 'lehre/lvplan:rw',
+			'addReservierung' => 'lehre/lvplan:rw',
+			'sync' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib');
+		$this->loadPhrases([
+			'ui'
+		]);
+
+
+		$this->_ci->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+	/**
+	 * fetches Stunden layout from database
+	 * @access public
+	 *
+	 */
+	public function getStunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
+		$stunden = $this->_ci->StundeModel->load();
+
+		$stunden = $this->getDataOrTerminateWithError($stunden);
+
+		$this->terminateWithSuccess($stunden);
+	}
+
+	public function getPlan()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
+			$start_date,
+			$end_date,
+			isset($filter->ort) ? $filter->ort : null,
+			isset($filter->uid) ? $filter->uid : null,
+			isset($filter->stg) ? $filter->stg : null
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanStudent()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanLecturer()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
+	{
+		if (!isset($start_date) || !isset($end_date) || !isset($ort))
+		{
+			$this->_ci->form_validation->set_data($_GET);
+			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+			$this->_ci->form_validation->set_rules('ort',"ort","required");
+			if($this->_ci->form_validation->run() === FALSE)
+				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+			$start_date = $this->_ci->input->get('start_date', TRUE);
+			$end_date = $this->_ci->input->get('end_date', TRUE);
+			$ort = $this->_ci->input->get('ort', TRUE);
+		}
+
+		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
+	}
+
+	public function getZeitsperren()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getZeitwuensche()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function updateKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	public function getRaumvorschlag()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
+
+		if (isset($filter->lehreinheit_id))
+		{
+			$result = $this->_ci->kalenderlib->getRaumvorschlagByLehreinheitID(
+				$start_date,
+				$end_date,
+				$filter->lehreinheit_id
+			);
+		}
+
+		if (isset($filter->kalender_id))
+		{
+			$result = $this->_ci->kalenderlib->getRaumvorschlagByKalenderID(
+				$start_date,
+				$end_date,
+				$filter->kalender_id
+			);
+		}
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function getHistory()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function deleteEntry()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function sync()
+	{
+		$result = $this->_ci->kalenderlib->sync();
+		$this->terminateWithSuccess($result);
+	}
+	public function syncToLecturer()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+	public function syncToStudent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+	public function addKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+
+		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	public function addReservierung()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('titel',"titel","required");
+		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
+		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$titel = $this->_ci->input->post('titel', TRUE);
+		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+
+		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	private function _checkFilter($filters)
+	{
+		$filter_valid = true;
+		$filter_object = new stdClass();
+		foreach ($filters as $filter)
+		{
+			if ($this->_ci->input->get($filter))
+			{
+				$filter_valid = true;
+				$filter_object->$filter = $this->_ci->input->get($filter);
+			}
+		}
+
+		if (!$filter_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		return $filter_object;
+	}
+
+	private function _checkUpdate($updateInfos)
+	{
+		$update_valid = false;
+		$update_object = new stdClass();
+		foreach (self::ALLOWED_TO_UPDATE as $filter)
+		{
+			if (isset($updateInfos[$filter]))
+			{
+				$update_valid = true;
+				$update_object->$filter = $updateInfos[$filter];
+			}
+		}
+
+		if (!$update_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+
+		return $update_object;
+	}
+}

application/controllers/api/frontend/v1/tempus/Reservierung.php

@@ -0,0 +1,231 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Reservierung extends FHCAPI_Controller
+{
+	private $_ci;
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'addReservierung' => 'lehre/lvplan:rw',
+			'getRollen' => 'lehre/lvplan:rw',
+			'getInformation' => 'lehre/lvplan:rw',
+			'getLektor' => 'lehre/lvplan:rw',
+			'searchGroup' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib');
+
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
+
+
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getInformation()
+	{
+		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
+
+		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+			$this->terminateWithSuccess($return_array);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess($return_array);
+
+		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
+		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
+		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaenge))
+			$this->terminateWithError($studiengaenge);
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$rollen = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
+		$studiensemester = $this->_ci->StudiensemesterModel->load();
+
+		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
+		$return_array['berechtigt'] = true;
+		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
+		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
+
+
+		$this->terminateWithSuccess($return_array);
+	}
+	public function getRaeume()
+	{
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function searchGroup()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+
+		$query_words = explode(' ', urldecode($query));
+
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+
+		if (isError($gruppen_result))
+			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
+
+		$gruppen_array = array();
+
+		if (hasData($gruppen_result))
+			$gruppen_array = getData($gruppen_result);
+
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+
+		$lehrverband_array = array();
+
+		if (isError($lehrverband_result))
+			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
+
+		if (hasData($lehrverband_result))
+			$lehrverband_array = getData($lehrverband_result);
+
+		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
+
+		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
+		{
+			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
+		});
+
+		$this->terminateWithSuccess($gefilterte_gruppen);
+	}
+
+	public function getRollen()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$result = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+	public function addReservierung()
+	{
+
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('titel',"titel","required");
+		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
+		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$titel = $this->_ci->input->post('titel', TRUE);
+		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
+		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
+		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
+		$groups = $this->_ci->input->post('groups', TRUE);
+
+		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+		{
+			if (empty($teilnehmer) || !is_array($teilnehmer))
+			{
+				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+			}
+		}
+		else
+			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+
+
+		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
+
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+
+	public function getLektor()
+	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+
+		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->MitarbeiterModel->db->group_start();
+			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->group_end();
+		}
+		$this->_ci->MitarbeiterModel->db->group_end();
+		$this->_ci->MitarbeiterModel->addOrder('nachname');
+		$this->_ci->MitarbeiterModel->addOrder('vorname');
+		$result = $this->_ci->MitarbeiterModel->load();
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+}

application/controllers/dashboard/Admin.php

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

application/controllers/dashboard/Api.php

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

application/controllers/dashboard/Config.php

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

application/controllers/dashboard/Dashboard.php

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

application/controllers/dashboard/DashboardDemo.php

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

application/controllers/dashboard/Widget.php

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

application/controllers/jobs/TempusJob.php

@@ -0,0 +1,27 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class TempusJob extends JOB_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->helper('hlp_sancho_helper');
+		$this->_ci->load->library('KalenderLib');
+	}
+
+
+	public function sync()
+	{
+		$this->_ci->logInfo('Start job FHC-Core->Tempus->sync');
+		$this->_ci->kalenderlib->sync();
+		$this->_ci->logInfo('End job FHC-Core->Tempus->sync');
+	}
+
+}

application/controllers/system/MigrateKalender.php

@@ -0,0 +1,562 @@
+<?php
+/*
+ * Job zur einmaligen Migration des Stundenplans
+ *
+ * Aufruf
+ * php index.ci.php system/MigrateKalender
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateKalender extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'migrateStundenplan' => ['admin:rw'],
+			'migrateReservierung' => ['admin:rw'],
+		));
+		$this->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
+		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
+		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
+		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
+		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
+		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function migrateStundenplan($von = null, $bis = null, $studiengang_kz = null)
+	{
+		$db = new DB_Model();
+
+		$stpldevsql = '
+			WITH eindeutige_stunden AS (
+				SELECT DISTINCT unr, datum, stunde
+				FROM lehre.tbl_stundenplandev
+				WHERE datum >= ? AND datum <= ?';
+
+		$params = [$von, $bis];
+
+		if (!is_null($studiengang_kz))
+		{
+			$stpldevsql .= ' AND studiengang_kz = ?';
+
+			$params[] = $studiengang_kz;
+		}
+
+		$stpldevsql .= '),
+			
+			block_keys AS (
+				SELECT
+					unr,
+					datum,
+					stunde,
+					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
+				FROM eindeutige_stunden
+			),
+			blocks AS (
+				SELECT
+					bk.unr,
+					bk.datum,
+					bk.block_nr,
+					MIN(bk.stunde) AS stunde_von,
+					MAX(bk.stunde) AS stunde_bis,
+					MIN(sp.lehreinheit_id) AS lehreinheit_id,
+					MIN(sp.ort_kurzbz) AS ort_kurzbz,
+					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
+					MIN(sp.insertamum) AS insertamum,
+					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
+					MAX(sp.updateamum) AS updateamum,
+					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
+				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
+				WHERE sp.datum >= ? AND sp.datum <= ?
+				GROUP BY bk.unr, bk.datum, bk.block_nr
+			)
+			SELECT
+				b.stundenplandev_ids,
+				b.unr,
+				b.datum,
+				b.block_nr,
+				b.lehreinheit_id,
+				b.ort_kurzbz,
+				b.datum + stundevon.beginn AS von,
+				b.datum + stundebis.ende AS bis,
+				b.insertamum,
+				b.insertvon,
+				b.updateamum,
+				b.updatevon
+			FROM blocks b
+				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
+				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
+			ORDER BY b.datum, b.unr, b.block_nr;';
+
+		array_push($params, $von, $bis);
+		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
+
+		if (hasData($stpldev))
+		{
+			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
+			// Wenn neuere Änderungen vorhanden dann Update
+			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
+			// Wenn noch nicht vorhanden neu anlegen
+			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
+			// in der neuen Tabelle auch archivieren oder loeschen
+
+			$data = getData($stpldev);
+			foreach($data as $block)
+			{
+				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
+				/*$ids = array_map('intval', $ids);*/
+
+				$this->SyncModel->db->where('stundenplandev_id IN (' . implode(',', $ids) . ')');
+				$sync_result = $this->SyncModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
+					if ($kalender_id)
+					{
+						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'stundenplandev_id');
+
+					if ($block->updateamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertSync($fehlende, $kalender_id);
+					}
+				}
+				/*if(hasData($SyncResult))
+				{
+					//bereits vorhanden
+					// TODO Update
+				}
+				else
+				{
+					// Neuen Eintrag anlegen
+
+					$von = $rowstpl->datum.' '.$rowstpl->beginn;
+					$bis = $rowstpl->datum.' '.$rowstpl->ende;
+					$typ = 'lehreinheit';
+					$status = 'live';
+					$insertamum = $rowstpl->insertamum;
+					$insertvon = $rowstpl->insertvon;
+					$updateamum = $rowstpl->updateamum;
+					$updatevon = $rowstpl->updatevon;
+
+					$resultKalenderInsert = $this->KalenderModel->insert(
+						array(
+							'von' => $von,
+							'bis' => $bis,
+							'typ' => $typ,
+							'status_kurzbz' => $status,
+							'vorgaenger_kalender_id' => null,
+							'insertamum' => $insertamum,
+							'insertvon' => $insertvon,
+							'updateamum' => $updateamum,
+							'updatevon' => $updatevon
+						)
+					);
+
+					if(isSuccess($resultKalenderInsert))
+					{
+						$kalender_id = getData($resultKalenderInsert);
+
+						$resultKalenderInsert = $this->KalenderLehreinheitModel->insert(
+							array(
+								'kalender_id' => $kalender_id,
+								'lehreinheit_id' => $rowstpl->lehreinheit_id,
+							)
+						);
+
+						$resultKalenderInsert = $this->KalenderOrtModel->insert(
+							array(
+								'kalender_id' => $kalender_id,
+								'ort_kurzbz' => $rowstpl->ort_kurzbz,
+							)
+						);
+
+						$resultSyncInsert = $this->SyncModel->insert(
+							array(
+								'stundenplandev_id' => $rowstpl->stundenplandev_id,
+								'kalender_id' => $kalender_id,
+								'lastupdate' => date('Y-m-d H:i:s')
+							)
+						);
+
+					}
+				}*/
+			}
+		}
+	}
+
+	public function migrateReservierung($von = null, $bis = null, $ort_kurzbz = null)
+	{
+		$db = new DB_Model();
+
+		$qry = "WITH eindeutige_stunden AS (
+					SELECT DISTINCT titel, beschreibung, datum, stunde
+					FROM campus.tbl_reservierung
+					WHERE datum >= ? AND datum <= ?";
+
+		$params = array($von, $bis);
+
+		if (!is_null($ort_kurzbz))
+		{
+			$qry .= " AND ort_kurzbz = ?";
+			$params[] = $ort_kurzbz;
+		}
+
+		$qry .=	"),
+					 block_keys AS (
+						 SELECT
+							 titel, beschreibung, datum, stunde,
+							 stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
+						 FROM eindeutige_stunden
+					 ),
+					 blocks AS (
+						 SELECT
+							 bk.titel,
+							 bk.beschreibung,
+							 bk.datum,
+							 bk.block_nr,
+							 MIN(bk.stunde) AS stunde_von,
+							 MAX(bk.stunde) AS stunde_bis,
+							 array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
+							 array_agg(DISTINCT r.uid) AS uids,
+							 array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
+							 array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe)::text) AS svg_kombis,
+							 MIN(r.ort_kurzbz) AS ort_kurzbz,
+							 MIN(r.studiengang_kz) AS studiengang_kz,
+							 MIN(r.veranstaltung_id) AS veranstaltung_id,
+							 MIN(r.reservierung_id) AS reservierung_id,
+							 MAX(r.insertamum) AS insertamum,
+							 (array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
+						 FROM block_keys bk
+								  JOIN campus.tbl_reservierung r
+									   ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
+						 WHERE r.datum >= ? AND r.datum <= ?
+						 GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
+					 )
+				SELECT
+					b.*,
+					(b.datum + s_von.beginn) AS von,
+					(b.datum + s_bis.ende)   AS bis
+				FROM blocks b
+						 JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
+						 JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
+				ORDER BY b.reservierung_id DESC;";
+		/*$qry = "WITH per_stunde AS (
+					SELECT
+						datum,
+						titel,
+						beschreibung, ort_kurzbz, studiengang_kz, stunde,
+						veranstaltung_id,
+						array_agg(DISTINCT uid) AS uids,
+						array_agg(DISTINCT reservierung_id::text) AS reservierung_ids,
+						array_agg(DISTINCT ROW(semester, verband, gruppe)::text) AS svg_kombis,
+						array_agg(DISTINCT gruppe_kurzbz) AS gruppen_kurzbz,
+						MIN(reservierung_id) AS reservierung_id,
+						MAX(insertamum) AS insertamum,
+						MAX(insertvon) AS insertvon
+					FROM campus.tbl_reservierung
+					WHERE datum >= ? AND datum <= ?
+					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, stunde, veranstaltung_id
+				),
+				numbered AS (
+					SELECT
+						per_stunde.*,
+						stunde - ROW_NUMBER() OVER (PARTITION BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id ORDER BY stunde) AS grp
+					FROM per_stunde
+				),
+				grouped AS (
+					SELECT
+						MIN(reservierung_id) AS reservierung_id,
+						ort_kurzbz, studiengang_kz, datum,
+						MIN(stunde) AS stunde_von,
+						MAX(stunde) AS stunde_bis,
+						titel, beschreibung,
+						array_agg(DISTINCT gruppe_kurzbz_elem) AS gruppen_kurzbz,
+						array_agg(DISTINCT uid_elem) AS uids,
+						array_agg(DISTINCT res_id) AS reservierung_ids,
+						array_agg(DISTINCT svg_elem) AS svg_kombis,
+						veranstaltung_id,
+						MAX(insertamum) AS insertamum,
+						MAX(insertvon) AS insertvon
+					FROM numbered,
+						unnest(uids) AS uid_elem,
+						unnest(reservierung_ids) AS res_id,
+						unnest(gruppen_kurzbz) AS gruppe_kurzbz_elem,
+						unnest(svg_kombis) AS svg_elem
+					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id, grp
+				)
+				SELECT
+					grouped.*,
+					(datum + s_von.beginn) AS von,
+					(datum + s_bis.ende) AS bis
+				FROM grouped
+					JOIN lehre.tbl_stunde s_von ON s_von.stunde = grouped.stunde_von
+					JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = grouped.stunde_bis
+				ORDER BY grouped.reservierung_id DESC";*/
+
+		array_push($params, $von, $bis);
+		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
+
+
+		if (hasData($reservierung_data))
+		{
+			$data = getData($reservierung_data);
+
+			foreach($data as $block)
+			{
+
+				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
+
+				$this->SyncReservierungModel->db->where('reservierung_id IN (' . implode(',', $ids) . ')');
+				$sync_result = $this->SyncReservierungModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'reservierung');
+					if ($kalender_id)
+					{
+						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'reservierung_id');
+
+					if ($block->insertamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateReservierungSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertReservierungSync($fehlende, $kalender_id);
+					}
+				}
+			}
+		}
+	}
+
+
+	private function _insertKalender($block, $typ)
+	{
+		$result = $this->KalenderModel->insert(
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'typ' => $typ,
+				'status_kurzbz'=> 'live',
+				'insertamum' => $block->insertamum,
+				'insertvon' => $block->insertvon,
+				'updateamum' => $block->updateamum ?? null,
+				'updatevon' => $block->updatevon ?? null
+			)
+		);
+		if(!isSuccess($result))
+			return null;
+
+		$kalender_id = getData($result);
+
+		if ($typ === 'lehreinheit')
+		{
+			$this->KalenderLehreinheitModel->insert(
+				array (
+					'kalender_id' => $kalender_id,
+					'lehreinheit_id'=> $block->lehreinheit_id
+				)
+			);
+		}
+		else if ($typ === 'reservierung')
+		{
+			$this->KalenderEventModel->insert(array(
+				'kalender_id' => $kalender_id,
+				'titel' => $block->titel,
+				'beschreibung' => $block->beschreibung
+			));
+
+
+			if ($block->insertvon)
+			{
+				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
+
+				if (hasData($user))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'uid' => getData($user)[0]->uid,
+						'rolle_kurzbz' => 'organisator'
+					));
+				}
+			}
+
+			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
+			foreach ($uids as $uid)
+			{
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'uid' => $uid,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+
+			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
+			if (isError($semester_range)) return $semester_range;
+			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
+
+			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
+
+			foreach ($gruppen as $gruppe_kurzbz)
+			{
+				$gruppe_kurzbz = trim($gruppe_kurzbz);
+				if (!empty($gruppe_kurzbz))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'gruppe_kurzbz' => $gruppe_kurzbz,
+						'studiengang_kz' => $block->studiengang_kz,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'rolle_kurzbz' => 'teilnehmer'
+					));
+				}
+			}
+
+			foreach ($block->svg_kombis as $kombi_str)
+			{
+				$kombi_str = trim($kombi_str, '()');
+				list($sem, $verb, $grp) = explode(',', $kombi_str);
+
+				$sem = trim($sem) === '' ? null : trim($sem);
+				$verb = trim($verb) === '' ? null : trim($verb);
+				$grp = trim($grp) === '' ? null : trim($grp);
+
+				if (is_null($sem) && is_null($verb) && is_null($grp))
+					continue;
+
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'studiengang_kz' => $block->studiengang_kz,
+					'semester' => $sem,
+					'verband' => $verb,
+					'gruppe' => $grp,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+		}
+
+
+		$this->KalenderOrtModel->insert(
+			array (
+				'kalender_id' => $kalender_id,
+				'ort_kurzbz' => $block->ort_kurzbz
+			)
+		);
+
+		return $kalender_id;
+	}
+
+	private function _insertSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->insert(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+	private function _insertReservierungSync($ids, $kalender_id)
+	{
+
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->insert(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateKalender($kalender_id, $block)
+	{
+		$this->KalenderModel->update(
+			array (
+				'kalender_id' => $kalender_id
+			),
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'updateamum'=> $block->updateamum,
+				'updatevon' => $block->updatevon
+			)
+		);
+	}
+
+	private function _updateSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->update(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateReservierungSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->update(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+}

application/core/ICollisionCheck.php

@@ -0,0 +1,10 @@
+<?php
+interface ICollisionCheck
+{
+	public function getName();
+
+	public function check($data);
+
+	public function checkAll($kalender_ids);
+
+}

application/libraries/CollisionChecker.php

@@ -0,0 +1,65 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class CollisionChecker
+{
+	private $_checks = [];
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('collision/checks/RoomCollisionCheck');
+		$this->_ci->load->library('collision/checks/LectureCollisionCheck');
+		$this->_ci->load->library('collision/checks/VerbandCollisionCheck');
+		$this->_ci->load->library('collision/checks/StudentCollisionCheck');
+		$this->register($this->_ci->roomcollisioncheck);
+		$this->register($this->_ci->lecturecollisioncheck);
+		$this->register($this->_ci->verbandcollisioncheck);
+		$this->register($this->_ci->studentcollisioncheck);
+		Events::trigger('collision_register', $this);
+	}
+
+	public function register(ICollisionCheck $check)
+	{
+		$this->_checks[$check->getName()] = $check;
+	}
+
+	public function run($data)
+	{
+		$errors = [];
+
+		foreach ($this->_checks as $check)
+		{
+			$result = $check->check($data);
+
+			if (!empty($result))
+			{
+				$errors[] = $result;
+			}
+		}
+
+		return $errors;
+	}
+
+	public function runAll($kalender_ids)
+	{
+		$results = array_fill_keys($kalender_ids, []);
+
+		foreach ($this->_checks as $check)
+		{
+			$batchResult = $check->checkAll($kalender_ids);
+			foreach ($batchResult as $kalender_id => $errors)
+			{
+				$results[$kalender_id] = array_merge($results[$kalender_id], $errors);
+			}
+		}
+
+		return $results;
+	}
+}

application/libraries/KalenderNotificationLib.php

@@ -0,0 +1,170 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class KalenderNotificationLib
+{
+	private $_ci;
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->library('MailLib');
+		$this->_ci->load->config('tempus');
+
+	}
+
+	public function sendMails($mail_infos)
+	{
+		if (!$this->_ci->config->item('send_update_mails'))
+			return true;
+
+		$lektor_added = array();
+		$lektor_changed = array();
+		$lektor_deleted = array();
+
+		$student_added = array();
+		$student_changed = array();
+		$student_deleted = array();
+
+		foreach ($mail_infos as $info)
+		{
+			$entry = $info['entry'];
+			$new_status = $info['new_status'];
+			$notify = $info['notify'];
+
+			$old_entry = null;
+			if ($entry->vorgaenger_kalender_id)
+			{
+				$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
+				$vorgaenger = $this->_ci->KalenderModel->load(array('tbl_kalender.kalender_id' => $entry->vorgaenger_kalender_id));
+				if (hasData($vorgaenger))
+					$old_entry = getData($vorgaenger)[0];
+			}
+
+			if ($new_status === 'deleted')
+				$row = $this->_buildMailDeleted($entry);
+			else if ($old_entry)
+				$row = $this->_buildMailChanged($old_entry, $entry);
+			else
+				$row = $this->_buildMailNew($entry);
+
+			if (in_array('lektor', $notify))
+			{
+				if ($new_status === 'deleted')
+					$lektor_deleted[] = $row;
+				else if ($old_entry)
+					$lektor_changed[] = $row;
+				else
+					$lektor_added[] = $row;
+			}
+
+			if (in_array('student', $notify))
+			{
+				if ($new_status === 'deleted')
+					$student_deleted[] = $row;
+				else if ($old_entry)
+					$student_changed[] = $row;
+				else
+					$student_added[] = $row;
+			}
+		}
+
+		$lektor_entries = '';
+		$student_entries = '';
+
+		if (!empty($lektor_added))
+			$lektor_entries .= $this->_addToList($lektor_added, 'hinzugefügt') . '<hr/>';
+
+		if (!empty($lektor_changed))
+			$lektor_entries .= $this->_addToList($lektor_changed, 'geändert') . '<hr/>';
+
+		if (!empty($lektor_deleted))
+			$lektor_entries .= $this->_addToList($lektor_deleted, 'gelöscht') . '<hr/>';
+
+		if (!empty($student_added))
+			$student_entries .= $this->_addToList($student_added, 'hinzugefügt') . '<hr/>';
+
+		if (!empty($student_changed))
+			$student_entries .= $this->_addToList($student_changed, 'geändert') . '<hr/>';
+
+		if (!empty($student_deleted))
+			$student_entries .= $this->_addToList($student_deleted, 'gelöscht') . '<hr/>';
+
+		if (!empty($lektor_entries))
+			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Lektor Tempus Update', $lektor_entries);
+		if (!empty($student_entries))
+			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Student Tempus Update', $student_entries);
+	}
+
+	private function _addToList($entries, $status)
+	{
+		return 'Folgende Einträge wurden <b>'. $status .'</b>: <ul>' . implode('', $entries) . '</ul>';
+
+	}
+	private function _buildMailNew($entry)
+	{
+		$von = date('d.m.Y H:i', strtotime($entry->von));
+		$bis = date('H:i', strtotime($entry->bis));
+
+		return '<li>
+					<b>Kalender ID ' . ($entry->kalender_id ?? '-') . '</b>
+					<ul>
+						<li><b>Uhrzeit:</b> ' . $von . ' - ' . $bis . '</li>
+						<li><b>Ort:</b> ' . ($entry->ort_kurzbz ?? '-') . '</li>
+					</ul>
+				</li>';
+	}
+
+	private function _buildMailChanged($old_entry, $new_entry)
+	{
+		$old_von = date('d.m.Y H:i', strtotime($old_entry->von));
+		$old_bis = date('H:i', strtotime($old_entry->bis));
+		$new_von = date('d.m.Y H:i', strtotime($new_entry->von));
+		$new_bis = date('H:i', strtotime($new_entry->bis));
+
+		$old_ort = $old_entry->ort_kurzbz ?? '-';
+		$new_ort = $new_entry->ort_kurzbz ?? '-';
+
+		$uhrzeit_changed = ($old_von . $old_bis) !== ($new_von . $new_bis);
+		$ort_changed = $old_ort !== $new_ort;
+
+		$changes = '';
+
+		if ($uhrzeit_changed)
+		{
+			$changes .= '<li>
+							<b>Uhrzeit:</b>
+							<s style="color:red;">' . $old_von . ' - ' . $old_bis . '</s>
+							<span style="color:green;">' . $new_von . ' - ' . $new_bis . '</span>
+						</li>';
+		}
+
+		if ($ort_changed)
+		{
+			$changes .= '<li>
+				<b>Ort:</b>
+				<s style="color:red;">' . $old_ort . '</s>
+				<span style="color:green;">' . $new_ort . '</span>
+			</li>';
+		}
+
+		return '<li>
+					<b>Kalender ID ' . ($new_entry->kalender_id ?? '-') . '</b>
+					<ul>' . $changes . '</ul>
+				</li>';
+	}
+
+	private function _buildMailDeleted($entry)
+	{
+		$von = date('d.m.Y H:i', strtotime($entry->von));
+		$bis = date('H:i', strtotime($entry->bis));
+
+		return '<li style="color:red;">
+					<b><s>Kalender ID ' . ($entry->kalender_id ?? '-') . '</s></b>
+					<ul>
+						<li><s>' . $von . ' - ' . $bis . '</s></li>
+						<li><s>' . ($entry->ort_kurzbz ?? '-') . '</s></li>
+					</ul>
+				</li>';
+	}
+}

application/libraries/PermissionLib.php

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

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -0,0 +1,234 @@
+<?php
+
+class LectureCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->model('ressource/zeitsperre_model', 'ZeitsperreModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+
+	}
+
+	public function getName()
+	{
+		return 'lecture';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$uids = $this->_getUids($data->kalender_id);
+
+		if (empty($uids)) return [];
+
+		$collisions = [];
+
+		$collisions = array_merge($collisions, $this->_checkLehreinheit($uids, $data));
+		$collisions = array_merge($collisions, $this->_checkReservierung($uids, $data));
+		$collisions = array_merge($collisions, $this->_checkZeitsperre($uids, $data));
+
+		return $collisions;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+		$grouped = [];
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter other_lehreinheithreinheit_ma', 'other_lehreinheithreinheit_ma.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit other_lehreinheit', 'other_lehreinheit.lehreinheit_id = other_lehreinheithreinheit_ma.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit other_kalender_le', 'other_kalender_le.lehreinheit_id = other_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_kalender_le.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where(
+			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->load();
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer other_t', 'other_t.uid = current_lehreinheit_ma.mitarbeiter_uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event other_e', 'other_e.kalender_id = other_t.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_e.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where(
+			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->load();
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('campus.tbl_zeitsperre z',
+			"z.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid 
+			AND z.zeitsperretyp_kurzbz != 'ZVerfueg'");
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = z.vonstunde', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = z.bisstunde', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where('(z.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('(z.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$result = $this->_ci->KalenderModel->load();
+
+
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+
+		return $grouped;
+	}
+
+	private function _getUids($kalender_id)
+	{
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
+		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->group_start();
+			$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
+			$this->_ci->KalenderModel->db->or_where('mitarbeiter_uid IS NULL', null, false);
+		$this->_ci->KalenderModel->db->group_end();
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'tbl_kalender.kalender_id' => $kalender_id
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$data = getData($result);
+		$mitarbeiter_uids = array_filter(array_column($data, 'mitarbeiter_uid'));
+		$event_teilnehmer = array_filter(array_column($data, 'uid'));
+
+		return array_unique(array_merge($mitarbeiter_uids, $event_teilnehmer));
+	}
+
+	private function _checkLehreinheit($uids, $data)
+	{
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where_in('mitarbeiter_uid', $uids);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
+		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where(
+			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	private function _checkReservierung($uids, $data)
+	{
+		if ($this->_ci->variablelib->getVar('ignore_reservierung') === 'true') return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+
+		$this->_ci->KalenderModel->addDistinct('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addSelect('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender_event_teilnehmer.uid', $uids);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
+		$this->_ci->KalenderModel->db->where_not_in('uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where(
+			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	private function _checkZeitsperre($uids, $data)
+	{
+		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
+
+		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum, vonstunde_z.beginn as von_beginn, bisdatum, bisstunde_z.ende as bis_ende');
+		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = tbl_zeitsperre.vonstunde', 'LEFT');
+		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = tbl_zeitsperre.bisstunde', 'LEFT');
+		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
+		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp <', $data->bis);
+		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $data->von);
+
+		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
+		$result = $this->_ci->ZeitsperreModel->load();
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->vondatum . ' ' . $row->von_beginn)) . ' - ' . date('d.m.Y H:i', strtotime($row->bisdatum . ' ' . $row->bis_ende)) . ')';		}, getData($result));
+	}
+
+}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -0,0 +1,75 @@
+<?php
+
+class RoomCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+	}
+
+	public function getName()
+	{
+		return 'room';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$this->_ci->KalenderModel->addSelect('kalender_id, ort_kurzbz, von, bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'kalender_id');
+
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+			'ort_kurzbz' => $data->ort_kurzbz,
+		));
+
+		if (isError($result)) return [];
+		if (!hasData($result)) return [];
+
+		return array_map(function($row)
+		{
+			return $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort current_ort', 'current_ort.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort other_ort', 'other_ort.ort_kurzbz = current_ort.ort_kurzbz');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_ort.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
+
+		$result = $this->_ci->KalenderModel->load();
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -0,0 +1,238 @@
+<?php
+
+class StudentCollisionCheck implements ICollisionCheck
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+	}
+
+	public function getName()
+	{
+		return 'student';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+		$placeholders = implode(',', array_fill(0, count($kollisionsfreie_user), '?'));
+
+
+		$dbModel = new DB_Model();
+
+		$qry1 = "
+			SELECT DISTINCT tbl_benutzergruppe.uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe
+				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
+				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+
+			WHERE tbl_kalender.kalender_id = ?
+				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
+			UNION ALL
+
+			SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband
+				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
+				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
+			WHERE tbl_kalender.kalender_id = ?
+				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
+
+		";
+
+		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
+			[$data->kalender_id],
+			$kollisionsfreie_user,
+			[$data->kalender_id],
+			$kollisionsfreie_user
+		));
+
+		if (isError($result1) || !hasData($result1)) return [];
+
+		$curUids = array_flip(array_column(getData($result1), 'uid'));
+
+		$qry2 = "
+			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_benutzergruppe.uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe
+				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
+				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+			WHERE tbl_kalender.von < ?
+				AND tbl_kalender.bis > ?
+				AND tbl_kalender.kalender_id != ?
+				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
+				)
+
+			UNION ALL
+			
+			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband
+				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
+				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
+			WHERE tbl_kalender.von < ?
+				AND tbl_kalender.bis > ?
+				AND tbl_kalender.kalender_id != ?
+				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
+				)
+		";
+
+		$result2 = $dbModel->execReadOnlyQuery($qry2, array_merge(
+			[$data->bis, $data->von, $data->kalender_id],
+			$kollisionsfreie_user,
+			[$data->bis, $data->von, $data->kalender_id],
+			$kollisionsfreie_user
+		));
+
+		if (isError($result2) || !hasData($result2)) return [];
+
+		$conflicts = [];
+		foreach (getData($result2) as $row) {
+			if (isset($curUids[$row->uid])) {
+				$conflicts[] = $this->_ci->phraseslib->t('ui', 'student_kollision')
+					. ': ' . $row->uid
+					. ' (' . date('d.m.Y H:i', strtotime($row->von))
+					. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		return $conflicts;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+
+		if (empty($kalender_ids)) return [];
+
+		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
+
+		$dbModel = new DB_Model();
+		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
+
+		$sql = "
+			SELECT DISTINCT current_kalender.kalender_id, current_benutzergruppe.uid
+			FROM lehre.tbl_kalender current_kalender
+			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe current_gruppe
+				ON current_gruppe.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
+				AND current_gruppe.semester = current_lehreinheitgruppe.semester
+				AND current_gruppe.gruppe_kurzbz = current_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe current_benutzergruppe ON current_benutzergruppe.gruppe_kurzbz = current_gruppe.gruppe_kurzbz
+					AND current_benutzergruppe.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
+				)
+			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe other_gruppe
+				ON other_gruppe.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
+				AND other_gruppe.semester = other_lehreinheitgruppe.semester
+				AND other_gruppe.gruppe_kurzbz = other_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe other_benutzergruppe
+				ON other_benutzergruppe.gruppe_kurzbz = other_gruppe.gruppe_kurzbz
+				AND other_benutzergruppe.uid = current_benutzergruppe.uid
+				AND other_benutzergruppe.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
+
+
+			WHERE current_kalender.kalender_id IN ($placeholders)
+
+			UNION ALL
+
+			SELECT DISTINCT current_kalender.kalender_id, current_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender current_kalender
+			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband current_studentlehrverband
+				ON current_studentlehrverband.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
+				AND current_studentlehrverband.semester = current_lehreinheitgruppe.semester
+				AND current_studentlehrverband.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
+				AND (current_lehreinheitgruppe.verband = current_studentlehrverband.verband OR current_lehreinheitgruppe.verband IS NULL OR btrim(current_lehreinheitgruppe.verband::text) = '' OR current_studentlehrverband.verband IS NULL)
+				AND (current_lehreinheitgruppe.gruppe = current_studentlehrverband.gruppe OR current_lehreinheitgruppe.gruppe IS NULL OR btrim(current_lehreinheitgruppe.gruppe::text) = '' OR current_studentlehrverband.gruppe IS NULL)
+
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
+				)
+			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband other_slv
+				ON other_slv.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
+				AND other_slv.semester = other_lehreinheitgruppe.semester
+				AND other_slv.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
+				AND other_slv.student_uid = current_studentlehrverband.student_uid
+				AND (other_lehreinheitgruppe.verband = other_slv.verband OR other_lehreinheitgruppe.verband IS NULL OR btrim(other_lehreinheitgruppe.verband::text) = '' OR other_slv.verband IS NULL)
+				AND (other_lehreinheitgruppe.gruppe = other_slv.gruppe OR other_lehreinheitgruppe.gruppe IS NULL OR btrim(other_lehreinheitgruppe.gruppe::text) = '' OR other_slv.gruppe IS NULL)
+
+			WHERE current_kalender.kalender_id IN ($placeholders)
+		";
+
+		$result = $dbModel->execReadOnlyQuery($sql, array_merge($kalender_ids, $kalender_ids));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -0,0 +1,350 @@
+<?php
+
+class VerbandCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+
+	}
+
+	public function getName()
+	{
+		return 'verband';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$kollision_student = $this->_ci->variablelib->getVar('kollision_student') === 'false';
+		$kollision_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung') === 'false';
+
+		if (!$kollision_student && !$kollision_reservierung) return [];
+
+		$dbModel = new DB_Model();
+		$collisions = [];
+
+		if ($kollision_student)
+		{
+			$union_event = "";
+
+			if ($kollision_reservierung)
+			{
+				$union_event = "
+					UNION
+					SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe, tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+					FROM lehre.tbl_kalender_event_teilnehmer
+					WHERE tbl_kalender_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+				";
+			}
+
+			$sql_gruppen = "
+				SELECT
+					other_kalender.von,
+					other_kalender.bis,
+					COALESCE(
+						other_lehreinheitguppe.gruppe_kurzbz,
+						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_lehreinheitguppe.semester ||
+						COALESCE(other_lehreinheitguppe.verband::text, '') ||
+						COALESCE(other_lehreinheitguppe.gruppe::text, '')
+					) AS gruppenname
+				FROM lehre.tbl_kalender current_kalender
+
+				JOIN (
+					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+					FROM lehre.tbl_kalender_lehreinheit
+					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+					". $union_event ."
+				) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
+
+				LEFT JOIN public.tbl_gruppe current_gruppe
+					ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
+
+				JOIN lehre.tbl_kalender other_kalender
+					ON other_kalender.kalender_id != current_kalender.kalender_id
+					AND other_kalender.von < ?
+					AND other_kalender.bis > ?
+
+				JOIN (
+					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+					FROM lehre.tbl_kalender_lehreinheit
+					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+					". $union_event ."
+				) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
+
+				LEFT JOIN public.tbl_gruppe other_gruppe
+					ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
+
+				LEFT JOIN public.tbl_studiengang stg
+					ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+
+				WHERE current_kalender.kalender_id = ?
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+				AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
+				AND (
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND (
+							current_lehreinheitguppe.verband IS NULL
+							OR (
+								current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
+								AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
+							)
+						)
+					)
+					OR
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						(
+							current_lehreinheitguppe.gruppe_kurzbz IS NULL
+							AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+							AND other_gruppe.direktinskription IS NOT TRUE
+						)
+						OR
+						(
+							current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+							AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+							AND current_gruppe.direktinskription IS NOT TRUE
+						)
+					)
+				)
+				AND other_kalender.kalender_id NOT IN (
+					SELECT vorgaenger_kalender_id
+					FROM lehre.tbl_kalender
+					WHERE vorgaenger_kalender_id IS NOT NULL
+				)
+			";
+
+			$result = $dbModel->execReadOnlyQuery($sql_gruppen, [
+				$data->bis,
+				$data->von,
+				$data->kalender_id,
+			]);
+
+			if (!isError($result) && hasData($result))
+			{
+				foreach (getData($result) as $row)
+					$collisions[] = $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		if ($kollision_reservierung && !$kollision_student)
+		{
+			$sql_reservierung = "
+				SELECT
+					other_kalender.von,
+					other_kalender.bis,
+					COALESCE(
+						other_event_teilnehmer.gruppe_kurzbz,
+						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_event_teilnehmer.semester ||
+						COALESCE(other_event_teilnehmer.verband::text, '') ||
+						COALESCE(other_event_teilnehmer.gruppe::text, '')
+					) AS gruppenname
+				FROM lehre.tbl_kalender_event_teilnehmer current_event_teilnehmer
+				LEFT JOIN public.tbl_gruppe current_gruppe
+					ON current_gruppe.gruppe_kurzbz = current_event_teilnehmer.gruppe_kurzbz
+
+				JOIN lehre.tbl_kalender other_kalender
+					ON other_kalender.kalender_id != ?
+					AND other_kalender.von < ?
+					AND other_kalender.bis > ?
+
+				JOIN lehre.tbl_kalender_event_teilnehmer other_event_teilnehmer
+					ON other_event_teilnehmer.kalender_id = other_kalender.kalender_id
+					AND other_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+
+				LEFT JOIN public.tbl_gruppe other_gruppe
+					ON other_gruppe.gruppe_kurzbz = other_event_teilnehmer.gruppe_kurzbz
+
+				LEFT JOIN public.tbl_studiengang stg
+					ON stg.studiengang_kz = other_event_teilnehmer.studiengang_kz
+
+				WHERE current_event_teilnehmer.kalender_id = ?
+				AND current_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND current_event_teilnehmer.studiengang_kz = other_event_teilnehmer.studiengang_kz
+				AND current_event_teilnehmer.semester = other_event_teilnehmer.semester
+				AND (
+					(
+						current_event_teilnehmer.gruppe_kurzbz IS NULL
+						AND other_event_teilnehmer.gruppe_kurzbz IS NULL
+						AND (
+							current_event_teilnehmer.verband IS NULL
+							OR (
+								current_event_teilnehmer.verband = other_event_teilnehmer.verband
+								AND (current_event_teilnehmer.gruppe IS NULL OR other_event_teilnehmer.gruppe IS NULL OR current_event_teilnehmer.gruppe = other_event_teilnehmer.gruppe)
+							)
+						)
+					)
+					OR
+					(
+						current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+						AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						(
+							current_event_teilnehmer.gruppe_kurzbz IS NULL
+							AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+							AND other_gruppe.direktinskription IS NOT TRUE
+						)
+						OR
+						(
+							current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+							AND other_event_teilnehmer.gruppe_kurzbz IS NULL
+							AND current_gruppe.direktinskription IS NOT TRUE
+						)
+					)
+				)
+				AND other_kalender.kalender_id NOT IN (
+					SELECT vorgaenger_kalender_id
+					FROM lehre.tbl_kalender
+					WHERE vorgaenger_kalender_id IS NOT NULL
+				)
+			";
+
+			$result = $dbModel->execReadOnlyQuery($sql_reservierung, [
+				$data->kalender_id,
+				$data->bis,
+				$data->von,
+				$data->kalender_id,
+			]);
+
+			if (!isError($result) && hasData($result))
+			{
+				foreach (getData($result) as $row)
+					$collisions[] = $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		return $collisions;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$dbModel = new DB_Model();
+
+		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
+
+		$sql = "
+			SELECT DISTINCT ON (current_kalender.kalender_id) current_kalender.kalender_id
+			FROM lehre.tbl_kalender current_kalender
+	
+			JOIN (
+				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+				FROM lehre.tbl_kalender_lehreinheit
+				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				UNION
+				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
+					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+				FROM lehre.tbl_kalender_event_teilnehmer
+			) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
+	
+			LEFT JOIN public.tbl_gruppe current_gruppe
+				ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
+	
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+	
+			JOIN (
+				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+				FROM lehre.tbl_kalender_lehreinheit
+				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				UNION
+				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
+					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+				FROM lehre.tbl_kalender_event_teilnehmer
+			) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
+	
+			LEFT JOIN public.tbl_gruppe other_gruppe
+				ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
+	
+			WHERE current_kalender.kalender_id IN ({$placeholders})
+			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+			AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+			AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
+			AND (
+				(
+					current_lehreinheitguppe.gruppe_kurzbz IS NULL
+					AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+					AND (
+						current_lehreinheitguppe.verband IS NULL
+						OR (
+							current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
+							AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
+						)
+					)
+				)
+				OR
+				(
+					current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+					AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+					AND current_gruppe.direktinskription IS NOT TRUE
+					AND other_gruppe.direktinskription IS NOT TRUE
+				)
+				OR
+				(
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+					)
+				)
+			)
+			AND other_kalender.kalender_id NOT IN (
+				SELECT vorgaenger_kalender_id
+				FROM lehre.tbl_kalender
+				WHERE vorgaenger_kalender_id IS NOT NULL
+			)
+			
+		";
+
+		$result = $dbModel->execReadOnlyQuery($sql, $kalender_ids);
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+
+}

application/libraries/dashboard/DashboardLib.php

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

application/models/dashboard/Dashboard_Preset_model.php

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

application/models/organisation/Gruppe_model.php

@@ -11,4 +11,26 @@ class Gruppe_model extends DB_Model
 		$this->dbTable = 'public.tbl_gruppe';
 		$this->pk = 'gruppe_kurzbz';
 	}
+
+	public function search($query_words)
+	{
+		$this->addSelect('gruppe_kurzbz,
+											studiengang_kz,
+											semester,
+											bezeichnung,
+											gid,
+											\'false\' as lehrverband');
+		$this->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->db->group_start();
+			$this->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->db->group_end();
+		}
+		$this->db->group_end();
+
+		return $this->load();
+	}
 }

application/models/organisation/Lehrverband_model.php

@@ -41,4 +41,29 @@ class Lehrverband_model extends DB_Model
 
 		return $result;
 	}
+
+	public function search($query_words)
+	{
+		$this->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
+												studiengang_kz,
+												semester,
+												tbl_lehrverband.bezeichnung,
+												gid,
+												\'true\' as lehrverband');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->addOrder('verband');
+		$this->addOrder('gruppe');
+		$this->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->db->group_start();
+			$this->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->db->group_end();
+		}
+		$this->db->group_end();
+		return $this->load();
+	}
 }

application/models/ressource/Kalender_Event_Rolle_model.php

@@ -0,0 +1,15 @@
+<?php
+class Kalender_Event_Rolle_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_event_rolle';
+		$this->pk = array('rolle_kurzbz');
+		$this->hasSequence = false;
+	}
+}

application/models/ressource/Kalender_Event_Teilnehmer_model.php

@@ -0,0 +1,16 @@
+<?php
+class
+Kalender_Event_Teilnehmer_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_event_teilnehmer';
+		$this->pk = array('kalender_event_teilnehmer_id');
+		$this->hasSequence = false;
+	}
+}

application/models/ressource/Kalender_Event_model.php

@@ -0,0 +1,15 @@
+<?php
+class Kalender_Event_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_event';
+		$this->pk = array('kalender_id');
+		$this->hasSequence = false;
+	}
+}

application/models/ressource/Kalender_Lehreinheit_model.php

@@ -0,0 +1,15 @@
+<?php
+class Kalender_Lehreinheit_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_lehreinheit';
+		$this->pk = array('kalender_id','lehreinheit_id');
+		$this->hasSequence = false;
+	}
+}

application/models/ressource/Kalender_Ort_model.php

@@ -0,0 +1,14 @@
+<?php
+class Kalender_Ort_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_ort';
+		$this->pk = 'kalender_ort_id';
+	}
+}

application/models/ressource/Kalender_model.php

@@ -0,0 +1,14 @@
+<?php
+class Kalender_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender';
+		$this->pk = 'kalender_id';
+	}
+}

application/models/ressource/Kalenderstatus_model.php

@@ -0,0 +1,14 @@
+<?php
+class Kalenderstatus_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_kalender_status';
+		$this->pk = 'status_kurzbz';
+	}
+}

application/models/ressource/Reservierung_Kalender_model.php

@@ -0,0 +1,14 @@
+<?php
+class Reservierung_Kalender_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'sync.tbl_reservierung_kalender';
+		$this->pk = 'reservierung_kalender_id';
+	}
+}

application/models/ressource/Stundenplandev_Kalender_model.php

@@ -0,0 +1,14 @@
+<?php
+class Stundenplandev_Kalender_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'sync.tbl_stundenplandev_kalender';
+		$this->pk = 'stundenplandev_kalender_id';
+	}
+}

application/views/Tempus.php

@@ -0,0 +1,50 @@
+<?php
+	$includesArray = array(
+		'title' => 'Tempus',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		'tabulator5' => true,
+		'vuedatepicker11' => true,
+		'phrases' => array(
+			'global',
+			'ui',
+			'notiz',
+		),
+		'customCSSs' => [
+			'public/css/components/vue-datepicker.css',
+			'public/css/components/primevue.css',
+			'public/css/components/calendar.css',
+			'public/css/Tempus.css',
+			'public/css/Studentenverwaltung.css',
+			'public/css/components/function.css'
+		],
+		'customJSs' => [
+			#'vendor/npm-asset/primevue/tree/tree.min.js',
+			#'vendor/npm-asset/primevue/toast/toast.min.js'
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => [
+			'public/js/apps/Tempus.js'
+		]
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+	<div id="main">
+		<router-view
+			default-semester="<?= $variables['semester_aktuell']; ?>"
+			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
+			tempus-root="<?= site_url('Tempus'); ?>"
+			cis-root="<?= CIS_ROOT; ?>"
+			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
+			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
+			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+			:config="<?=  htmlspecialchars(json_encode($variables)); ?>"
+			>
+		</router-view>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/dashboard/admin.php

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

application/views/dashboard/preview.php

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

content/student/studentdetailoverlay.xul.php

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

content/student/studentoverlay.js.php

@@ -3550,9 +3550,11 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
+		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
+		case 'microcredential_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/lehreinheitmitarbeiter.class.php

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

include/prestudent.class.php

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

public/css/Cis4/CoreCalendarEvents.css

@@ -97,3 +97,15 @@
 	display: none;
 }
 
+.weekPageContainer .calendar-event-collisions
+{
+	display: grid;
+	grid-template-columns: auto 1fr;
+	background: repeating-linear-gradient(
+			135deg,
+			transparent,
+			transparent 16px,
+			rgba(0, 0, 0, 0.3) 16px,
+			rgba(0, 0, 0, 0.3) 32px
+	);
+}

public/css/Tempus.css

@@ -0,0 +1,187 @@
+@import './Fhc.css';
+@import './components/searchbar/searchbar.css';
+@import './components/verticalsplit.css';
+@import './components/FilterComponent.css';
+@import './components/Tabs.css';
+@import './components/Notiz.css';
+
+html {
+  font-size: .875em;
+  height: 100%;
+}
+
+body {
+	/*display: flex;*/
+	 height: 100%;
+}
+.heightfull {
+		 height: 95%;
+}
+.navbar-dark .navbar-brand:focus {
+	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
+	z-index: 3;
+}
+#main {
+	height: 100%;
+}
+.tempus {
+	height: 100%;
+}
+.searchbar {
+	margin-right: 0!important;
+}
+.searchbar > .input-group {
+	margin-right: 0!important;
+}
+.searchbar > .input-group > * {
+	border-radius: 0!important;
+}
+
+#sidebarMenu {
+	width: 0%;
+}
+
+.tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
+	color: var(--gray-400);
+}
+.tabulator-row.disabled.tabulator-row-even .tabulator-cell {
+	color: var(--gray-500);
+}
+
+/* Dropdown Toolbar Interessent, submenu */
+.dropend .dropdown-toggle.d-flex::after {
+	height: 0;
+}
+
+@media (min-width: 768px) {
+	#sidebarMenu {
+		visibility: visible!important;
+		transform: none;
+		position: inherit;
+		z-index: 1;
+	}
+}
+
+.toast.toast-success {
+	color: #0f5132;
+	background-color: #d1e7dd!important;
+	border-color: #badbcc!important;
+}
+.toast.toast-danger {
+	color: #842029;
+	background-color: #f8d7da!important;
+	border-color: #f5c2c7!important;
+}
+
+.has-filter .fa-filter {
+	color: var(--bs-success);
+}
+
+
+
+
+#parkingslot {
+	border: 1px dashed;
+	min-height: 5vh;
+	max-height: 15vh;
+	color: #AAAAAA;
+	text-align: center;
+	font-size: large;
+	margin-top: 1.25rem;
+	overflow-y: auto;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: wrap;
+}
+
+.course-picker {
+	border: 1px dashed #AAAAAA;
+	display: flex;
+	flex-direction: column;
+	flex: 1 1 0;
+	min-height: 0;
+}
+
+.course-picker-row {
+	padding: 0.5rem;
+	margin-bottom: 0.5rem;
+	border: 1px solid var(--bs-border-color);
+	background-color: var(--event-bg);
+}
+
+.parkingevent {
+	border: 1px dashed !important;
+	border-color: #AAAAAA;
+	padding: 0.5rem;
+	margin-bottom: 0.5rem;
+	margin-left: 0.5rem;
+	margin-right: 0.5rem;
+}
+
+:root{
+	--fhc-calendar-pane-height: calc(100vh - 120px);
+}
+
+.eckerltest {
+		box-shadow: 3px 3px 3px #ccc;
+}
+
+.verband-selection {
+	border: 1px dashed #AAAAAA;
+	margin-bottom: 0.5rem;
+	max-height: 450px;
+	overflow-y: auto;
+	display: flex;
+	flex-direction: column;
+}
+
+.lecture-selection {
+	border: 1px dashed #AAAAAA;
+	margin-bottom: 0.5rem;
+	max-height: 20vh;
+	overflow-y: auto;
+	display: flex;
+	flex-direction: column;
+}
+
+.room-selection {
+	border: 1px dashed #AAAAAA;
+	margin-bottom: 0.5rem;
+	padding: 0.5rem 0 0.5rem 0.5rem;
+}
+
+.btn-link.text-danger {
+	text-decoration: none;
+	font-weight: 600;
+}
+
+.btn-link.text-danger:hover {
+	color: #dc3545;
+	transform: scale(1.1);
+}
+
+
+
+.bg-lecturer-wish {
+	opacity: .15;
+}
+.bg-lecturer-block {
+	background: rgba(255, 0, 0, 0.15);
+}
+
+
+.wish-w--2 {
+	background-color: #FF2200;
+}
+.wish-w--1 {
+	background-color: #FF9922;
+}
+.wish-w-1 {
+	background-color: #CCFFCC;
+}
+.wish-w-2 {
+	background-color: #48FA66;
+}
+
+

public/css/components/calendar/events.css

@@ -2,6 +2,10 @@
 	cursor: pointer;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
+.event--parked {
+	opacity: 0.45 !important;
+}
+
 .fhc-calendar-mode-day .fhc-calendar-base-grid-line,
 .fhc-calendar-mode-week .fhc-calendar-base-grid-line {
 	padding: 0 var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
@@ -69,3 +73,36 @@
 .fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
 }
+
+.fhc-resize-bar {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 15px;
+	flex: 0 0 12px;
+	cursor: ns-resize;
+	position: relative;
+	visibility: hidden;
+	pointer-events: none;
+	background-color: transparent !important;
+	border: none !important;
+}
+
+.fhc-resize-bar--top {
+	margin-bottom: -16px;
+}
+.fhc-resize-bar--bottom {
+	margin-top: -16px;
+}
+
+.fhc-calendar-base-grid-line-event:hover > .fhc-resize-bar {
+	visibility: visible;
+	pointer-events: auto;
+}
+.fhc-calendar-base-grid-line-event.event:hover {
+	z-index: 50;
+}
+.fhc-resize-bar {
+	z-index: 2;
+}
+

public/css/components/dashboard/news.css

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

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

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

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

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

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

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

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

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

public/js/api/factory/renderers.js

@@ -9,4 +9,12 @@ export default {
 			}
 		};
 	},
+	loadTempusRenderers() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/RendererLoader/GetTempusRenderers',
+			params: {
+			}
+		};
+	},
 }

public/js/api/factory/tempus/config.js

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

public/js/api/factory/tempus/coursepicker.js

@@ -0,0 +1,17 @@
+export default {
+	search(query) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/coursepicker/search',
+			params: { query }
+		};
+	},
+	getByStg(stg, studiensemester_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/coursepicker/getByStg',
+			params: { stg, studiensemester_kurzbz }
+		};
+	},
+
+};

public/js/api/factory/tempus/kalender.js

@@ -0,0 +1,108 @@
+
+export default {
+	getPlan(filter, start_date, end_date)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getPlan',
+			params: { ...filter, start_date, end_date }
+		};
+	},
+	getPlanLecturer(start_date, end_date)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getPlanLecturer',
+			params: { start_date, end_date }
+		};
+	},
+	getPlanStudent(start_date, end_date)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getPlanStudent',
+			params: { start_date, end_date }
+		};
+	},
+
+	syncToLecturer(kalender_id)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/syncToLecturer',
+			params: { kalender_id }
+		};
+	},
+	syncToStudent(kalender_id)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/syncToStudent',
+			params: { kalender_id }
+		};
+	},
+	sync()
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/sync',
+		};
+	},
+	getLektorZeitsperren(emp, start_date, end_date) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getZeitsperren',
+			params: { emp, start_date, end_date }
+		};
+	},
+	getLektorZeitwuensche(emp, start_date, end_date) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getZeitwuensche',
+			params: { emp, start_date, end_date }
+		};
+	},
+	getStunden() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getStunden',
+		};
+	},
+	updateKalenderEvent(kalender_id, updatedInfos) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/updateKalenderEvent',
+			params: { kalender_id, updatedInfos}
+		};
+	},
+	addKalenderEvent(lehreinheit_id, ort_kurzbz, start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/addKalenderEvent',
+			params: { lehreinheit_id, ort_kurzbz, start_date, end_date}
+		};
+	},
+	getRaumvorschlag(start_date, end_date, lehreinheit_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getRaumvorschlag',
+			params: { start_date, end_date, lehreinheit_id}
+		};
+	},
+
+	getHistory(kalender_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getHistory',
+			params: { kalender_id }
+		};
+	},
+	deleteEntry(kalender_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/deleteEntry',
+			params: { kalender_id }
+		};
+	},
+
+};

public/js/api/factory/tempus/reservierung.js

@@ -0,0 +1,59 @@
+/**
+ * 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 {
+	getInformation() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Reservierung/getInformation',
+		};
+	},
+	searchTeilnehmer(query)
+	{
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/tempus/Reservierung/getLektor?query=${encodeURIComponent(query)}`
+		};
+	},
+	searchGroup(query)
+	{
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/tempus/Reservierung/searchGroup?query=${encodeURIComponent(query)}`
+		};
+	},
+	getGruppen(query) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/tempus/Reservierung/getGruppen?query=${encodeURIComponent(query)}`
+		};
+	},
+	getRollen() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Reservierung/getRollen',
+		};
+	},
+	addReservierung(titel, beschreibung, ort_kurzbz, start_date, end_date, teilnehmer, specialFinalGroups, specialGroups, groups) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Reservierung/addReservierung',
+			params: { titel, beschreibung, ort_kurzbz, start_date, end_date, teilnehmer, specialFinalGroups, specialGroups, groups}
+		};
+	},
+
+};

public/js/apps/Dashboard/Admin.js

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

public/js/apps/Dashboard/Preview.js

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

public/js/apps/Tempus.js

@@ -0,0 +1,45 @@
+/**
+ * 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/>.
+ */
+
+import FhcTempus from "../components/Tempus/Tempus.js";
+
+import Phrasen from "../plugins/Phrasen.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: [
+		{ path: `/${ciPath}/Tempus`, component: FhcTempus },
+	]
+});
+
+const app = Vue.createApp();
+
+app.config.globalProperties.$capitalize = capitalize;
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.directive('tooltip', primevue.tooltip)
+	.mount('#main');

public/js/components/Bootstrap/Confirm.js

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

public/js/components/Calendar/Base.js

@@ -1,23 +1,31 @@
-import BaseDraganddrop from './Base/DragAndDrop.js';
 import BaseHeader from './Base/Header.js';
 import BaseSlider from './Base/Slider.js';
 import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
+import DragClick from '../../directives/dragClick.js';
+import Draggable from '../../directives/draggable.js';
+import Drop from '../../directives/drop.js';
 
 export default {
 	name: "CalendarBase",
 	components: {
-		BaseDraganddrop,
 		BaseHeader,
 		BaseSlider,
 		BsModal
 	},
 	directives: {
-		CalClick
+		CalClick,
+		DragClick,
+		Draggable,
+		Drop
 	},
 	provide() {
 		return {
+			events: Vue.computed(() => this.convertedEvents),
+			backgrounds: Vue.computed(() => this.convertedBackgrounds),
+			dropAllowed: Vue.computed(() => !!this.onDrop),
+			onDrop: Vue.computed(() => this.onDrop || null),
 			locale: Vue.computed(() => this.locale),
 			timezone: Vue.computed(() => this.timezone),
 			timeGrid: Vue.computed(() => this.timeGrid),
@@ -43,8 +51,20 @@ export default {
 
 				return () => true;
 			}),
+			resizableEvents: Vue.computed(() => {
+				if (!this.resizableEvents)
+					return () => false;
+
+				if (Array.isArray(this.resizableEvents))
+					return event => this.resizableEvents.includes(event.type);
+				if (this.resizableEvents instanceof Function)
+					return this.resizableEvents;
+
+				return () => true;
+			}),
 			hasDragoverFunc: Vue.computed(() => this.onDragover),
-			mode: Vue.computed(() => this.mode)
+			mode: Vue.computed(() => this.mode),
+			onResize: Vue.computed(() => this.onResize || null),
 		};
 	},
 	props: {
@@ -93,11 +113,17 @@ export default {
 			type: Boolean,
 			default: undefined
 		},
+		btnTableList: {
+			type: Boolean,
+			default: undefined
+		},
 		timeGrid: Array,
 		draggableEvents: [Boolean, Array, Function],
 		dropableEvents: [Boolean, Array, Function],
+		resizableEvents: [Boolean, Array, Function],
 		onDragover: Function,
-		onDrop: Function
+		onDrop: Function,
+		onResize: Function
 	},
 	emits: [
 		"click:next",
@@ -188,7 +214,7 @@ export default {
 	},
 	watch: {
 		sDate(n, o) {
-			if (this.sDate.isValid && !this.sDate.hasSame(this.internalDate, 'day'))
+			if (this.sDate.isValid && (!this.internalDate || !this.sDate.hasSame(this.internalDate, 'day')))
 				this.internalDate = this.sDate;
 		},
 		sMode() {
@@ -240,9 +266,7 @@ export default {
 				break;
 			}
 		},
-		onDropItem(evt, start, end) {
-			this.$emit('drop', evt, start, end);
-		},
+
 		showEventModal(eventObj) {
 			this.modalEvent = eventObj;
 			this.$refs.modal.show();
@@ -263,11 +287,7 @@ export default {
 	},
 	template: /* html */`
 	<div class="fhc-calendar-base h-100">
-		<base-draganddrop
-			class="card h-100"
-			:events="convertedEvents"
-			:backgrounds="convertedBackgrounds"
-			@drop="onDropItem"
+		<div class="card h-100"
 			v-cal-click:container
 			@cal-click-default.capture="handleClickDefaults"
 		>
@@ -282,6 +302,7 @@ export default {
 				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
 				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
 				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
+				:btn-table-list="!!modes['tableList'] && (btnTableList || (showBtns && btnTableList !== false))"
 				:mode-options="modeOptions ? modeOptions[cMode] : undefined"
 			>
 				<slot name="actions" />
@@ -293,11 +314,12 @@ export default {
 				@update:range="$emit('update:range', $event)"
 				@request-modal-open="showEventModal"
 				@request-modal-close="hideEventModal"
+				@drop="$emit('drop', $event)"
 				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
 			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</component>
-		</base-draganddrop>
+		</div>
 		<bs-modal ref="modal" dialog-class="modal-lg" body-class="" @hidden-bs-modal="onModalHidden">
 			<template #title>
 				<slot v-if="modalEvent" v-bind="{mode: 'eventheader', event: modalEvent.event}" />

public/js/components/Calendar/Base/DragAndDrop.js

@@ -1,165 +0,0 @@
-import DragAndDrop from '../../../helpers/DragAndDrop.js';
-
-import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
-
-/**
- * TODO(chris): this needs serious rework!
- */
-
-export default {
-	name: "CalendarDragAndDrop",
-	directives: {
-		CalDnd
-	},
-	provide() {
-		return {
-			events: Vue.computed(() => this.correctedEvents),
-			backgrounds: Vue.computed(() => this.backgrounds),
-			dropAllowed: Vue.computed(() => this.dragging && this.dropAllowed)
-		};
-	},
-	inject: {
-		mode: "mode",
-		dropableEvents: "dropableEvents"
-	},
-	props: {
-		events: Array,
-		backgrounds: Array
-	},
-	emits: [
-		"drop"
-	],
-	data() {
-		return {
-			dragging: false,
-			allowed: false,
-			draggedInternalEvent: null,
-			draggedExternalEvent: null,
-			targetTimestamp: 0,
-			targetGridEnds: null,
-			dropAllowed: false,
-
-			shadowPreview: false // TODO(chris): IMPLEMENT! (use background instead of event as preview)
-		};
-	},
-	computed: {
-		correctedEvents() {
-			if (this.dragging) {
-				if (this.draggedInternalEvent) {
-					const index = this.events.findIndex(e => e.id == this.draggedInternalEvent.id);
-					if (this.previewEvent && !this.shadowPreview)
-						return this.events.toSpliced(index, 1, this.previewEvent);
-					else
-						return this.events.toSpliced(index, 1);
-				}
-				if (this.previewEvent && !this.shadowPreview)
-					return [...this.events, this.previewEvent];
-			}
-
-			return this.events;
-		},
-		correctedBackgrounds() {
-			if (this.dragging) {
-				if (this.shadowPreview) {
-					// TODO(chris): how to get the length
-					return [...this.backgrounds, {
-						start: new Date(this.targetTimestamp),
-						class: 'shadow-preview'
-					}];
-				}
-			}
-
-			return this.backgrounds;
-		},
-		previewEvent() {
-			if (!this.dragging || !this.dropAllowed)
-				return null;
-			if (!this.targetTimestamp)
-				return null;
-
-			const event = this.draggedInternalEvent || this.draggedExternalEvent;
-
-			if (!event)
-				return null;
-			
-			// TODO(chris): calculate length correctly from orig
-			let length = event.end - event.start;
-			if (this.targetGridEnds)
-				length = this.targetGridEnds.find(end => end >= this.targetTimestamp + length) - this.targetTimestamp;
-			
-			return {
-				orig: event.orig,
-				start: this.targetTimestamp,
-				end: this.targetTimestamp + length
-			};
-		}
-	},
-	methods: {
-		onDragstart(evt) {
-			const data = DragAndDrop.convertToTransferData(evt.detail.item.orig);
-			if (DragAndDrop.isValidDragObject(data)) {
-				DragAndDrop.setTransferData(evt.detail.originalEvent, data);
-				this.draggedInternalEvent = evt.detail.item;
-			}
-		},
-		onDragend() {
-			this.draggedInternalEvent = null;
-			this.dragging = false;
-		},
-		onDragenter(evt) {
-			this.dragging = true;
-
-			if (!this.draggedInternalEvent) {
-				const event = DragAndDrop.getValidTransferData(evt.detail.originalEvent);
-				if (event) {
-					this.draggedExternalEvent = {
-						id: event.id,
-						type: event.type,
-						start: event.isostart
-							? luxon.DateTime.fromISO(event.isostart).setZone(this.timezone)
-							: luxon.DateTime.local().setZone(this.timezone),
-						end: event.isoend
-							? luxon.DateTime.fromISO(event.isoend).setZone(this.timezone)
-							: luxon.DateTime.local().setZone(this.timezone),
-						orig: event
-					};
-				} else {
-					this.draggedExternalEvent = null;
-				}
-				this.dropAllowed = this.dropableEvents(event, this.mode);
-			} else {
-				this.dropAllowed = this.dropableEvents(this.draggedInternalEvent, this.mode);
-			}
-		},
-		onDragleave() {
-			this.dragging = false;
-		},
-		onDragchange(evt) {
-			this.targetTimestamp = evt.detail.timestamp;
-			
-			this.targetGridEnds = evt.detail.ends || null;
-		},
-		onDrop(evt) {
-			if (!this.dragging || !this.dropAllowed)
-				return;
-
-			this.$emit('drop', evt, this.previewEvent.start, this.previewEvent.end);
-			this.dropAllowed = false;
-			this.dragging = false;
-		}
-	},
-	template: `
-	<div
-		class="fhc-calendar-base-draganddrop"
-		@calendar-dragstart="onDragstart"
-		@calendar-dragend="onDragend"
-		v-cal-dnd:dropcage
-		@calendar-dragenter="onDragenter"
-		@calendar-dragleave="onDragleave"
-		@calendar-dragchange="onDragchange"
-		@drop="onDrop"
-	>
-		<slot />
-	</div>
-	`
-}

public/js/components/Calendar/Base/Grid.js

@@ -1,7 +1,8 @@
 import GridLine from './Grid/Line.js';
 import GridLineEvent from './Grid/Line/Event.js';
 
-import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+import drop from '../../../directives/drop.js';
+import { useResizeHandler } from '../../../helpers/Tempus/ResizeHandler.js';
 
 export default {
 	name: "CalendarGrid",
@@ -10,12 +11,18 @@ export default {
 		GridLineEvent
 	},
 	directives: {
-		CalDnd
+		drop
 	},
 	inject: {
 		originalEvents: "events",
 		originalBackgrounds: "backgrounds",
-		dropAllowed: "dropAllowed"
+		dropAllowed: "dropAllowed",
+		onDrop: "onDrop",
+		onResize: "onResize",
+		timeGrid: {
+			from: "timeGrid",
+			default: () => []
+		}
 	},
 	provide() {
 		return {
@@ -57,10 +64,10 @@ export default {
 	},
 	data() {
 		return {
-			dragging: false,
 			resizeObserver: null,
 			mutationObserver: null,
-			userScroll: true
+			userScroll: true,
+			isDragging: false
 		};
 	},
 	computed: {
@@ -252,17 +259,27 @@ export default {
 				pageLeft += this.getPageLeft(el.offsetParent);
 			return pageLeft;
 		},
-		getTimestampFromMouse(evt, dayTimestamp) {
+		getTimestampFromMouse(evt, dayTimestamp)
+		{
 			let mouse, mouseFrac;
-			if (this.flipAxis) {
-				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.main.scrollLeft;
+
+			const grabOffsetY = parseFloat(evt.dataTransfer.getData('fhc-grab-offset-y')) || 0;
+			const grabOffsetX = parseFloat(evt.dataTransfer.getData('fhc-grab-offset-x')) || 0;
+
+			if (this.flipAxis)
+			{
+				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.scroller.scrollLeft - grabOffsetX;
 				mouseFrac = mouse / this.$refs.body.offsetWidth;
-			} else {
-				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.main.scrollTop;
+			}
+			else
+			{
+				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.scroller.scrollTop - grabOffsetY;
 				mouseFrac = mouse / this.$refs.body.offsetHeight;
 			}
 
-			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+			let rawTimestamp = dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+			let fiveMinutes = 5 * 60 * 1000;
+			return Math.round(rawTimestamp / fiveMinutes) * fiveMinutes;
 		},
 
 		/* SCROLLING */
@@ -308,7 +325,151 @@ export default {
 			} else {
 				this.$refs.scroller.scrollTo(0, 0);
 			}
-		}
+		},
+		calculateNettoDuration(start, end) {
+			const startDay = start.startOf('day');
+			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
+
+			let nettoDuration = luxon.Duration.fromMillis(0);
+
+			for (const block of blocks)
+			{
+				const blockStart = startDay.plus(block.start);
+				const blockEnd = startDay.plus(block.end);
+
+				const overlapStart = blockStart > start ? blockStart : start;
+				const overlapEnd = blockEnd < end ? blockEnd : end;
+
+				if (overlapStart < overlapEnd) {
+					nettoDuration = nettoDuration.plus(overlapEnd.diff(overlapStart));
+				}
+			}
+
+			return nettoDuration;
+		},
+
+		calculateDropEnd(dropStart, durationMs) {
+			const duration = luxon.Duration.fromMillis(durationMs);
+			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
+			let accumulated = luxon.Duration.fromMillis(0);
+
+			for (const block of blocks)
+			{
+				const blockStart = dropStart.startOf('day').plus(block.start);
+				const blockEnd = dropStart.startOf('day').plus(block.end);
+
+				if (blockEnd <= dropStart) continue;
+
+				const relevantStart = blockStart > dropStart ? blockStart : dropStart;
+				const relevantDuration = blockEnd.diff(relevantStart);
+
+				accumulated = accumulated.plus(relevantDuration);
+
+				if (accumulated >= duration)
+				{
+					const overflow = accumulated.minus(duration);
+					return blockEnd.minus(overflow);
+				}
+			}
+
+			const lastBlock = blocks[blocks.length - 1];
+			return dropStart.startOf('day').plus(lastBlock.end);
+		},
+
+		onDropSnap(evt, items, date, part) {
+			let obj = items;
+			if (!obj?.orig) return;
+
+			const dayStr = evt?.currentTarget?.dataset?.day;
+			const dropDay = dayStr ? luxon.DateTime.fromISO(dayStr) : date;
+
+			const rawTimestamp = this.getTimestampFromMouse(evt, dropDay.toMillis());
+			const grabTime = luxon.DateTime.fromMillis(rawTimestamp);
+
+			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
+			const grabOffset = grabTime.diff(dropDay);
+
+			const snappedPart = blocks.find(b => grabOffset >= b.start && grabOffset < b.end) || part;
+			const dropStart = dropDay.plus(snappedPart.start);
+
+			let nettoDuration = this._getNettoDurationForDrop(obj);
+			let dropEnd = this.calculateDropEnd(dropStart, nettoDuration);
+
+			this.onDrop?.({
+				item: [obj],
+				start: dropStart.toISO(),
+				end: dropEnd.toISO()
+			});
+		},
+
+		_getNettoDurationForDrop(obj) {
+			if (obj.orig?.isostart && obj.orig?.isoend)
+			{
+				const s = luxon.DateTime.fromISO(obj.orig.isostart);
+				const e = luxon.DateTime.fromISO(obj.orig.isoend);
+				if (s.isValid && e.isValid)
+					return this.calculateNettoDuration(s, e);
+			}
+
+			if (obj.stundenblockung)
+			{
+				let blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
+				let firstBlock = blocks[0];
+				let blockMinutes = luxon.Duration.fromISO(firstBlock.end).minus(luxon.Duration.fromISO(firstBlock.start)).as('minutes');
+				if (!Number.isFinite(blockMinutes) || blockMinutes <= 0) blockMinutes = 45;
+				return luxon.Duration.fromObject({ minutes: obj.stundenblockung * blockMinutes });
+			}
+
+			return luxon.Duration.fromObject({ minutes: 45 });
+		},
+		onDropFree(evt, items, date)
+		{
+			let obj = items;
+			if (!obj?.orig)
+				return;
+
+			const timestamp = this.getTimestampFromMouse(evt, date);
+			const dropStart = luxon.DateTime.fromMillis(timestamp);
+
+			let nettoDuration = this._getNettoDurationForDrop(obj);
+			let dropEnd = this.calculateDropEnd(dropStart, nettoDuration);
+
+			this.onDrop?.({
+				item: [obj],
+				start: dropStart.toISO(),
+				end: dropEnd.toISO()
+			});
+		},
+		handleResizeStart({ edge, evt, el, event })
+		{
+			const gridEl = this.$refs.body;
+
+			if (!gridEl)
+				return;
+
+			this.resizeHandler.startResize(edge, evt, {
+				el,
+				gridEl,
+				event,
+				timeGrid: this.timeGrid,
+				onEnd: ({ event, newStart, newEnd }) => {
+					const orig = event?.orig;
+					if (!orig || !newStart || !newEnd)
+						return;
+
+					this.onResize?.({
+						item: [{ type: 'kalender', id: orig.kalender_id, orig }],
+						start: newStart,
+						end: newEnd
+					});
+				}
+			});
+		},
+	},
+	setup()
+	{
+		const resizeHandler = useResizeHandler();
+		return { resizeHandler };
 	},
 	beforeUnmount() {
 		this.disableAutoScroll();
@@ -382,11 +543,11 @@ export default {
 					ref="body"
 					class="grid-body"
 					style="display:grid;grid-template-rows:subgrid;grid-template-columns:subgrid"
+					@dragenter="isDragging = true"
+					@dragleave.self="isDragging = false"
+					@dragend="isDragging = false"
+					@drop="isDragging = false"
 					:style="'grid-' + axisCol + ':2/-1;grid-' + axisRow + ':1/-1'"
-					v-cal-dnd:dropcage
-					@calendar-dragenter="dragging = true"
-					@calendar-dragleave="dragging = false"
-					@dragover="dropAllowed ? $event.preventDefault() : null"
 				>
 					<template
 						v-for="(date, index) in axisMain"
@@ -401,9 +562,11 @@ export default {
 						>
 							<slot name="part-body" v-bind="{ index, part }" />
 							<div
-								v-if="snapToGrid && dragging"
-								style="position:absolute;inset:0;z-index:1"
-								v-cal-dnd:dropzone.once="{date: date.plus(part.start || part), ends: ends.slice(ends.findIndex(end => end > date))}"
+								v-if="snapToGrid"
+								style="position:absolute;inset:0"
+								:style="{ zIndex: isDragging ? 10 : 1 }"
+								:data-day="date.toFormat('yyyy-MM-dd')"
+								v-drop:move.lehreinheit.kalender.reservierung="(evt, item) => onDropSnap(evt, item, date, part)"
 							></div>
 						</div>
 						<grid-line
@@ -413,6 +576,7 @@ export default {
 							:events="eventsNormal[index]"
 							:backgrounds="backgrounds[index]"
 							style="position:relative"
+							@resize-start="handleResizeStart"
 							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
 						>
 							<template #event="slot">
@@ -420,9 +584,10 @@ export default {
 							</template>
 							<template #dropzone>
 								<div
-									v-if="!snapToGrid && dragging"
-									style="position:absolute;inset:0;z-index:1"
-									v-cal-dnd:dropzone="evt => getTimestampFromMouse(evt, date)"
+									v-if="!snapToGrid"
+									style="position:absolute;inset:0"
+									:style="{ zIndex: isDragging ? 10 : 1 }"
+									v-drop:move.lehreinheit.kalender.reservierung="(evt, item) => onDropFree(evt, item, date)"
 								></div>
 							</template>
 						</grid-line>
@@ -432,4 +597,4 @@ export default {
 		</div>
 	</div>
 	`
-}
+}

public/js/components/Calendar/Base/Grid/Line.js

@@ -74,6 +74,7 @@ export default {
 			:key="i"
 			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
 			:event="event"
+			@resize-start="$emit('resize-start', $event)"
 		>
 			<template v-slot="slot">
 				<slot name="event" v-bind="slot" />

public/js/components/Calendar/Base/Grid/Line/Event.js

@@ -1,15 +1,35 @@
-import CalDnd from '../../../../../directives/Calendar/DragAndDrop.js';
+import draggable from '../../../../../directives/draggable.js';
 import CalClick from '../../../../../directives/Calendar/Click.js';
 
 export default {
 	name: "GridLineEvent",
 	directives: {
-		CalDnd,
+		draggable,
 		CalClick
 	},
+	emits: [
+		'resize-start'
+	],
+	data() {
+		return {
+			contextMenu: {
+				show: false,
+				x: 0,
+				y: 0
+			}
+		};
+	},
 	inject: {
 		draggableEvents: "draggableEvents",
-		mode: "mode"
+		resizableEvents: {
+			from: "resizableEvents",
+			default: () => () => false
+		},
+		mode: "mode",
+		contextMenuActions: {
+			from: "contextMenuActions",
+			default: () => ({})
+		}
 	},
 	props: {
 		event: {
@@ -27,6 +47,9 @@ export default {
 		draggable() {
 			return !this.isHeaderOrFooter && this.draggableEvents(this.event.orig, this.mode);
 		},
+		resizable() {
+			return !this.isHeaderOrFooter && this.resizableEvents(this.event.orig, this.mode);
+		},
 		classes() {
 			const classes = [];
 			if (this.isHeaderOrFooter) {
@@ -37,21 +60,102 @@ export default {
 				if (this.event.endsHere)
 					classes.push('event-end');
 			}
-			return classes
+			return classes;
+		},
+		dragKalenderCollection() {
+			const orig = this.event.orig;
+			return {
+				type: 'kalender',
+				id: orig?.kalender_id ?? null,
+				orig,
+			};
+		},
+		activeContextActions() {
+			if (this.isHeaderOrFooter) return [];
+			const type = this.event.orig?.type ?? 'lehreinheit';
+			return this.contextMenuActions[type] ?? this.contextMenuActions['default'] ?? [];
 		}
 	},
-	template: /* html */`
+	methods: {
+		onResizeStart(edge, evt) {
+			this.$emit('resize-start', {
+				edge,
+				evt,
+				el: this.$refs.eventEl,
+				event: this.event
+			});
+		},
+		onRightClick(evt) {
+			this.contextMenu.show = true;
+			this.contextMenu.x = evt.clientX;
+			this.contextMenu.y = evt.clientY;
+		},
+		onContextAction(action) {
+			this.contextMenu.show = false;
+			action(this.event.orig);
+		},
+		closeContextMenu() {
+			this.contextMenu.show = false;
+		},
+		onDragStart(evt) {
+			const rect = this.$refs.eventEl.getBoundingClientRect();
+			evt.dataTransfer.setData('fhc-grab-offset-y', evt.clientY - rect.top);
+			evt.dataTransfer.setData('fhc-grab-offset-x', evt.clientX - rect.left);
+		},
+	},
+	template:`
 	<div
 		class="fhc-calendar-base-grid-line-event event"
 		:class="classes"
-		style="z-index: 1"
+		style="z-index: 2"
 		:draggable="draggable"
-		v-cal-dnd:draggable="event"
+		ref="eventEl"
+		@dragstart="onDragStart"
+		v-draggable:move.noimage="draggable ? dragKalenderCollection : {}"
 		v-cal-click:event="isHeaderOrFooter ? event : event.orig"
+		@contextmenu.prevent="onRightClick"
 	>
+		<div
+			v-if="resizable"
+			class="fhc-resize-bar fhc-resize-bar--top"
+			@pointerdown.prevent.stop="onResizeStart('start', $event)"
+			@click.stop
+		>
+			<i class="fa-solid fa-grip-lines text-muted"></i>
+		</div>
 		<slot :event="isHeaderOrFooter ? event : event.orig">
 			{{ event.orig }}
 		</slot>
+		<div
+			v-if="resizable"
+			class="fhc-resize-bar fhc-resize-bar--bottom"
+			@pointerdown.prevent.stop="onResizeStart('end', $event)"
+			@click.stop
+		>
+			<i class="fa-solid fa-grip-lines text-muted"></i>
+		</div>
+
+	
+		<teleport to="body">
+			<div
+				v-if="contextMenu.show"
+				style="position:fixed; inset:0; z-index:9998"
+				@click="closeContextMenu"
+				@contextmenu.prevent="closeContextMenu"
+			/>
+			<ul
+				v-if="contextMenu.show"
+				class="dropdown-menu show"
+				:style="{ position: 'fixed', top: contextMenu.y + 'px', left: contextMenu.x + 'px', zIndex: 9999 }"
+			>
+				<li v-for="action in activeContextActions" :key="action.label">
+					<button class="dropdown-item" type="button" @click.stop="onContextAction(action.action)">
+						<i v-if="action.icon" :class="action.icon + ' me-2'"></i>
+						{{ action.label }}
+					</button>
+				</li>
+			</ul>
+		</teleport>
 	</div>
 	`
-}
+}

public/js/components/Calendar/Base/Grid/Line/EventCard.js

@@ -0,0 +1,32 @@
+import draggable from '../../../../../directives/draggable.js';
+
+export default {
+	name: 'EventCard',
+	directives: {
+		draggable,
+	},
+	props: {
+		event: { type: Object, required: true },
+		parked: Boolean
+	},
+	computed: {
+		dragKalenderCollection() {
+			return this.event
+		},
+	},
+	template: `
+	<div
+		class="fhc-calendar-base-grid-line-event event"
+		v-draggable:move.noimage="dragKalenderCollection"
+		style="border:1px"
+	>
+		<div class="title">
+			{{ event.orig.topic || event.orig.titel || event.orig.lehrfach }}
+		</div>
+		<div>
+			{{ event.orig.datum }} {{ event.orig.beginn }}–{{ event.orig.ende }}
+			<span v-if="event.ort_kurzbz">· {{ event.orig.ort_kurzbz }}</span>
+		</div>
+	</div>
+`
+};

public/js/components/Calendar/Base/Header.js

@@ -24,7 +24,8 @@ export default {
 		btnMonth: Boolean,
 		btnWeek: Boolean,
 		btnDay: Boolean,
-		btnList: Boolean
+		btnList: Boolean,
+		btnTableList: Boolean
 	},
 	emits: [
 		"next",
@@ -89,6 +90,16 @@ export default {
 					>
 						<i class="fa fa-table-list"></i>
 					</button>
+					
+					<button
+						v-if="btnTableList"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'tableList'}"
+						@click="clickMode($event, 'tableList')"
+					>
+						<i class="fa fa-table-list"></i>
+					</button>
 				</div>
 			</div>
 		</div>

public/js/components/Calendar/Base/Header/Datepicker.js

@@ -39,6 +39,7 @@ export default {
 			case "list":
 				return [this.convertedDate.startOf('day').ts, this.convertedDate.startOf('day').plus({ days: this.listLength }).ts - 1];
 			case "week":
+			case "tableList":
 				return [this.convertedDate.startOf('week', { useLocaleWeeks: true }).ts, this.convertedDate.endOf('week', { useLocaleWeeks: true }).ts];
 			case "day":
 				return this.convertedDate;
@@ -51,6 +52,7 @@ export default {
 			case "month":
 				return this.date.toLocaleString({ month: 'long', year: 'numeric' });
 			case "week":
+			case "tableList":
 				var year = this.date.localWeekYear;
 				var week = this.date.toFormat('nn');
 				return this.$p.t('calendar/year_kw', { year, week });
@@ -76,6 +78,7 @@ export default {
 				break;
 			case "list":
 			case "week":
+			case "tableList":
 				date = luxon.DateTime.fromJSDate(value[0]).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
 				break;
 			case "day":
@@ -96,7 +99,7 @@ export default {
 		@update:model-value="update"
 		:format="() => title"
 		:month-picker="mode == 'month'"
-		:week-picker="mode == 'week'"
+		:week-picker="mode == 'week' || mode == 'tableList'"
 		:range="mode == 'list' ? { autoRange: listLength - 1 } : false"
 		:text-input="mode == 'day'"
 		:week-start="weekStart"

public/js/components/Calendar/Mode/List/View.js

@@ -1,7 +1,8 @@
 import LabelDay from '../../Base/Label/Day.js';
 import LabelDow from '../../Base/Label/Dow.js';
 
-import CalDnd from '../../../../directives/Calendar/DragAndDrop.js';
+import draggable from '../../../../directives/draggable.js';
+
 import CalClick from '../../../../directives/Calendar/Click.js';
 
 // TODO(chris): drag and drop
@@ -13,7 +14,7 @@ export default {
 		LabelDow
 	},
 	directives: {
-		CalDnd,
+		draggable,
 		CalClick
 	},
 	inject: {
@@ -86,7 +87,7 @@ export default {
 					v-else
 					class="event"
 					:draggable="draggable(event)"
-					v-cal-dnd:draggable="event"
+					v-draggable="event.orig"
 					v-cal-click:event="event.orig"
 				>
 					<slot :event="event.orig" mode="list" />

public/js/components/Calendar/Mode/Month/View.js

@@ -36,7 +36,9 @@ export default {
 					}
 				}
 				return events;
-			})
+			}),
+			draggableEvents: () => false,
+			resizableEvents: () => false
 		};
 	},
 	inject: {

public/js/components/Calendar/Mode/Table.js

@@ -0,0 +1,109 @@
+import BaseSlider from '../Base/Slider.js';
+import TableView from './Table/View.js';
+
+export default {
+	name: "ModeTable",
+	components: {
+		BaseSlider,
+		TableView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click",
+		"requestModalOpen"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('week', { useLocaleWeeks: true });
+			let last = this.focusDate.endOf('week', { useLocaleWeeks: true });
+
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ weeks: this.rangeOffset });
+				} else {
+					last = last.plus({ weeks: this.rangeOffset });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
+				this.$emit('update:range', this.range);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('week', { useLocaleWeeks: true }).diff(this.focusDate.startOf('week', { useLocaleWeeks: true }), 'weeks').weeks;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(weeks) {
+			const newFocusDate = this.focusDate.plus({ weeks });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(weeks) {
+			const day = this.focusDate.plus({ weeks });
+			return { ...this.$attrs, day };
+		},
+		handleClickDefaults(evt) {
+
+			switch (evt.detail.source) {
+				case 'day':
+					// default: Set current-date
+					this.$emit('update:currentDate', evt.detail.value);
+					break;
+				case 'event':
+					// default: Request Modal
+					this.$emit('requestModalOpen', { event: evt.detail.value });
+					break;
+			}
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-week flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<table-view ref="view" v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" mode="week" /></template>
+			</table-view>
+		</base-slider>
+	</div>
+	`
+}

public/js/components/Calendar/Mode/Table/View.js

@@ -0,0 +1,147 @@
+import {CoreFilterCmpt} from "../../../../components/filter/Filter.js";
+import BsModal from '../../../Bootstrap/Modal.js';
+import FormInput from "../../../Form/Input.js";
+import ApiDetails from "../../../../api/lehrveranstaltung/details.js";
+
+
+export default {
+	name: "TableView",
+	inject: {
+		events: "events",
+		timezone: "timezone"
+	},
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormInput
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	data()
+	{
+		return {
+			raumtyp_array: []
+		}
+	},
+	computed: {
+		start() {
+			return this.day.startOf('week', { useLocaleWeeks: true });
+		},
+		preparedEvents() {
+			const end = this.start.plus({ days: 7 });
+			return this.events
+				.filter(e => e.start < end && e.end > this.start)
+				.sort((a, b) => a.start.ts - b.start.ts)
+				.map(event => ({
+					...event.orig,
+					row_index: event.id,
+				}));
+		},
+		tabulatorOptions() {
+			return {
+				index: "row_index",
+				layout: 'fitDataStretch',
+				placeholder: "Keine Daten verfügbar",
+				persistenceID: "2026_03_09_table_view_v1",
+				data: this.preparedEvents,
+				columns: [
+					{
+						formatter: 'rowSelection',
+						titleFormatter: 'rowSelection',
+						titleFormatterParams: {
+							rowRange: "active"
+						},
+						headerSort: false,
+						width: 40
+					},
+					{title: 'Datum', field: 'datum', headerFilter: "input", formatter: (cell) => {
+							let val = cell.getValue();
+							if (!val)
+								return '&nbsp;';
+							return luxon.DateTime.fromISO(val).toFormat('dd.MM.yyyy')
+						}
+					},
+					{title: 'Von', field: 'beginn', headerFilter: "input"},
+					{title: 'Bis', field: 'ende', headerFilter: "input"},
+					{title: 'Lehrfach', field: 'lehrfach', headerFilter: "input"},
+					{title: 'Bezeichnung', field: 'lehrfach_bez', headerFilter: "input"},
+					{title: 'Lehrform', field: 'lehrform', headerFilter: "input"},
+					{title: 'Raum', field: 'ort_kurzbz', headerFilter: "input"},
+					{
+						title: 'Lektor',
+						field: 'lektor',
+						headerFilter: "input",
+						mutator: (value) => {
+							if (!value)
+								return '';
+							return value.map(l => l.kurzbz).join(', ') ?? '–'
+						}
+					},
+					{title: 'OE', field: 'organisationseinheit', headerFilter: "input"},
+					{title: 'Status', field: 'status_kurzbz', headerFilter: "input"},
+				]
+			}
+		}
+	},
+	methods:
+	{
+		openModal() {
+			this.$refs.raumModal.show();
+		}
+	},
+	watch: {
+		preparedEvents(newData) {
+			this.$refs.tableViewTable?.tabulator?.setData(newData);
+		}
+	},
+	mounted() {
+
+		this.$api.call(ApiDetails.getRaumtyp())
+			.then(result => {
+				this.raumtyp_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: /* html */`
+	<div class="fhc-calendar-mode-table-view h-100 overflow-auto">
+		<core-filter-cmpt
+			ref="tableViewTable"
+			:tabulator-options="tabulatorOptions"
+			:table-only="true"
+			:side-menu="false"
+			:download="true"
+		>
+			<template #actions>
+				<button class="btn btn-outline-secondary btn-sm">Verschieben</button>
+				<button @click="openModal" class="btn btn-outline-secondary btn-sm">Raum wechsel</button>
+			</template>
+		</core-filter-cmpt>
+		
+		<bs-modal ref="raumModal" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template #title>Raum verschiebung</template>
+				<form-input
+					:label="$p.t('lehre', 'raumtyp')"
+					type="select"
+					container-class="col-3"
+					name="raumtyp"
+				>
+				<option
+					v-for="raumtyp in raumtyp_array"
+					:value="raumtyp.raumtyp_kurzbz"
+					:key="raumtyp.raumtyp_kurzbz"
+				>
+					{{ raumtyp.raumtyp_kurzbz }} {{ raumtyp.beschreibung }}
+				</option>
+			</form-input>
+			<template #footer>
+				<button type="button" class="btn btn-primary">{{ $p.t('ui', 'speichern') }}</button>
+			</template>
+		</bs-modal>
+	</div>
+	`
+}

public/js/components/Calendar/Tempus.js

@@ -0,0 +1,257 @@
+import FhcCalendar from "./Base.js";
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeWeek from './Mode/Week.js';
+import ModeMonth from './Mode/Month.js';
+import ModeTable from './Mode/Table.js';
+import ApiKalender from '../../api/factory/tempus/kalender.js';
+import draggable from '../../directives/draggable.js';
+
+
+export default {
+	name: "CalendarTempus",
+	components: {
+		FhcCalendar
+	},
+	inject: {
+		renderers: {from: 'renderers'},
+		appConfig: {
+			from: 'appConfig',
+			default: {
+				visible_status: 'all'
+			}
+		}
+	},
+	directives: {
+		draggable,
+	},
+	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
+		date: {
+			type: [Date, String, Number, luxon.DateTime],
+			default: luxon.DateTime.local()
+		},
+		mode: {
+			type: String,
+			default: 'Week'
+		},
+		getPromiseFunc: {
+			type: Function,
+			required: true
+		},
+		parkedEvents: {
+			type: Object,
+			default: () => new Set()
+		},
+		visibleLecturers: {
+			type: Array,
+			default: null
+		},
+		extraBackgrounds: {
+			type: Array,
+			default: () => []
+		},
+		visibleStatus: {
+			type: Array,
+			default: () => ['all']
+		},
+	},
+	emits: [
+		"update:date",
+		"update:mode",
+		"update:range",
+		"drop",
+		"resize"
+	],
+
+	data() {
+		return {
+			modes: {
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth),
+				tableList: Vue.markRaw(ModeTable),
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			currentMode: this.mode,
+			teachingunits: null,
+			showRaster: true,
+		};
+	},
+	computed: {
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.timezone);
+
+			let past = [];
+			if (this.mode == 'Month')
+			{
+				past = [{
+					class: 'background-past',
+					end: now.startOf('day')
+				}];
+			}
+			else
+			{
+				past = [{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}];
+			}
+
+			return [
+				...past,
+				...(this.extraBackgrounds || [])
+			];
+		},
+		visibleEvents()
+		{
+			let list = this.events;
+
+			if (Array.isArray(this.visibleLecturers))
+			{
+				const visibleLectures = new Set(this.visibleLecturers);
+
+				list = list.filter(event => {
+					if (!event.lektor?.length)
+						return true;
+					return event.lektor.some(lektor => visibleLectures.has(lektor.mitarbeiter_uid));
+				});
+			}
+
+			if (!this.visibleStatus.length || this.visibleStatus.includes('all'))
+				return list;
+
+			return list.filter(event => this.visibleStatus.includes(event.status_kurzbz));
+		},
+	},
+	methods: {
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
+		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+			this.$emit('update:range', rangeInterval);
+		},
+		ondrop(payload){
+			this.$emit('drop', payload);
+		},
+		onresize(payload){
+			this.$emit('resize', payload);
+		},
+		resetEventLoader() {
+			this.reset();
+		},
+
+	},
+	setup(props, context) {
+		const rangeInterval = Vue.ref(null);
+
+		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
+
+		Vue.watch(lv, newValue => {
+			context.emit('update:lv', newValue);
+		});
+
+		return {
+			rangeInterval,
+			events,
+			lv,
+			reset
+		};
+	},
+
+	created() {
+		this.$api
+			.call(ApiKalender.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
+	},
+	template: /* html */`
+	<fhc-calendar
+		ref="calendar"
+		class="fhc-calendar-lvplan"
+		:date="date"
+		:modes="modes"
+		:mode-options="modeOptions"
+		:mode="mode"
+		:timezone="timezone"
+		:locale="$p.user_locale.value"
+		:events="visibleEvents || []"
+		:backgrounds="backgrounds"
+		:time-grid="showRaster ? teachingunits : null"
+		show-btns
+		:draggable-events="true"
+		:resizable-events="true"
+		:on-drop="currentMode === 'week' ? ondrop : null"
+		:on-resize="onresize"
+		@update:date="(newDate, newMode) => $emit('update:date', newDate, newMode)"
+		@update:mode="(newMode, newDate) => { currentMode = newMode; $emit('update:mode', newMode, newDate) }"
+		@update:range="updateRange"
+	>
+		<template v-slot="{ event, mode }">
+			<div
+				:class="['event-type-' + event.type + ' ' + mode + 'PageContainer', { 'event--parked': parkedEvents.has(String(event.kalender_id)) }]"
+				:type="mode == 'day' ? 'button' : undefined"
+ 				:style="eventStyle(event)"
+			>
+				<component
+					v-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<component
+					v-else
+					:is="renderers[event.type]?.calendarEvent"
+					:event="event"
+				></component>
+			</div>
+		</template>
+		<template #actions>
+			<div class="d-flex align-items-center gap-2">
+				<div 
+					class="d-flex align-items-center gap-2" 
+					style="cursor:pointer"
+					@click="showRaster = !showRaster"
+				>
+					<i :class="showRaster ? 'fa-solid fa-toggle-on text-primary' : 'fa-solid fa-toggle-off text-muted'"></i>
+					<span class="form-check-label">Stundenraster</span>
+				</div>
+				<div
+					class="d-flex align-items-center gap-2 "
+					v-draggable:move.noimage="{ type: 'reservierung', id: null, orig: {} }"
+				>
+					<i 
+						class="fa-solid fa-calendar-plus text-primary" 
+						style="cursor:pointer"
+						@click.stop="$emit('open-reservierung')"
+					></i>
+					<span>Reservierung</span>
+				</div>
+			</div>
+		</template>
+	</fhc-calendar>`
+}

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

@@ -31,7 +31,7 @@ export default {
 						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
 						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
 					].join(": "));
-				} else {;
+				} else {
 					tooltipArray.push([
 						this.$p.t('lehre/lektor'),
 						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")

public/js/components/Dashboard/Admin.js

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

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

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

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

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

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

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

public/js/components/Dashboard/Dashboard.js

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

public/js/components/Dashboard/Item.js

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

public/js/components/Dashboard/Section.js

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

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

@@ -74,6 +74,16 @@ export default {
 				],
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
+				],
+				'microcredential.xml.php' : [
+					'microcredentialzertifikat_1',
+					'microcredentialzertifikat_2',
+					'microcredentialzertifikat_3',
+					'microcredentialzertifikat_4',
+					'microcredential_1',
+					'microcredential_2',
+					'microcredential_3',
+					'microcredential_4',
 				]
 			},
 			documentDropdownObject: {}

public/js/components/Stv/Studentenverwaltung/Verband.js

@@ -131,7 +131,7 @@ export default {
 		},
 		onSelectTreeNode(node) {
 			if (node.data.link)
-				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz, semester: node.data.semester, orgform_kurzbz: node.data.orgform_kurzbz});
+				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz, semester: node.data.semester, orgform_kurzbz: node.data.orgform_kurzbz, name: node.data.name});
 		},
 		mapNodesToNoSemReloadNodes(result, node) {
 			if (node.data.no_sem_reload)

public/js/components/Tempus/Coursepicker.js

@@ -0,0 +1,182 @@
+import FormInput from '../Form/Input.js';
+import draggable from "../../directives/draggable.js";
+import ApiCoursePicker from '../../api/factory/tempus/coursepicker.js';
+
+export default {
+	components: {
+		FormInput
+	},
+	directives: {
+		draggable
+	},
+	props: {
+		stg: {
+			type: [String, Number],
+			default: null,
+		},
+		studiensemester: {
+			type: String,
+			default: null
+		},
+	},
+	emits: ['select-lecturer', 'select-kw'],
+	data() {
+		return {
+			searchparam: '',
+			allCourses: [],
+		}
+	},
+	computed: {
+		courses() {
+			const query = (this.searchparam ?? '').trim().toLowerCase();
+			if (!query)
+				return this.allCourses;
+
+			return this.allCourses.filter(course =>
+				course.showname.toLowerCase().includes(query) ||
+				course.lektoren?.some(l =>
+					l.name.toLowerCase().includes(query) ||
+					l.kurzbz.toLowerCase().includes(query)
+				)
+			);
+		}
+	},
+	watch: {
+		stg(val) {
+			this.searchparam = '';
+			this.loadCoursesByStg(val);
+		},
+		studiensemester() {
+			if (this.stg)
+				this.loadCoursesByStg(this.stg);
+		},
+	},
+	methods: {
+		async loadCoursesByStg(stg) {
+			if (!stg) {
+				this.allCourses = [];
+				return;
+			}
+
+			this.$api.call(ApiCoursePicker.getByStg(this.stg, this.studiensemester))
+				.then(result => {
+					this.allCourses = result.data.map(e => ({
+						lehreinheit_id: e.lehreinheit_id,
+						lektoren: e.lektoren,
+						raumtyp: e.raumtyp,
+						raumtypalternativ: e.raumtypalternativ,
+						semesterstunden: e.planstunden,
+						stundenblockung: e.stundenblockung,
+						wochenrythmus: e.wochenrythmus,
+						offenestunden: e.offenestunden,
+						start_kw: e.start_kw,
+						anmerkung: e.anmerkung,
+						lehrfach: e.lehrfach,
+						lehrform: e.lehrform,
+						lehrfach_bez: e.lehrfach_bez,
+						lehrfach_farbe: e.lehrfach_farbe,
+						lehrverband: e.lehrverband,
+						showname: `${e.lehrfach} ${e.lehrform}`,
+						orig: {
+							type: 'lehreinheit',
+							lehreinheit_id: e.lehreinheit_id[0],
+							blockung: e.stundenblockung,
+							entry: e,
+						}
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		dragLehreinheitCollection(course) {
+			const orig = course.orig;
+			return {
+				type: 'lehreinheit',
+				id: orig.lehreinheit_id,
+				orig: orig,
+				stundenblockung: course.stundenblockung,
+			};
+		},
+		courseStyle(course) {
+			if (!course.lehrfach_farbe)
+				return {};
+			return '--event-bg:#' + course.lehrfach_farbe;
+
+		},
+		selectLecturer(lektor) {
+			this.$emit('select-lecturer', lektor);
+		}
+	},
+	template: `
+	<div class="course-picker d-flex flex-column h-100">
+		<div class="p-2">
+			<form-input
+				:label="$p.t('ui', 'suche')"
+				type="text"
+				v-model="searchparam"
+			/>
+		</div>
+		<div v-if="!stg" class="d-flex flex-column align-items-center justify-content-center text-center text-muted py-5 px-3 h-100">
+			<span class="small fw-semibold mb-1">Keine Lehreinheiten</span>
+			<span class="small">Wähle einen Studiengang, um Lehreinheiten anzuzeigen.</span>
+		</div>
+		<div v-else class="overflow-auto px-2 pb-2 flex-grow-1">
+			<div
+				v-for="course in courses"
+				:key="course.lehreinheit_id"
+				:style="courseStyle(course)"
+				class="course-picker-row"
+				v-draggable:move.noimage="dragLehreinheitCollection(course)"
+				tabindex="0"
+			>
+				<div class="d-flex gap-1">
+					<span class="fw-semibold small w-50" v-tooltip="course.lehrfach_bez">{{ course.lehrfach }} {{ course.lehrform }}</span>
+					<span class="fw-semibold small w-50" v-tooltip="course.raumtypalternativ">{{ course.raumtyp }}</span>
+				</div>
+				
+				<!--TODO(david) entfernen, dient nur für das mappen mit der lvverwaltung-->
+				<div class="d-flex gap-1">
+					<span class="small w-50" v-tooltip="course.lehreinheit_id">{{ course.lehreinheit_id[0] }} </span>
+				</div>
+				
+				<div class="d-flex gap-1 text-muted">
+					<div class="w-50 d-flex flex-column" v-tooltip="course.anmerkung">
+						<span
+							v-for="verband in course.lehrverband"
+							:key="verband">
+							{{ verband }}
+						</span>
+					</div>
+					<span
+						style="cursor:pointer"
+						class="text-decoration-underline w-50"
+						@click.stop="$emit('select-kw', course.start_kw)">KW: {{ course.start_kw }}
+					</span>
+				</div>
+
+				<div class="d-flex gap-1 text-muted">
+					<div class="w-50 d-flex flex-column"
+						v-tooltip="course.lektoren.length > 3 ? course.lektoren.map(l => l.kurzbz).join(', ') : null">
+						<span
+							v-for="lektor in course.lektoren.slice(0, 3)"
+							:key="lektor.uid"
+							style="cursor:pointer"
+							class="text-decoration-underline"
+							@click.stop="selectLecturer(lektor)">
+								{{ lektor.kurzbz }}
+						</span>
+						<span v-if="course.lektoren.length > 3" class="text-muted fst-italic">
+							+{{ course.lektoren.length - 3 }} weitere...
+						</span>
+					</div>
+					<span class="w-50 align-self-start">WR: {{ course.wochenrythmus }} Bl: {{ course.stundenblockung }}</span>
+				</div>
+
+				<div class="d-flex gap-1 text-muted">
+					<span class="w-50">Offen: {{ course.offenestunden }}</span>
+					<span class="w-50">{{ course.semesterstunden }}</span>
+				</div>
+			</div>
+		</div>
+	</div>
+`
+}

public/js/components/Tempus/LectureSelection.js

@@ -0,0 +1,44 @@
+import FormInput from '../Form/Input.js';
+
+export default {
+	name: "LectureSelection",
+	props: {
+		lecturers: {
+			type: Array,
+			required: true
+		}
+	},
+	emits: ['remove'],
+	template: `
+		<div class="lecture-selection">
+			<div v-for="l in lecturers" :key="l.uid">
+				<div class="fw-semibold px-2 pt-2 d-flex align-items-center justify-content-between">
+					{{ l.label }}
+					<button
+						type="button"
+						class="btn btn-sm btn-link text-danger p-0"
+						@click="$emit('remove', l.uid)"
+						title="Lektor entfernen"
+					>
+						<i class="fa-solid fa-xmark"></i>
+					</button>
+				</div>
+		
+				<div class="overflow-auto flex-grow-1 px-2 pb-2">
+					<div class="d-flex align-items-center gap-2" @click="l.showEvents = !l.showEvents" style="cursor:pointer">
+						<i :class="l.showEvents ? 'fa-solid fa-toggle-on text-primary' : 'fa-solid fa-toggle-off text-muted'"></i>
+						<span class="form-check-label">Plan</span>
+					</div>
+					<div class="d-flex align-items-center gap-2" @click="l.overlays.blocks = !l.overlays.blocks" style="cursor:pointer">
+						<i :class="l.overlays.blocks ? 'fa-solid fa-toggle-on text-primary' : 'fa-solid fa-toggle-off text-muted'"></i>
+						<span class="form-check-label">Zeitsperren</span>
+					</div>
+					<div class="d-flex align-items-center gap-2" @click="l.overlays.wishes = !l.overlays.wishes" style="cursor:pointer">
+						<i :class="l.overlays.wishes ? 'fa-solid fa-toggle-on text-primary' : 'fa-solid fa-toggle-off text-muted'"></i>
+						<span class="form-check-label">Zeitwünsche</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	`
+}

public/js/components/Tempus/ParkingSlot.js

@@ -0,0 +1,78 @@
+import EventCard from '../Calendar/Base/Grid/Line/EventCard.js';
+import drop from '../../directives/drop.js';
+
+export default {
+	name: "ParkingSlot",
+	components: {
+		EventCard
+	},
+	directives: {
+		drop
+	},
+	emits: ['update:parkedKeys'],
+	data() {
+		return {
+			parked: [],
+			parkedKeys: new Set()
+		};
+	},
+	methods: {
+		park(evt, items) {
+			const list = Array.isArray(items) ? items : [items];
+
+			const stored = JSON.parse(localStorage.getItem('tempus_parking') || '[]');
+
+			list.forEach(item => {
+				const key = `${item.id}`;
+				if (this.parkedKeys.has(key))
+					return;
+				this.parkedKeys.add(key);
+				stored.push({
+					type: item.type,
+					id: item.id,
+					orig: item.orig
+				});
+				this.parked.push(item);
+			});
+
+			localStorage.setItem('tempus_parking', JSON.stringify(stored));
+			this.$emit('update:parkedKeys', this.parkedKeys);
+		},
+		unpark(event) {
+			const key = `${event.id}`;
+			this.parkedKeys.delete(key);
+			this.parked = this.parked.filter(parkedEvent => parkedEvent.id !== event.id);
+
+			const stored = JSON.parse(localStorage.getItem('tempus_parking') || '[]').filter(parkedEvent => parkedEvent.id !== event.id);
+			localStorage.setItem('tempus_parking', JSON.stringify(stored));
+			this.$emit('update:parkedKeys', this.parkedKeys);
+		},
+		isParked(id) {
+			return this.parkedKeys.has(`${id}`);
+		}
+	},
+	mounted() {
+		const stored = JSON.parse(localStorage.getItem('tempus_parking') || '[]');
+		this.parked = stored;
+		this.parkedKeys = new Set(stored.map(store => `${store.id}`));
+		this.$emit('update:parkedKeys', this.parkedKeys);
+	},
+	template: `
+		<div class="overflow-auto" tabindex="-1">
+			<div
+				id="parkingslot"
+				class="parkingslot"
+				v-drop:move.kalender-collection="(evt, item) => park(evt, item)"
+			>
+				<i v-if="!parked.length" class="fa-solid fa-square-parking"></i>
+				<event-card
+					class="parkingevent"
+					v-for="parkedEvent in parked"
+					:key="parkedEvent.id"
+					:event="parkedEvent"
+					parked
+				/>
+			</div>
+		</div>
+	`
+}

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

@@ -0,0 +1,94 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true
+		}
+	},
+	computed:{
+		classes() {
+			const classes = ['cis-renderer-lehreinheit-calendar-event', 'calendar-event-default', 'h-100', 'w-100', 'p-1'];
+
+			if (this.event.collisions) {
+				classes.push('calendar-event-collisions');
+			}
+
+			return classes;
+		},
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+
+			return tooltipArray.join("\n");
+		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: /*html*/`
+	<div
+		:class="classes"
+		@wheel.stop
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-none d-xl-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
+		</div>
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
+			<span
+				v-for="(lektor,index) in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
+			</span>
+		</div>
+	</div>
+	`,
+}

public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js

@@ -0,0 +1,148 @@
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../../../components/Cis/Mylv/LvMenu.js";
+
+import ApiLvPlan from '../../../../api/factory/lvPlan.js';
+import ApiAddons from '../../../../api/factory/addons.js';
+
+export default {
+	components:{
+		LvMenu,
+	},
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	data() {
+		return {
+			lvMenu: []
+		};
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!(this.event.beginn instanceof Date)) {
+				return this.event.beginn;
+			}
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.ende)
+				return 'N/A';
+			if (!(this.event.ende instanceof Date)) {
+				return this.event.ende;
+			}
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	created() {
+		if (this.event.type == 'lehreinheit') {
+			this.$api
+				.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
+				.then(res => res.data)
+				.then(studiensemester_kurzbz => this.$api.call(
+					ApiAddons.getLvMenu(
+						this.event.lehrveranstaltung_id,
+						studiensemester_kurzbz
+					)
+				))
+				.then(res => {
+					this.lvMenu = res.data;
+				});
+		}
+	},
+	template: `
+	<div>
+		<h5>
+			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+		</h5>
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lehrveranstaltung')?
+							$p.t('lehre','lehrveranstaltung')+':'
+							:''
+						}}</th>
+						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div id="lektorenContainer">
+								<div v-for="lektor in event.lektor" class="d-block">
+									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :title="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
+									{{lektor.kurzbz}}
+								</div>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','organisationseinheit')?
+							$p.t('lehre','organisationseinheit')+':'
+							:''
+						}}</th>
+						<td>{{event.organisationseinheit}}</td>
+					</tr>
+				</tbody>
+		</table>
+		
+		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu.length" :menu="lvMenu" />
+	</div>`,
+}

public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js

@@ -0,0 +1,12 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+			<div v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+`
+}

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

@@ -0,0 +1,93 @@
+export default {
+	props: {
+		event: {
+			type: Object,
+			required: true
+		}
+	},
+	computed: {
+		classes() {
+			const classes = ['cis-renderer-reservierungen-calendar-event', 'calendar-event-default', 'h-100', 'w-100', 'p-1'];
+
+			if (this.event.collisions) {
+				classes.push('calendar-event-collisions');
+			}
+
+			return classes;
+		},
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+			
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+			
+			return tooltipArray.join("\n");
+		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: /* html */`
+	<div
+		:class="classes"
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
+		</div>
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span
+				v-for="lektor in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
+			</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
+		</div>
+	</div>
+	`,
+}

public/js/components/Tempus/Renderer/Reservierungen/modalContent.js

@@ -0,0 +1,133 @@
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../../Cis/Mylv/LvMenu.js";
+
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		},
+		lvMenu:{
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	components:{
+		LvMenu,
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!(this.event.beginn instanceof Date)) {
+				return this.event.beginn;
+			}
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.ende)
+				return 'N/A';
+			if (!(this.event.ende instanceof Date)) {
+				return this.event.ende;
+			}
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template: `
+	<div>
+		
+		<h6>
+		{{ event.beschreibung }}
+		</h6>
+		
+		<h5>
+			{{$p.t('ui','reservierungsinformationen')}}
+		</h5>
+		
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('ui','organisierende')?
+							$p.t('ui','organisierende')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :tooltip="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+					
+					<tr>
+						<th>{{
+							$p.t('ui','teilnehmende')?
+							$p.t('ui','teilnehmende')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="teilnehmer in event.teilnehmer_person" class="d-block">
+								{{teilnehmer.kurzbz}}
+							</div>
+							<div v-for="gruppe in event.teilnehmer_gruppe" class="d-block">
+								{{gruppe.gruppe_kurzbz}}
+							</div>
+						</td>
+					</tr>
+					
+				</tbody>
+		</table>
+		
+	</div>`,
+}