Minor mod

application/config/routes.php

@@ -137,6 +137,9 @@ $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
 
 
+
+$route['api/frontend/v1/lvplan/calendar-events'] = 'api/frontend/v1/LvPlanCalendarEvents/getCalendarData';
+
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 

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

@@ -0,0 +1,114 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Provides the authenticated user's LVPlan events as JSON.
+ */
+class LvPlanCalendarEvents extends FHCAPI_Controller
+{
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getCalendarData' => self::PERM_LOGGED
+		]);
+	}
+
+	/**
+	 * Returns the authenticated user's mapped calendar events.
+	 */
+	public function getCalendarData()
+	{
+		$this->output->set_header('Cache-Control: no-store');
+
+		if ($this->input->method() !== 'get')
+		{
+			$this->output->set_header('Allow: GET');
+			$this->terminateWithError(
+				'Method not allowed',
+				self::ERROR_TYPE_GENERAL,
+				REST_Controller::HTTP_METHOD_NOT_ALLOWED
+			);
+		}
+
+		$startDate = $this->input->get('start_date', true);
+		$endDate = $this->input->get('end_date', true);
+		$validationErrors = array();
+
+		if (!is_null($startDate) && !$this->isValidDate($startDate))
+			$validationErrors['start_date'] = 'The start_date field must use the YYYY-MM-DD format.';
+
+		if (!is_null($endDate) && !$this->isValidDate($endDate))
+			$validationErrors['end_date'] = 'The end_date field must use the YYYY-MM-DD format.';
+
+		if (!empty($validationErrors))
+			$this->terminateWithValidationErrors($validationErrors);
+
+		$today = new DateTimeImmutable('today', new DateTimeZone('Europe/Vienna'));
+
+		if (is_null($startDate))
+			$startDate = $today->modify('-14 days')->format('Y-m-d');
+
+		if (is_null($endDate))
+			$endDate = $today->modify('+6 months')->format('Y-m-d');
+
+		if ($startDate > $endDate)
+		{
+			$this->terminateWithValidationErrors(array(
+				'end_date' => 'The end_date field must be on or after start_date.'
+			));
+		}
+
+		$userUID = getAuthUID();
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->library('KalenderLib', ['uid' => $userUID]);
+
+		$isUserEmployeeResult = $this->MitarbeiterModel->isMitarbeiter($userUID);
+		$isUserEmployee = $this->getDataOrTerminateWithError($isUserEmployeeResult);
+
+		if ($isUserEmployee)
+		{
+			$events = $this->kalenderlib->getPlanForLecturerByLecturer(
+				$startDate,
+				$endDate,
+				$userUID
+			);
+		}
+		else
+		{
+			$events = $this->kalenderlib->getPlanForStudentByStudent(
+				$startDate,
+				$endDate,
+				$userUID
+			);
+		}
+
+		if (!is_array($events))
+			$events = array();
+
+		$this->terminateWithSuccess($events);
+	}
+
+	/**
+	 * Checks whether a date uses the exact YYYY-MM-DD format.
+	 *
+	 * @param mixed $date
+	 * @return bool
+	 */
+	private function isValidDate($date)
+	{
+		if (!is_string($date) || $date === '')
+			return false;
+
+		$parsedDate = DateTimeImmutable::createFromFormat('!Y-m-d', $date);
+		$errors = DateTimeImmutable::getLastErrors();
+
+		return $parsedDate !== false
+			&& ($errors === false
+				|| ($errors['warning_count'] === 0 && $errors['error_count'] === 0))
+			&& $parsedDate->format('Y-m-d') === $date;
+	}
+}

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

@@ -44,9 +44,9 @@ class Kalender extends FHCAPI_Controller
 
 		$this->_ci->load->library('LogLib');
 		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
 		$this->_ci->load->library('KalenderSyncLib');
-		$this->_ci->load->library('RaumvorschlagLib');
+		$this->_ci->load->library('RaumvorschlagLib', ["uid" => getAuthUID()]);
 		$this->loadPhrases([
 			'ui'
 		]);

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

@@ -18,8 +18,8 @@ class OperationalResourceToCalenderAPI extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
 		$this->load->model('ressource/Kalender_model', 'KalenderModel');
 
-		$this->load->library('CollisionChecker');
-		$this->load->library('KalenderLib');
+		$this->_ci->load->library('CollisionChecker', ["uid" => getAuthUID()]);
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------

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

@@ -22,7 +22,7 @@ class Reservierung extends FHCAPI_Controller
 
 		$this->_ci->load->library('LogLib');
 		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
 
 		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
 		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');

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

@@ -20,6 +20,7 @@ class Tags extends Tag_Controller
 		]);
 
 	$this->config->load('tempus');
+	$this->load->model('ressource/KalenderNotiz_model', 'KalenderNotizModel');
 	}
 
 	public function getTag($readonly_tags = null)
@@ -30,14 +31,53 @@ class Tags extends Tag_Controller
 	{
 		parent::getTags($this->config->item('tempus_tags'));
 	}
-	public function getTagsByCalendar($eindeutige_kalender_gruppen_id = null)
+
+	public function getTagsByCalendar($eindeutige_kalender_gruppen_id)
 	{
-		parent::getTagsByAssignmentTypeValue('eindeutige_kalender_gruppen_id', $eindeutige_kalender_gruppen_id, $this->config->item('tempus_tags'));
+		$language = $this->_getLanguageIndex();
+		$index_bezeichnung_mehrsprachig = $language - 1;
+
+		$this->KalenderNotizModel->addSelect(
+			'tbl_kalender_notiz.notiz_id as notiz_id,
+			typ_kurzbz as tag_typ_kurzbz,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as bezeichnung,
+			style,
+			beschreibung,
+			tag,
+			tbl_notiz.erledigt as done
+			'
+		);
+
+		$this->KalenderNotizModel->addJoin('public.tbl_notiz', 'tbl_kalender_notiz.notiz_id = public.tbl_notiz.notiz_id');
+		$this->KalenderNotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
+
+		$this->KalenderNotizModel->addOrder('prioritaet');
+
+		$notiztypen = $this->KalenderNotizModel->loadWhere(array('aktiv' => true, 'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
+		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
 	}
+
 	public function addTag($withZuordnung = true, $updatable_tags = null)
 	{
-		parent::addTag(true, $this->config->item('tempus_tags'));
+		$postData = $this->getPostJson();
+
+		$return = array();
+		foreach ($postData->values as $value)
+		{
+			$insertResult = parent::addTag(false, $this->config->item('tempus_tags'));
+
+			$insertZuordnung = $this->KalenderNotizModel->insert(array(
+				'eindeutige_kalender_gruppen_id' => $value,
+				'notiz_id' => $insertResult,
+			));
+
+			if (isError($insertZuordnung))
+				$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+			$return[] = ['eindeutige_kalender_gruppen_id' => $value, 'id' => $insertResult];
+		}
+		$this->terminateWithSuccess($return);
 	}
+
 	public function updateTag($updatable_tags = null)
 	{
 		parent::updateTag($this->config->item('tempus_tags'));
@@ -50,4 +90,13 @@ class Tags extends Tag_Controller
 	{
 		parent::doneTag($this->config->item('tempus_tags'));
 	}
+
+	public function _getLanguageIndex()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->SpracheModel->addSelect('index');
+		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+		return hasData($result) ? getData($result)[0]->index : 1;
+	}
 }

application/controllers/jobs/TempusJob.php

@@ -13,7 +13,7 @@ class TempusJob extends JOB_Controller
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->helper('hlp_sancho_helper');
-		$this->_ci->load->library('KalenderLib');
+		$this->_ci->load->library('KalenderLib', ["uid" => null]);
 	}
 
 

application/controllers/system/MigrateKalender.php

@@ -32,6 +32,42 @@ class MigrateKalender extends CLI_Controller
 	/**
 	 * Everything has a beginning
 	 */
+	public function refreshTablesAndFullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
+	{
+		if (defined('CI_ENVIRONMENT') && CI_ENVIRONMENT === 'production')
+		{
+			echo "This script is not allowed to run in production environment.\n";
+			return;
+		}
+
+		echo "Refreshing calendar related tables...\n";
+		$this->resetBeforeNewStundenplanReservierungImport();
+		echo "Calendar related tables refreshed successfully.\n\n";
+
+		echo "Starting full migration of Stundenplan and Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->fullMigrateOfStundenplanReservierung($von, $bis, $studiengang_kz, $ort_kurzbz);
+		echo "Full migration of Stundenplan and Reservierung completed successfully.\n";
+	}
+
+	public function fullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
+	{
+		echo "Starting migration of Stundenplan from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->migrateStundenplan($von, $bis, $studiengang_kz);
+		echo "Stundenplan migration completed successfully.\n\n";
+
+		echo "Starting migration of Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->migrateReservierung($von, $bis, $ort_kurzbz);
+		echo "Reservierung migration completed successfully.\n\n";
+
+		echo "Starting migration of Stundenplan Betriebsmittel entries...\n";
+		$this->migrateStundenplanBetriebsmittelEntries();
+		echo "Stundenplan Betriebsmittel entries migration completed successfully.\n\n";
+
+		echo "Starting to add title values as tags to calendar entries...\n";
+		$this->addTitleValuesAsTagsToKalenderEntries();
+		echo "Adding title values as tags to calendar entries completed successfully.\n\n";
+	}
+
 	public function migrateStundenplan($von, $bis = null, $studiengang_kz = null)
 	{
 		if (is_null($von))
@@ -333,6 +369,121 @@ class MigrateKalender extends CLI_Controller
 		$dbModel->db->query($query);
 	}
 
+	public function addTitleValuesAsTagsToKalenderEntries() {
+		$dbModel = new DB_Model();
+
+		
+		$query = "SELECT 
+				k.eindeutige_kalender_gruppen_id,
+				ARRAY_AGG(DISTINCT(spd.titel) ORDER BY spd.titel) AS titel,
+				MAX(spd.updateamum) AS updateamum
+			FROM lehre.tbl_stundenplandev spd
+			JOIN sync.tbl_stundenplandev_kalender spdk ON spd.stundenplandev_id = spdk.stundenplandev_id
+			JOIN lehre.tbl_kalender k ON k.kalender_id = spdk.kalender_id
+			WHERE k.typ = 'lehreinheit' AND k.eindeutige_kalender_gruppen_id IS NOT NULL AND spd.titel IS NOT NULL
+			GROUP BY k.eindeutige_kalender_gruppen_id";
+
+		$result = $dbModel->execReadOnlyQuery($query);
+
+		if (isError($result)) {
+			error("Error while fetching title values for adding as tags: " . getError($result));
+			return;
+		}
+		if (!hasData($result)) {
+			error("No title values found for adding as tags.");
+			return;
+		}
+
+		$data = getData($result);
+
+		foreach($data as $block) {
+			$eindeutige_kalender_gruppen_id = $block->eindeutige_kalender_gruppen_id;
+			$notizText = implode(' - ', array_filter($block->titel, function($titel) {
+				return !empty(trim($titel));
+			}));
+
+			if (!empty($notizText)) {
+				$this->addTag($eindeutige_kalender_gruppen_id, $notizText, $block->updateamum);
+			}
+		}
+	}
+
+	private function resetBeforeNewStundenplanReservierungImport()
+	{
+		if (defined('CI_ENVIRONMENT') && CI_ENVIRONMENT === 'production')
+		{
+			echo "This script is not allowed to run in production environment.\n";
+			return;
+		}
+
+		$db = new DB_Model();
+
+		$db->db->trans_start();
+
+		$db->db->query('DELETE FROM sync.tbl_stundenplandev_kalender');
+		$db->db->query('DELETE FROM sync.tbl_reservierung_kalender');
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_event_teilnehmer
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_event
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_lehreinheit
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'lehreinheit' OR typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_ort
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ IN ('lehreinheit', 'reservierung')
+			)");
+
+		$db->db->query("DELETE FROM public.tbl_notiz
+			WHERE notiz_id IN (
+				SELECT notiz_id
+				FROM lehre.tbl_kalender_notiz
+				WHERE eindeutige_kalender_gruppen_id IN (
+					SELECT eindeutige_kalender_gruppen_id
+					FROM lehre.tbl_kalender
+				)
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_notiz
+			WHERE eindeutige_kalender_gruppen_id IN (
+				SELECT eindeutige_kalender_gruppen_id
+				FROM lehre.tbl_kalender
+			)");
+		
+		$db->db->query("DELETE FROM lehre.tbl_betriebsmittel_kalender
+			WHERE eindeutige_kalender_gruppen_id IN (
+				SELECT eindeutige_kalender_gruppen_id
+				FROM lehre.tbl_kalender
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender
+			WHERE typ IN ('lehreinheit', 'reservierung')");
+
+		$db->db->trans_complete();
+
+		if ($db->db->trans_status() === false)
+			return error('Reset before new import failed');
+
+		return success('Migration data reset successfully');
+	}
+
 	private function setKalendarEntriesGroupIDs() {
 		$dbModel = new DB_Model();
 
@@ -607,4 +758,129 @@ class MigrateKalender extends CLI_Controller
 			);
 		}
 	}
+
+	private function addTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem): bool
+	{
+		$notizType = 'hinweis';
+		$insertvonMockUser = 'oldToNewTempusMigration';
+		
+		if (is_null($eindeutige_kalender_gruppen_id) || empty($eindeutige_kalender_gruppen_id)) {
+			var_dump("Error: eindeutige_kalender_gruppen_id is null or empty.");
+			return false;
+		}
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
+		$this->load->model('ressource/KalenderNotiz_model', 'KalenderNotizModel');
+
+		$checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $notizType));
+
+		if (isError($checkTyp))
+		{
+			error("Error occurred while checking Notiztyp: " . $checkTyp->message);
+			return false;
+		}
+
+		if (!hasData($checkTyp))
+		{
+			error("Notiztyp 'hinweis' does not exist. Please create it before adding tags.");
+			return false;
+		}
+		 
+
+		$this->KalenderNotizModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_kalender_notiz.notiz_id', 'LEFT');
+		$this->KalenderNotizModel->db->where('tbl_notiz.typ', $notizType);
+		$this->KalenderNotizModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
+		$oldKalenderNotiz = $this->KalenderNotizModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
+		if (isError($oldKalenderNotiz))
+		{
+			error("Error occurred while checking KalenderNotiz: " . $oldKalenderNotiz->message);
+			return false;
+		}
+		if (hasData($oldKalenderNotiz))
+		{
+			return $this->updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem);
+		}
+
+		
+		$insertResult = $this->NotizModel->insert(array(
+			'titel' => 'TAG',
+			'text' => $notizText,
+			'verfasser_uid' => null,
+			'erledigt' => false,
+			'insertamum' => date('Y-m-d H:i:s'),
+			'insertvon' => $insertvonMockUser,
+			'typ' => $notizType
+		));
+
+		if (isError($insertResult))
+		{
+			error("Error occurred while inserting Notiz: " . $insertResult->message);
+			return false;
+		}
+
+		$insertKalenderNotiz = $this->KalenderNotizModel->insert(array(
+			'notiz_id' => $insertResult->retval,
+			'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id
+		));
+
+		if (isError($insertKalenderNotiz)) 
+		{
+			error("Error occurred while inserting KalenderNotiz: " . $insertKalenderNotiz->message);
+			return false;
+		}
+
+		return true;
+	}
+
+	private function updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem)
+	{
+		$notizType = 'hinweis';
+		$insertvonMockUser = 'oldToNewTempusMigration';
+		
+		$this->KalenderNotizModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_kalender_notiz.notiz_id', 'LEFT');
+		$this->KalenderNotizModel->db->where('tbl_notiz.typ', $notizType);
+		$this->KalenderNotizModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
+		$kalenderNotizRes = $this->KalenderNotizModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
+		if (isError($kalenderNotizRes))
+		{
+			error("Error occurred while loading KalenderNotiz: " . $kalenderNotizRes->message);
+			return false;
+		}
+
+
+		$tag = $this->NotizModel->loadWhere(array('notiz_id' => $kalenderNotizRes->retval[0]->notiz_id));
+		if (isError($tag))
+		{
+			error("Error occurred while loading Notiz: " . $tag->message);
+			return false;
+		}
+
+		if (!hasData($tag))
+		{
+			error("Error occurred while loading KalenderNotiz: " . $tag->message);
+			return false;
+		}
+
+		$adjustedLastUpdatedInOldSystem = date('Y-m-d H:i:s', strtotime($lastUpdatedInOldSystem) + 5);
+		if ($tag->retval[0]->updateamum >= $adjustedLastUpdatedInOldSystem)
+		{
+			return true;
+		}
+
+		$updateData = $this->NotizModel->update(array('notiz_id' => $tag->retval[0]->notiz_id),
+			array('text' => $notizText,
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => $insertvonMockUser,
+				'bearbeiter_uid' => null,
+			)
+		);
+		if (isError($updateData))
+		{
+			error("Error occurred while updating Notiz: " . $updateData->message);
+			return false;
+		}
+
+		return true;
+	}
 }

application/core/Tag_Controller.php

@@ -34,7 +34,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
+		
 		$this->loadPhrases([
 			'ui'
 		]);
@@ -122,36 +122,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$notiztypen = $this->NotiztypModel->loadWhere(array('aktiv' => true));
 		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
 	}
-	public function getTagsByAssignmentTypeValue($zuordnung_typ, $zuordnung_id, $tags = null)
-	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
 
-		$this->NotizzuordnungModel->addSelect(
-			'tbl_notizzuordnung.notiz_id as notiz_id,
-			typ_kurzbz as tag_typ_kurzbz,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as bezeichnung,
-			style,
-			beschreibung,
-			tag,
-			tbl_notiz.erledigt as done
-			'
-		);
-		
-		if (is_array($tags) && !isEmptyArray($tags))
-		{
-			$tags = $this->_filterTag($tags, false);
-			$this->NotizzuordnungModel->db->where_in('tbl_notiz_typ.typ_kurzbz', $tags);
-		}
-
-		$this->NotizzuordnungModel->addJoin('public.tbl_notiz', 'public.tbl_notizzuordnung.notiz_id = public.tbl_notiz.notiz_id');
-		$this->NotizzuordnungModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
-
-		$this->NotizzuordnungModel->addOrder('prioritaet');
-
-		$notiztypen = $this->NotizzuordnungModel->loadWhere(array('aktiv' => true, $zuordnung_typ => $zuordnung_id));
-		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
-	}
 	public function addTag($withZuordnung = true, $updatable_tags = null)
 	{
 		$postData = $this->getPostJson();

application/libraries/CollisionChecker.php

@@ -9,16 +9,23 @@ class CollisionChecker
 	private $_checks = [];
 
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$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->_ci->load->library('collision/checks/ResourcesCollisionCheck');
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
+		$this->_ci->load->library('collision/checks/RoomCollisionCheck', ['uid' => $this->_uid]);
+		$this->_ci->load->library('collision/checks/LectureCollisionCheck', ['uid' => $this->_uid]);
+		$this->_ci->load->library('collision/checks/VerbandCollisionCheck', ['uid' => $this->_uid]);
+		$this->_ci->load->library('collision/checks/StudentCollisionCheck', ['uid' => $this->_uid]);
+		$this->_ci->load->library('collision/checks/ResourcesCollisionCheck', ['uid' => $this->_uid]);
 		$this->register($this->_ci->roomcollisioncheck);
 		$this->register($this->_ci->lecturecollisioncheck);
 		$this->register($this->_ci->verbandcollisioncheck);
@@ -64,4 +71,4 @@ class CollisionChecker
 
 		return $results;
 	}
-}
+}

application/libraries/KalenderLib.php

@@ -5,9 +5,17 @@ if (! defined("BASEPATH")) exit("No direct script access allowed");
 class KalenderLib
 {
 	private $_ci;
-	public function __construct()
+	private $_uid;
+
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
 
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
 		$this->_ci->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
@@ -27,20 +35,34 @@ class KalenderLib
 		$this->_ci->load->model('organisation/Ferien_model', 'FerienModel');
 
 
-		$this->_ci->load->library('CollisionChecker');
+		$this->_ci->load->library('CollisionChecker', ['uid' => $this->_uid]);
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
 
 
 	}
 
-	private function _getBasePlan($start_date, $end_date)
+	private function _buildFilteredKalenderCte($start_date, $end_date)
+	{
+		$end_date = date('Y-m-d', strtotime($end_date . ' +1 day'));
+
+		return sprintf(
+			'WITH filtered_kalender AS MATERIALIZED (
+				SELECT *
+				FROM lehre.tbl_kalender
+				WHERE von >= timestamp %s
+					AND bis < timestamp %s
+			)',
+			$this->_ci->KalenderModel->db->escape(date('Y-m-d H:i:s', strtotime($start_date))),
+			$this->_ci->KalenderModel->db->escape(date('Y-m-d H:i:s', strtotime($end_date)))
+		);
+	}
+
+	private function _buildBasePlanQuery()
 	{
 		$language = $this->getLanguageIndex();
 		$index_bezeichnung_mehrsprachig = $language - 1;
 
-		$end_date = date('Y-m-d', strtotime($end_date . ' +1 day'));
-
 		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id,
 			tbl_kalender.eindeutige_kalender_gruppen_id,
 			tbl_kalender.status_kurzbz,
@@ -139,6 +161,7 @@ class KalenderLib
 		$this->_ci->KalenderModel->addJoin('public.tbl_benutzer resevierung_benutzer', 'reservierung_ma.mitarbeiter_uid = resevierung_benutzer.uid', 'LEFT');
 		$this->_ci->KalenderModel->addJoin('public.tbl_person reservierung_person', 'reservierung_person.person_id = resevierung_benutzer.person_id', 'LEFT');
 
+
 		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitgruppe', 'tbl_lehreinheit.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id', 'LEFT');
 		$this->_ci->KalenderModel->addJoin('public.tbl_gruppe le_gruppe', 'tbl_lehreinheitgruppe.gruppe_kurzbz = le_gruppe.gruppe_kurzbz', 'LEFT');
 		$this->_ci->KalenderModel->addJoin('public.tbl_lehrverband le_lehrverband',
@@ -177,7 +200,7 @@ class KalenderLib
 					n.erledigt AS done,
 					nt.prioritaet AS prioritaet,
 					nz.eindeutige_kalender_gruppen_id
-				FROM public.tbl_notizzuordnung AS nz
+				FROM lehre.tbl_kalender_notiz AS nz
 				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
 				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz " . $whereTags . "
 			) AS tag
@@ -216,12 +239,17 @@ class KalenderLib
 		$this->_ci->KalenderModel->db->join('lehre.tbl_stunde vonstunde', 'tbl_kalender.von::time = vonstunde.beginn', 'LEFT', FALSE);
 		$this->_ci->KalenderModel->db->join('lehre.tbl_stunde bisstunde', 'tbl_kalender.bis::time = bisstunde.ende', 'LEFT', FALSE);
 
-		$this->_ci->KalenderModel->db->where('tbl_kalender.von >=', $start_date);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.bis <', $end_date);
-
 		$this->_ci->KalenderModel->addOrder('tbl_kalender.eindeutige_kalender_gruppen_id', 'DESC');
 	}
 
+	private function _loadFilteredBasePlan($start_date, $end_date)
+	{
+		$query = $this->_buildFilteredKalenderCte($start_date, $end_date) . "\n" .
+			$this->_ci->KalenderModel->db->get_compiled_select('filtered_kalender AS tbl_kalender');
+
+		return $this->_ci->KalenderModel->execReadOnlyQuery($query);
+	}
+
 	private function _mapEvents($data, $collisionCheck = true)
 	{
 		$stundenplan_data = [];
@@ -243,6 +271,7 @@ class KalenderLib
 				$parsedResources = is_string($resources) ? json_decode($resources, true) : $resources;
 
 				$events[$id] = (object) [
+					'kalender_id' => $id,
 					'eindeutige_kalender_gruppen_id' => $row->eindeutige_kalender_gruppen_id,
 					'type' => $row->typ,
 					'beginn' => $von->format('H:i:s'),
@@ -261,7 +290,6 @@ class KalenderLib
 					'lehrveranstaltung_id' => $row->lehrveranstaltung_id,
 					'verplante_stunden' => $row->verplante_stunden,
 					'organisationseinheit' => isset($row->oe_kurzbz) ? $row->oe_kurzbz : '',
-					'kalender_id' => $id,
 					'lehreinheit_id' => [],
 					'lektor' => [],
 					'teilnehmer_gruppe' => [],
@@ -274,6 +302,7 @@ class KalenderLib
 					'has_assigned_resources' => !empty($parsedResources),
 					'resources' => is_array($parsedResources) ? $parsedResources : [],
 					'tags' => isset($row->tags) ? $row->tags : [],
+					'updateamum' => isset($row->updateamum) ? $row->updateamum : null,
 				];
 			}
 
@@ -369,10 +398,10 @@ class KalenderLib
 	}
 	public function getPlanByOrt($start_date, $end_date, $ort)
 	{
-		$this->_getBasePlan($start_date, $end_date);
+		$this->_buildBasePlanQuery();
 
 		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz', $ort);
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
 
 		return $this->_mapEvents($data);
 	}
@@ -382,7 +411,7 @@ class KalenderLib
 		$start_date = date('Y-m-d', strtotime($start_date));
 		$end_date = date('Y-m-d', strtotime($end_date . ' +1 day'));
 
-		$this->_getBasePlan($start_date, $end_date);
+		$this->_buildBasePlanQuery();
 
 		$this->_ci->KalenderModel->db->where('NOT EXISTS (
 											SELECT 1 FROM lehre.tbl_kalender nachfolger
@@ -414,7 +443,7 @@ class KalenderLib
 			$this->_ci->KalenderModel->db->group_end();
 		}
 
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
 		return $this->_mapEvents($data, false);
 	}
 
@@ -430,14 +459,14 @@ class KalenderLib
 
 		$kalender_entry = getData($kalender_entry)[0];
 
-		$this->_getBasePlan($kalender_entry->von, $kalender_entry->bis);
+		$this->_buildBasePlanQuery();
 		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id', $kalender_entry->kalender_id);
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($kalender_entry->von, $kalender_entry->bis);
 		return $this->_mapEvents($data);
 	}
 	public function getPlanForPlanner($start_date, $end_date, $ort = null, $uids = null, $studiengaenge = null)
 	{
-		$this->_getBasePlan($start_date, $end_date);
+		$this->_buildBasePlanQuery();
 
 		if (!is_null($ort))
 		{
@@ -540,26 +569,151 @@ class KalenderLib
 			) AS has_assigned_resources"
 		]);
 		
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
 
 		return $this->_mapEvents($data);
 	}
 
 	public function getPlanForStudent($start_date, $end_date)
 	{
-		$this->_getBasePlan($start_date, $end_date);
+		$this->_buildBasePlanQuery();
 
 		$this->_ci->KalenderModel->db->where_in('status_kurzbz', array('live', 'to_delete_live'));
 
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
 
 		return $this->_mapEvents($data);
 	}
 
+	public function getPlanForStudentByStudent($start_date, $end_date, $userUID)
+	{
+		$this->_buildBasePlanQuery();
+
+		$escapedUserUID = $this->_ci->KalenderModel->db->escape($userUID);
+
+		$benutzerExists = "EXISTS (
+			SELECT 1
+			FROM public.tbl_benutzer student_benutzer
+			WHERE student_benutzer.uid = $escapedUserUID
+		)";
+
+		$directEventTeilnehmerExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_event_teilnehmer event_teilnehmer
+			WHERE event_teilnehmer.kalender_id = tbl_kalender.kalender_id
+				AND event_teilnehmer.uid = $escapedUserUID
+		)";
+
+		$eventBenutzergruppeExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_event_teilnehmer event_gruppe
+			JOIN public.tbl_benutzergruppe event_benutzergruppe
+				ON event_benutzergruppe.gruppe_kurzbz = event_gruppe.gruppe_kurzbz
+				AND (
+					event_gruppe.studiensemester_kurzbz IS NULL
+					OR event_benutzergruppe.studiensemester_kurzbz = event_gruppe.studiensemester_kurzbz
+				)
+			WHERE event_gruppe.kalender_id = tbl_kalender.kalender_id
+				AND event_gruppe.gruppe_kurzbz IS NOT NULL
+				AND event_benutzergruppe.uid = $escapedUserUID
+		)";
+
+		$eventStudentlehrverbandExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_event_teilnehmer event_lehrverband
+			JOIN public.tbl_studentlehrverband event_studentlehrverband
+				ON event_studentlehrverband.student_uid = $escapedUserUID
+				AND event_studentlehrverband.studiengang_kz = event_lehrverband.studiengang_kz
+				AND (
+					event_lehrverband.studiensemester_kurzbz IS NULL
+					OR event_studentlehrverband.studiensemester_kurzbz = event_lehrverband.studiensemester_kurzbz
+				)
+				AND (
+					event_lehrverband.semester IS NULL
+					OR event_studentlehrverband.semester = event_lehrverband.semester
+				)
+				AND (
+					event_lehrverband.verband = event_studentlehrverband.verband
+					OR event_lehrverband.verband IS NULL
+					OR btrim(event_lehrverband.verband::text) = ''
+					OR event_studentlehrverband.verband IS NULL
+				)
+				AND (
+					event_lehrverband.gruppe = event_studentlehrverband.gruppe
+					OR event_lehrverband.gruppe IS NULL
+					OR btrim(event_lehrverband.gruppe::text) = ''
+					OR event_studentlehrverband.gruppe IS NULL
+				)
+			WHERE event_lehrverband.kalender_id = tbl_kalender.kalender_id
+				AND event_lehrverband.gruppe_kurzbz IS NULL
+				AND event_lehrverband.studiengang_kz IS NOT NULL
+		)";
+
+		$lehreinheitBenutzergruppeExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_lehreinheit student_kalender_lehreinheit
+			JOIN lehre.tbl_lehreinheit student_lehreinheit
+				ON student_lehreinheit.lehreinheit_id = student_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe student_lehreinheitgruppe
+				ON student_lehreinheitgruppe.lehreinheit_id = student_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe student_gruppe
+				ON student_gruppe.studiengang_kz = student_lehreinheitgruppe.studiengang_kz
+				AND student_gruppe.semester = student_lehreinheitgruppe.semester
+				AND student_gruppe.gruppe_kurzbz = student_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe student_benutzergruppe
+				ON student_benutzergruppe.gruppe_kurzbz = student_gruppe.gruppe_kurzbz
+				AND student_benutzergruppe.studiensemester_kurzbz = student_lehreinheit.studiensemester_kurzbz
+			WHERE student_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+				AND student_lehreinheitgruppe.gruppe_kurzbz IS NOT NULL
+				AND student_benutzergruppe.uid = $escapedUserUID
+		)";
+
+		$lehreinheitStudentlehrverbandExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_lehreinheit student_kalender_lehreinheit
+			JOIN lehre.tbl_lehreinheit student_lehreinheit
+				ON student_lehreinheit.lehreinheit_id = student_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe student_lehreinheitgruppe
+				ON student_lehreinheitgruppe.lehreinheit_id = student_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband student_lehrverband
+				ON student_lehrverband.student_uid = $escapedUserUID
+				AND student_lehrverband.studiengang_kz = student_lehreinheitgruppe.studiengang_kz
+				AND student_lehrverband.semester = student_lehreinheitgruppe.semester
+				AND student_lehrverband.studiensemester_kurzbz = student_lehreinheit.studiensemester_kurzbz
+				AND (
+					student_lehreinheitgruppe.verband = student_lehrverband.verband
+					OR student_lehreinheitgruppe.verband IS NULL
+					OR btrim(student_lehreinheitgruppe.verband::text) = ''
+					OR student_lehrverband.verband IS NULL
+				)
+				AND (
+					student_lehreinheitgruppe.gruppe = student_lehrverband.gruppe
+					OR student_lehreinheitgruppe.gruppe IS NULL
+					OR btrim(student_lehreinheitgruppe.gruppe::text) = ''
+					OR student_lehrverband.gruppe IS NULL
+				)
+			WHERE student_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+				AND student_lehreinheitgruppe.gruppe_kurzbz IS NULL
+		)";
+
+		$this->_ci->KalenderModel->db->where('status_kurzbz', 'live');
+		$this->_ci->KalenderModel->db->where($benutzerExists, null, false);
+		$this->_ci->KalenderModel->db->group_start();
+		$this->_ci->KalenderModel->db->where($directEventTeilnehmerExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($eventBenutzergruppeExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($eventStudentlehrverbandExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($lehreinheitBenutzergruppeExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($lehreinheitStudentlehrverbandExists, null, false);
+		$this->_ci->KalenderModel->db->group_end();
+
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
+
+		return $this->_mapEvents($data);
+	}
 
 	public function getPlanForLecturer($start_date, $end_date)
 	{
-		$this->_getBasePlan($start_date, $end_date);
+		$this->_buildBasePlanQuery();
 
 		$this->_ci->KalenderModel->addJoin(
 			'lehre.tbl_kalender neuerer',
@@ -571,10 +725,60 @@ class KalenderLib
 			OR (tbl_kalender.status_kurzbz = 'preview' AND neuerer.kalender_id IS NULL)
 			OR (tbl_kalender.status_kurzbz = 'live' AND neuerer.kalender_id IS NULL)
 		)", NULL, FALSE);
-		$data = $this->_ci->KalenderModel->load();
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
 
 		return $this->_mapEvents($data);
 	}
+
+	public function getPlanForLecturerByLecturer($start_date, $end_date, $userUID)
+	{
+		$this->_buildBasePlanQuery();
+
+		$escapedUserUID = $this->_ci->KalenderModel->db->escape($userUID);
+
+		$lehreinheitMitarbeiterExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_lehreinheit lecturer_kalender_lehreinheit
+			JOIN lehre.tbl_lehreinheit lecturer_lehreinheit
+				ON lecturer_lehreinheit.lehreinheit_id = lecturer_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitmitarbeiter lecturer_lehreinheitmitarbeiter
+				ON lecturer_lehreinheitmitarbeiter.lehreinheit_id = lecturer_lehreinheit.lehreinheit_id
+			WHERE lecturer_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+				AND lecturer_lehreinheitmitarbeiter.mitarbeiter_uid = $escapedUserUID
+		)";
+
+		$eventTeilnehmerExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_event_teilnehmer lecturer_event_teilnehmer
+			WHERE lecturer_event_teilnehmer.kalender_id = tbl_kalender.kalender_id
+				AND lecturer_event_teilnehmer.uid = $escapedUserUID
+		)";
+
+		$eventBenutzergruppeExists = "EXISTS (
+			SELECT 1
+			FROM lehre.tbl_kalender_event_teilnehmer lecturer_event_gruppe
+			JOIN public.tbl_benutzergruppe lecturer_benutzergruppe
+				ON lecturer_benutzergruppe.gruppe_kurzbz = lecturer_event_gruppe.gruppe_kurzbz
+				AND (
+					lecturer_event_gruppe.studiensemester_kurzbz IS NULL
+					OR lecturer_benutzergruppe.studiensemester_kurzbz = lecturer_event_gruppe.studiensemester_kurzbz
+				)
+			WHERE lecturer_event_gruppe.kalender_id = tbl_kalender.kalender_id
+				AND lecturer_event_gruppe.gruppe_kurzbz IS NOT NULL
+				AND lecturer_benutzergruppe.uid = $escapedUserUID
+		)";
+
+		$this->_ci->KalenderModel->db->where('tbl_kalender.status_kurzbz', 'live');
+		$this->_ci->KalenderModel->db->group_start();
+		$this->_ci->KalenderModel->db->where($lehreinheitMitarbeiterExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($eventTeilnehmerExists, null, false);
+		$this->_ci->KalenderModel->db->or_where($eventBenutzergruppeExists, null, false);
+		$this->_ci->KalenderModel->db->group_end();
+		
+		$data = $this->_loadFilteredBasePlan($start_date, $end_date);
+		return $this->_mapEvents($data);
+	}
+
 	public function getZeitsperren($start_date, $end_date, $emp)
 	{
 		$db = new DB_Model();
@@ -1123,6 +1327,7 @@ class KalenderLib
 				'bis' => $end_date,
 				'typ' => 'reservierung',
 				'status_kurzbz' => 'live',
+				'eindeutige_kalender_gruppen_id' => $this->_ci->KalenderModel->generateUniqueGroupId(),
 				'insertvon' => getAuthUID(),
 				'insertamum' => date('Y-m-d H:i:s')
 			)
@@ -1383,6 +1588,7 @@ class KalenderLib
 		$entryResult = $this->_loadKalenderEntry($kalender_id);
 		if (isError($entryResult)) return $entryResult;
 
+		
 		$kalender_entry = getData($entryResult);
 
 		if (!$this->_checkPermission($kalender_entry->lehreinheit_id))
@@ -1840,7 +2046,7 @@ class KalenderLib
 			else
 			{
 
-				if (!isEmptyArray($kalender_entry->ort_kurzbz))
+				if (!isEmptyArray($kalender_entry->ort_kurzbz) || !isEmptyString($kalender_entry->location))
 				{
 					$result = $this->_deleteOrtEntry($kalender_entry);
 					if (isError($result))

application/libraries/RaumvorschlagLib.php

@@ -7,10 +7,18 @@ use CI3_Events as Events;
 class RaumvorschlagLib
 {
 	private $_ci;
-	public function __construct()
+	private $_uid;
+
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
 
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
 		$this->_ci->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
 		$this->_ci->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
@@ -26,8 +34,8 @@ class RaumvorschlagLib
 		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
 		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 
-		$this->_ci->load->library('CollisionChecker');
-		$this->_ci->load->library('KalenderLib');
+		$this->_ci->load->library('CollisionChecker', ["uid" => getAuthUID()]);
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
 	}

application/libraries/VariableLib.php

@@ -14,9 +14,9 @@ class VariableLib
 	/**
 	 * VariableLib constructor.
 	 * Loads variable of logged in user.
-	 * @param $loggeduid
+	 * @param $params
 	 */
-	public function __construct($loggeduid)
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
 
@@ -25,8 +25,8 @@ class VariableLib
 		$this->_ci->load->model('system/Variable_model', 'VariableModel');
 		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 
-		if (isset($loggeduid['uid']) && !isEmptyString($loggeduid['uid']))
-			$this->_setVariables($loggeduid['uid']);
+		if (isset($params['uid']) && !isEmptyString($params['uid']))
+			$this->_setVariables($params['uid']);
 		else
 		{
 			show_error('uid of logged user not passed!');

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -4,10 +4,18 @@ class LectureCollisionCheck implements ICollisionCheck
 {
 
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
 		$this->_ci->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
 		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');

application/libraries/collision/checks/ResourcesCollisionCheck.php

@@ -4,12 +4,20 @@ class ResourcesCollisionCheck implements ICollisionCheck
 {
 
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 	}
 
@@ -91,4 +99,4 @@ class ResourcesCollisionCheck implements ICollisionCheck
 
 		return $grouped;
 	}
-}
+}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -4,12 +4,20 @@ class RoomCollisionCheck implements ICollisionCheck
 {
 
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 	}
 
@@ -87,4 +95,4 @@ class RoomCollisionCheck implements ICollisionCheck
 
 		return $grouped;
 	}
-}
+}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -3,12 +3,20 @@
 class StudentCollisionCheck implements ICollisionCheck
 {
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 	}
 
@@ -283,4 +291,4 @@ class StudentCollisionCheck implements ICollisionCheck
 
 		return $grouped;
 	}
-}
+}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -4,12 +4,20 @@ class VerbandCollisionCheck implements ICollisionCheck
 {
 
 	private $_ci;
+	private $_uid;
 
-	public function __construct()
+	public function __construct($params)
 	{
 		$this->_ci =& get_instance();
+		
+		if (isset($params['uid']) && !isEmptyString($params['uid'])){
+			$this->_uid = $params['uid'];
+		} else {
+			show_error('uid of logged user not passed!');
+		}
+
 		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('VariableLib', array('uid' => $this->_uid));
 		$this->_ci->load->library('PhrasesLib', array('ui'));
 
 	}
@@ -410,4 +418,4 @@ class VerbandCollisionCheck implements ICollisionCheck
 		return $grouped;
 	}
 
-}
+}

application/models/ressource/KalenderNotiz_model.php

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

application/models/ressource/Kalender_model.php

@@ -10,6 +10,8 @@ class Kalender_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_kalender';
 		$this->pk = 'kalender_id';
+
+		$this->load->helper('hlp_common');
 	}
 
 	public function generateUniqueGroupId()

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

@@ -133,6 +133,7 @@ export default {
 	template: /* html */ `
 	<div
 		class="fhc-calendar-base-grid-line"
+		:data-day="date.toISODate()"
 		style="position:relative;display:grid;grid-auto-flow:dense"
 		:style="'grid-template-' + axisRow + 's:subgrid'"
 	>

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

@@ -142,14 +142,14 @@ export default {
 		:class="classes"
 		style="z-index: 11"
 		:draggable="draggable"
+		:data-id="'event-' + event.orig.kalender_id"
+		:data-group-id="'event-group-' + event.orig.eindeutige_kalender_gruppen_id"
 		ref="eventEl"
 		@dragstart="onDragStart"
 		v-draggable:move.noimage="draggable ? dragKalenderCollection : {}"
 		v-drop:move.lehreinheit.kalender.reservierung="onDropOnCard"
 		v-cal-click:event="isHeaderOrFooter ? event : event.orig"
 		@contextmenu.prevent="onRightClick"
-		:data-id="'event-' + event.orig.kalender_id"
-		:data-group-id="'event-group-' + event.orig.eindeutige_kalender_gruppen_id"
 		data-cy="calendar-event"
 	>
 		<div

system/dbupdate_3.4.php

@@ -99,8 +99,6 @@ require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
 require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
 require_once('dbupdate_3.4/77375_ressourcen.php');
-require_once('dbupdate_3.4/78052_tempus_tag_events.php');
-require_once('dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php');
 require_once('dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php');
 require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
@@ -108,8 +106,8 @@ require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
 require_once('dbupdate_3.4/77949_tempus_synchronisation.php');
 require_once('dbupdate_3.4/78287_tempus_raumzuordnung.php');
-
 require_once('dbupdate_3.4/78285_tempus_stundenraster.php');
+require_once('dbupdate_3.4/83437_kalender_notiz_tbl.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/78052_tempus_tag_events.php

@@ -1,19 +0,0 @@
-<?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-$result = $db->db_query("SELECT 1
-	FROM information_schema.columns
-	WHERE table_schema = 'public'
-		AND table_name = 'tbl_notizzuordnung'
-		AND column_name = 'eindeutige_kalender_gruppen_id'");
-
-if ($db->db_num_rows($result) === 0)
-{
-	$qry = "ALTER TABLE public.tbl_notizzuordnung
-		ADD COLUMN eindeutige_kalender_gruppen_id UUID NULL DEFAULT NULL";
-
-	if (!$db->db_query($qry))
-		echo '<strong>public.tbl_notizzuordnung: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>public.tbl_notizzuordnung: eindeutige_kalender_gruppen_id column added';
-}

system/dbupdate_3.4/83437_kalender_notiz_tbl.php

@@ -0,0 +1,279 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if (!$result = @$db->db_query('SELECT 0 FROM lehre.tbl_kalender_notiz WHERE 0 = 1'))
+{
+	//TODO zuordnung typ definieren
+	$qry = 'CREATE TABLE lehre.tbl_kalender_notiz (
+				eindeutige_kalender_gruppen_id UUID NOT NULL,
+				notiz_id integer NOT NULL,
+
+				CONSTRAINT tbl_kalender_notiz_pk PRIMARY KEY (eindeutige_kalender_gruppen_id, notiz_id),
+				CONSTRAINT tbl_kalender_notiz_notiz_fk FOREIGN KEY (notiz_id)
+					REFERENCES public.tbl_notiz (notiz_id)
+					ON DELETE CASCADE ON UPDATE CASCADE
+			);';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender_notiz: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_kalender_notiz table created';
+
+	$qry = 'GRANT SELECT ON TABLE lehre.tbl_kalender_notiz TO web;';
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender_notiz: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>web</strong> on lehre.tbl_kalender_notiz';
+
+	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE lehre.tbl_kalender_notiz TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender_notiz: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on lehre.tbl_kalender_notiz';
+
+	// Delete the related note when its calendar-note assignment no longer exists.
+	$result = $db->db_query("SELECT 1
+		FROM pg_catalog.pg_proc AS p
+		JOIN pg_catalog.pg_namespace AS n ON n.oid = p.pronamespace
+		WHERE n.nspname = 'lehre'
+			AND p.proname = 'cleanup_notiz_on_kalender_notiz_delete'
+			AND p.proargtypes = ''::oidvector");
+
+	if ($db->db_num_rows($result) === 0)
+	{
+		$qry = 'CREATE FUNCTION lehre.cleanup_notiz_on_kalender_notiz_delete()
+		RETURNS trigger
+		LANGUAGE plpgsql
+		SECURITY DEFINER
+		SET search_path = pg_catalog
+		AS $function$
+		BEGIN
+			DELETE FROM public.tbl_notiz
+			WHERE notiz_id = OLD.notiz_id
+				AND NOT EXISTS (
+					SELECT 1
+					FROM lehre.tbl_kalender_notiz
+					WHERE eindeutige_kalender_gruppen_id = OLD.eindeutige_kalender_gruppen_id
+						AND notiz_id = OLD.notiz_id
+				);
+
+			RETURN OLD;
+		END;
+		$function$;';
+
+		if (!$db->db_query($qry))
+			echo '<strong>lehre.tbl_notiz cleanup function: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>lehre.tbl_notiz cleanup function created';
+	}
+
+	$qry = 'CREATE TRIGGER cleanup_notiz_on_kalender_notiz_delete
+		AFTER DELETE ON lehre.tbl_kalender_notiz
+		FOR EACH ROW
+		EXECUTE PROCEDURE lehre.cleanup_notiz_on_kalender_notiz_delete();';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_notiz cleanup trigger: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_notiz cleanup trigger created';
+}
+
+// Delete note assignments after a physical delete or when every row in the
+// calendar group has an inactive status.
+$result = $db->db_query("SELECT 1
+	FROM pg_catalog.pg_proc AS p
+	JOIN pg_catalog.pg_namespace AS n ON n.oid = p.pronamespace
+	WHERE n.nspname = 'lehre'
+		AND p.proname = 'cleanup_kalender_notiz'
+		AND p.proargtypes = ''::oidvector");
+
+if ($db->db_num_rows($result) === 0)
+{
+	$qry = 'CREATE FUNCTION lehre.cleanup_kalender_notiz()
+		RETURNS trigger
+		LANGUAGE plpgsql
+		SECURITY DEFINER
+		SET search_path = pg_catalog
+		AS $function$
+		DECLARE
+			gruppen_id UUID;
+		BEGIN
+			IF TG_OP = \'DELETE\' THEN
+				gruppen_id := OLD.eindeutige_kalender_gruppen_id;
+			ELSIF TG_OP = \'UPDATE\' THEN
+				IF (NEW.status_kurzbz IS DISTINCT FROM \'deleted\'
+					AND NEW.status_kurzbz IS DISTINCT FROM \'archived\')
+					OR OLD.status_kurzbz IS NOT DISTINCT FROM NEW.status_kurzbz
+				THEN
+					RETURN NEW;
+				END IF;
+
+				gruppen_id := NEW.eindeutige_kalender_gruppen_id;
+			ELSE
+				RETURN NULL;
+			END IF;
+
+			IF NOT EXISTS (
+				SELECT 1
+				FROM lehre.tbl_kalender
+				WHERE eindeutige_kalender_gruppen_id = gruppen_id
+					AND status_kurzbz IS DISTINCT FROM \'deleted\'
+					AND status_kurzbz IS DISTINCT FROM \'archived\'
+			)
+			THEN
+				DELETE FROM lehre.tbl_kalender_notiz
+				WHERE eindeutige_kalender_gruppen_id = gruppen_id;
+			END IF;
+
+			IF TG_OP = \'DELETE\' THEN
+				RETURN OLD;
+			END IF;
+
+			RETURN NEW;
+		END;
+		$function$;';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender_notiz cleanup function: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_kalender_notiz cleanup function created';
+}
+
+$result = $db->db_query("SELECT 1
+	FROM pg_catalog.pg_trigger AS t
+	JOIN pg_catalog.pg_class AS c ON c.oid = t.tgrelid
+	JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
+	WHERE n.nspname = 'lehre'
+		AND c.relname = 'tbl_kalender'
+		AND t.tgname = 'cleanup_kalender_notiz'
+		AND NOT t.tgisinternal");
+
+if ($db->db_num_rows($result) === 0)
+{
+	$qry = 'CREATE TRIGGER cleanup_kalender_notiz
+		AFTER DELETE OR UPDATE OF status_kurzbz ON lehre.tbl_kalender
+		FOR EACH ROW
+		EXECUTE PROCEDURE lehre.cleanup_kalender_notiz();';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender_notiz cleanup trigger: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_kalender_notiz cleanup trigger created';
+}
+
+// Delete resource assignments after a physical delete or when every row in the
+// calendar group has an inactive status.
+$result = $db->db_query("SELECT 1
+	FROM pg_catalog.pg_proc AS p
+	JOIN pg_catalog.pg_namespace AS n ON n.oid = p.pronamespace
+	WHERE n.nspname = 'lehre'
+		AND p.proname = 'cleanup_betriebsmittel_kalender'
+		AND p.proargtypes = ''::oidvector");
+
+if ($db->db_num_rows($result) === 0)
+{
+	$qry = 'CREATE FUNCTION lehre.cleanup_betriebsmittel_kalender()
+		RETURNS trigger
+		LANGUAGE plpgsql
+		SECURITY DEFINER
+		SET search_path = pg_catalog
+		AS $function$
+		DECLARE
+			gruppen_id UUID;
+		BEGIN
+			IF TG_OP = \'DELETE\' THEN
+				gruppen_id := OLD.eindeutige_kalender_gruppen_id;
+			ELSIF TG_OP = \'UPDATE\' THEN
+				IF (NEW.status_kurzbz IS DISTINCT FROM \'deleted\'
+					AND NEW.status_kurzbz IS DISTINCT FROM \'archived\')
+					OR OLD.status_kurzbz IS NOT DISTINCT FROM NEW.status_kurzbz
+				THEN
+					RETURN NEW;
+				END IF;
+
+				gruppen_id := NEW.eindeutige_kalender_gruppen_id;
+			ELSE
+				RETURN NULL;
+			END IF;
+
+			IF NOT EXISTS (
+				SELECT 1
+				FROM lehre.tbl_kalender
+				WHERE eindeutige_kalender_gruppen_id = gruppen_id
+					AND status_kurzbz IS DISTINCT FROM \'deleted\'
+					AND status_kurzbz IS DISTINCT FROM \'archived\'
+			)
+			THEN
+				DELETE FROM lehre.tbl_betriebsmittel_kalender
+				WHERE eindeutige_kalender_gruppen_id = gruppen_id;
+			END IF;
+
+			IF TG_OP = \'DELETE\' THEN
+				RETURN OLD;
+			END IF;
+
+			RETURN NEW;
+		END;
+		$function$;';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_betriebsmittel_kalender cleanup function: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_betriebsmittel_kalender cleanup function created';
+}
+
+$result = $db->db_query("SELECT 1
+	FROM pg_catalog.pg_trigger AS t
+	JOIN pg_catalog.pg_class AS c ON c.oid = t.tgrelid
+	JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
+	WHERE n.nspname = 'lehre'
+		AND c.relname = 'tbl_kalender'
+		AND t.tgname = 'cleanup_betriebsmittel_kalender'
+		AND NOT t.tgisinternal");
+
+if ($db->db_num_rows($result) === 0)
+{
+	$qry = 'CREATE TRIGGER cleanup_betriebsmittel_kalender
+		AFTER DELETE OR UPDATE OF status_kurzbz ON lehre.tbl_kalender
+		FOR EACH ROW
+		EXECUTE PROCEDURE lehre.cleanup_betriebsmittel_kalender();';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_betriebsmittel_kalender cleanup trigger: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_betriebsmittel_kalender cleanup trigger created';
+}
+
+$result = $db->db_query("SELECT 1
+	FROM information_schema.columns
+	WHERE table_schema = 'public'
+		AND table_name = 'tbl_notizzuordnung'
+		AND column_name = 'eindeutige_kalender_gruppen_id'");
+
+if ($db->db_num_rows($result) === 1)
+{
+	$qry = "ALTER TABLE public.tbl_notizzuordnung
+		DROP COLUMN eindeutige_kalender_gruppen_id";
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_notizzuordnung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_notizzuordnung: eindeutige_kalender_gruppen_id column removed';
+}
+
+$result = $db->db_query("SELECT 1
+	FROM information_schema.columns
+	WHERE table_schema = 'public'
+		AND table_name = 'tbl_notizzuordnung'
+		AND column_name = 'eindeutige_gruppen_id'");
+
+if ($db->db_num_rows($result) === 1)
+{
+	$qry = "ALTER TABLE public.tbl_notizzuordnung
+		DROP COLUMN eindeutige_gruppen_id";
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_notizzuordnung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_notizzuordnung: eindeutige_gruppen_id column removed';
+}

webdav/auth.class.php

@@ -31,6 +31,6 @@ class myauth extends \Sabre\DAV\Auth\Backend\AbstractBasic
 			return true;	
 		else
 			return false;
+		}
 	}
-}
 ?>