gui fuer kalender sync hinzugefuegt und syncjob angepasst

# Conflicts:
#	public/js/components/Calendar/Base/DragAndDrop.js
#	public/js/components/Calendar/Base/Grid/Line.js
#	public/js/composables/EventLoader.js

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/abgabe.php

@@ -29,7 +29,7 @@ $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 // benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
 // wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
 $config['NONFINAL_NOTEN_ABGABETOOL'] = [9];
-$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
+$config['beurteilung_link_fallback'] = 'cis/private/lehre/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
@@ -38,8 +38,19 @@ $config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
 
 // to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
 $config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
+// TODO: check if these links change if the file changes and how to better retrieve the link?
+$config['SIGNATUR_INFO_LINK_GERMAN'] = 'https://cis.technikum-wien.at/cms/dms.php?id=214779'; 
+$config['SIGNATUR_INFO_LINK_ENGLISH'] = 'https://cis.technikum-wien.at/cms/dms.php?id=264256';
 
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
 
 $config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;
+
+$config['MULTIEDIT_TABLE'] = true;
+
+$config['STUDENT_EDIT_PROJEKTARBEIT_TITLE'] = true;
+
+$config['CONFETTI_ON_ENDUPLOAD'] = true;
+
+

application/config/studierendenantrag.php

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

application/config/tempus.php

@@ -0,0 +1,5 @@
+<?php
+
+$config['send_update_mails'] = false;
+$config['calendar_start'] = 7;
+$config['calendar_end'] = 23;

application/controllers/Tempus.php

@@ -0,0 +1,60 @@
+<?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');
+	}
+
+	public function index()
+	{
+		$this->_loadView();
+	}
+
+	public function sync()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+		$this->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz', 'LEFT');
+		$organisationen = getData($this->StudiengangModel->loadWhere(array('tbl_studiengang.aktiv' => 'true')));
+
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$studiensemestern = getData($this->StudiensemesterModel->load());
+
+		$this->_loadView(array('organisationen' => $organisationen, 'studiensemestern' => $studiensemestern));
+	}
+
+	private function _loadView($extraVariables = [])
+	{
+		$this->load->view('Tempus', [
+			'permissions' => [
+				'admin' => $this->permissionlib->isBerechtigt('admin')
+			],
+			'variables' => array_merge([
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
+				'timezone' => $this->config->item('timezone')
+			], $extraVariables)
+		]);
+	}
+}

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

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

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

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

application/controllers/api/frontend/v1/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/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/lv/StgTree.php

@@ -25,7 +25,25 @@ class StgTree extends FHCAPI_Controller
 			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
 		}
 
-		return $this->getStudiengang($method);
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+
+
+
 		show_404();
 	}
 
@@ -64,16 +82,27 @@ class StgTree extends FHCAPI_Controller
 		$this->terminateWithSuccess($list);
 	}
 
-	protected function getStudiengang($studiengang_kz)
+	protected function getStudiengang($studiengang_kz, $org_form = null)
 	{
 		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
 
 		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
 
 		$this->StudiengangModel->addDistinct();
 		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
-		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
-		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+		$this->StudiengangModel->addSelect("CONCAT(
+			UPPER(CONCAT(typ, kurzbz)), 
+			'-', 
+			semester, 
+			(
+				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
+				FROM public.tbl_lehrverband 
+				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
+				ORDER BY verband, gruppe LIMIT 1
+			)
+		) AS name", false);
 
 		$this->StudiengangModel->addSelect('semester');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
@@ -97,6 +126,8 @@ class StgTree extends FHCAPI_Controller
 				$this->StudienordnungModel->addDistinct();
 				$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS orgform_kurzbz");
+				$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
 				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
 
 				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
@@ -111,6 +142,115 @@ class StgTree extends FHCAPI_Controller
 				$list = array_merge($list, $result);
 			}
 		}
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
+		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$list = array_merge($list, $result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
+		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester)
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($list);
 	}

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

@@ -90,6 +90,15 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
+		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+	
+	private function fetchProjektarbeitById($projektarbeit_id) {
+		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -97,13 +106,10 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		$result = $this->ProjektarbeitModel->loadWhere(
+		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -132,7 +138,8 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-
+		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
+		
 		$this->terminateWithSuccess($data);
 	}
 
@@ -280,10 +287,7 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
-		$this->NoteModel->addOrder('notenwert', 'ASC');
-		$this->NoteModel->addOrder('bezeichnung', 'ASC');
-
-		$result = $this->NoteModel->load();
+		$result = $this->NoteModel->getAllActive();
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 

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

@@ -25,9 +25,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
-	private $allowedStgs = [];
-
-
 	public function __construct()
 	{
 		$permissions = [];
@@ -35,16 +32,17 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
-		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$this->allowedStgs) {
+		if (!$allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}
 
 		// Load Libraries
 		$this->load->library('PhrasesLib');
+		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -111,23 +109,19 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -135,16 +129,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
-		
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -164,10 +155,7 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -187,14 +175,12 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -202,16 +188,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -231,23 +214,18 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -255,16 +233,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -313,8 +288,6 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -331,38 +304,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
+		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
 
 		if ($orgform_kurzbz) {
-			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
 		}
 
 		switch ($filter) {
 			case "interessenten":
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				break;
 			case "bewerbungnichtabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
 				break;
 			case "bewerbungabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
-				$where['ps.bestaetigtam'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
 				break;
 			case "statusbestaetigt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -374,69 +347,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				
 				if ($stg->typ == 'm') {
-					$where['zgvmas_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgvmas_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
 				} elseif ($stg->typ == 'p') {
-					$where['zgvdoktor_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$where['zgvdoktor_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
 				} else {
-					$where['zgv_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgv_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgv_erfuellt', true);
 				}
 				break;
 			case "reihungstestangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
 				break;
 			case "bewerberrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = true;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', true);
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = false;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', false);
 				break;
 			case "aufgenommen":
-				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
 				break;
 			case "warteliste":
-				$where['ps.status_kurzbz'] = 'Wartender';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
 				break;
 			case "absage":
-				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$where['ps.status_kurzbz'] = 'Incoming';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
 				break;
 			case "absolvent":
-				$where['ps.status_kurzbz'] = 'Absolvent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
 				break;
 			case "diplomand":
-				$where['ps.status_kurzbz'] = 'Diplomand';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -444,9 +417,9 @@ class Students extends FHCAPI_Controller
 					 * show all prestudents in this stg who don't have a status
 					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
 					 */
-					$where['ps.status_kurzbz'] = null;
+					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
 				} else {
-					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+					$this->studentlistlib->addWhere('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -457,21 +430,19 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz);
-		
-		$this->PrestudentModel->addSelect("
+		$this->studentlistlib->addSelect("
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
 				THEN ps.ausbildungssemester::text 
 				ELSE ''::text 
 			END AS semester", false);
-		$this->PrestudentModel->addSelect("'' AS verband");
-		$this->PrestudentModel->addSelect("'' AS gruppe");
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addSelect("'' AS verband");
+		$this->studentlistlib->addSelect("'' AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -574,7 +545,6 @@ class Students extends FHCAPI_Controller
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -582,34 +552,29 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz, '');
+		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
+		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
 
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
-
-
-		$where = [];
+		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
 
 		if ($gruppe_kurzbz !== null) {
-			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
-			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
-			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
+			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
+			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
 		} else {
-			$where['v.studiengang_kz'] = $studiengang_kz;
+			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
 
 			if ($semester !== null)
-				$where['v.semester'] = $semester;
+				$this->studentlistlib->addWhere('v.semester', $semester);
 
 			if ($verband !== null)
-				$where['v.verband'] = $verband;
+				$this->studentlistlib->addWhere('v.verband', $verband);
 
 			if ($gruppe !== null)
-				$where['v.gruppe'] = $gruppe;
+				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->PrestudentModel->db->where(
+				$this->studentlistlib->addWhere(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -623,9 +588,10 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -652,11 +618,8 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -664,16 +627,15 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
+		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
 
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'tbl_prestudent.prestudent_id' => $prestudent_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -700,23 +662,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
-
 
+		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			's.student_uid' => $student_uid
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -744,21 +696,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addWhere('p.person_id', $person_id);
 
+		
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'p.person_id' => $person_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -790,29 +734,8 @@ class Students extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  AS statusofsemester"
-		);
-
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
 		$prestudent_ids = [];
 		$student_uids = [];
-			$this->addMeta('data', $data);
 		foreach ($data as $row) {
 			$dataset = json_decode($row->data);
 			if ($row->type == 'prestudent') {
@@ -822,197 +745,38 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
+		$this->studentlistlib->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+
+
 		if ($prestudent_ids && $student_uids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
+			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}
 
-		$result = $this->PrestudentModel->load();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * @param string|null	$studiensemester_kurzbz
-	 * @param string		$type
-	 *
-	 * @return void
-	 */
-	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
-	{
-		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
-
-		$this->load->config('stv');
-
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$tags = $this->config->item('stv_prestudent_tags');
-
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->db->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-			}
-			$subQueryTag = "
-			  (
-				SELECT
-				  tag.prestudent_id,
-				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-				  SELECT DISTINCT ON (n.notiz_id)
-					n.notiz_id AS id,
-					nt.typ_kurzbz,
-					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-					n.text AS notiz,
-					nt.style,
-					n.erledigt AS done,
-					nz.prestudent_id
-				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-				. $whereTags .
-				"
-				) AS tag
-				GROUP BY tag.prestudent_id
-			  ) AS tag_data_agg
-			";
-		}
-
-		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
-			$type
-		);
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
-			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
-			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
-
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
-
-
-		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
-		$this->PrestudentModel->addSelect('titelpre');
-		$this->PrestudentModel->addSelect('nachname');
-		$this->PrestudentModel->addSelect('vorname');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('foto');
-		$this->PrestudentModel->addSelect('foto_sperre');
-
-		// semester
-		// verband
-		// gruppe
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  AS statusofsemester"
-		);
-
-		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
-		$this->PrestudentModel->addSelect("s.matrikelnr");
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
-		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
-		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect("
-			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
-			ELSE '' END AS mail_intern", false);
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-
-		// priorisierung_relativ
-
-		$this->PrestudentModel->addSelect('mentor');
-		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
-
-		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function addSelectPrioRel()
-	{
-		$this->PrestudentModel->addSelect("(
-			SELECT count(*)
-			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
-				WHERE person_id = p.person_id
-				AND studiensemester_kurzbz = (
-					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id = tbl_prestudent.prestudent_id
-					AND status_kurzbz = 'Interessent'
-					LIMIT 1
-				)
-				AND status_kurzbz = 'Interessent'
-			) prest
-			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
-			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
-	}
-
 	/**
 	 * Adds additional filters to the query
 	 *

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

@@ -0,0 +1,124 @@
+<?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'],
+			'updateCollision' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+	}
+
+	public function get()
+	{
+		$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->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();
+	}
+
+	public function updateCollision()
+	{
+		$original_ignore = $this->_ci->variablelib->getVar('ignore_kollision');
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_kollision',
+			$original_ignore === 'true' ? 'false' : 'true'
+		);
+	}
+
+}

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

@@ -0,0 +1,228 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Coursepicker extends FHCAPI_Controller
+{
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'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 getByStg()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('studiengaenge[]',"studiengaenge","required");
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$studiengaenge = $this->input->post('studiengaenge');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->_ci->LehreinheitModel->addSelect('
+			tbl_lehreinheit.lehreinheit_id,
+			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', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
+		$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');
+
+		$this->_ci->LehreinheitModel->db->group_start();
+		$first = true;
+		foreach ($studiengaenge as $studiengang)
+		{
+			if ($first)
+				$this->_ci->LehreinheitModel->db->group_start();
+			else
+			{
+				$this->_ci->LehreinheitModel->db->or_group_start();
+			}
+			$first = false;
+
+			$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang['studiengang_kz']);
+
+			if (isset($studiengang['semester']))
+				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.semester', $studiengang['semester']);
+
+			if (isset($studiengang['orgform_kurzbz']))
+				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.orgform_kurzbz', $studiengang['orgform_kurzbz']);
+
+			$this->_ci->LehreinheitModel->db->group_end();
+		}
+		$this->_ci->LehreinheitModel->db->group_end();
+
+		$result = $this->_ci->LehreinheitModel->loadWhere(array(
+			'tbl_lehrform.verplanen' => true,
+			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$result = hasData($result) ? getData($result) : array();
+
+		$lehreinheit_ids = array_values(array_unique(array_column($result, 'lehreinheit_id')));
+
+		$offen_map = array();
+		if (!empty($lehreinheit_ids))
+		{
+			$offen_result = $this->_ci->LehreinheitModel->getOffeneStunden($lehreinheit_ids);
+			if (hasData($offen_result))
+			{
+				foreach (getData($offen_result) as $row)
+				{
+					$offen_map[$row->lehreinheit_id . '_' . $row->mitarbeiter_uid] = $row;
+				}
+			}
+		}
+
+		$grouped = array();
+
+		foreach ($result as $row)
+		{
+			$lehreinheit_id = $row->lehreinheit_id;
+			if (!isset($grouped[$lehreinheit_id]))
+			{
+				$grouped[$lehreinheit_id] = (object)array(
+					'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' => $lehreinheit_id,
+					'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[$lehreinheit_id];
+
+			$group->lektoren[$row->lektor_uid] = (object)array(
+				'uid' => $row->lektor_uid,
+				'kurzbz' => trim($row->lektor),
+				'name' => $row->vorname . ' ' . $row->nachname,
+			);
+
+			$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;
+
+			$offen_key = $lehreinheit_id . '_' . $row->lektor_uid;
+			$offen = isset($offen_map[$offen_key]) ? $offen_map[$offen_key] : null;
+			$verplant_wert = $offen ? $offen->verplant : 0;
+			$offenestunden_wert = $offen ? $offen->offenestunden : 0;
+
+			$group->verplant[] = $verplant_wert;
+			$group->offenestunden[] = $offenestunden_wert;
+			$group->verplant_gesamt += $verplant_wert;
+
+			$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($values) > 1)
+			$formatted .= ' ?';
+
+		return $formatted;
+	}
+
+
+}

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

@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['tempus_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess(isset($data['tempus_favorites']) ? $data['tempus_favorites'] : null);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'tempus_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}

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

@@ -0,0 +1,37 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Info extends FHCAPI_Controller
+{
+
+	private $_ci;
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiengaenge' => self::PERM_LOGGED,
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->loadPhrases([
+			'ui'
+		]);
+
+	}
+
+	public function getStudiengaenge()
+	{
+		$this->_ci->StudiengangModel->addDistinct();
+		$this->_ci->StudiengangModel->addSelect('studiengang_kz');
+		$this->_ci->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name");
+
+		$result = $this->getDataOrTerminateWithError($this->_ci->StudiengangModel->load());
+		$this->terminateWithSuccess($result);
+	}
+}

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

@@ -0,0 +1,438 @@
+<?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,
+			'getCalendarHours' => 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',
+			'calculateMultiWeekPlan' => 'lehre/lvplan:rw',
+			'confirmMultiWeekPlan' => 'lehre/lvplan:rw',
+			'addToKalenderEvent' => '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->_ci->load->library('KalenderSyncLib');
+		$this->_ci->load->library('RaumvorschlagLib');
+		$this->loadPhrases([
+			'ui'
+		]);
+		$this->_ci->load->config('tempus');
+
+
+		$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 getCalendarHours()
+	{
+		$calender_start = $this->_ci->config->item('calendar_start') ?? 7;
+		$calender_end = $this->_ci->config->item('calendar_end') ?? 23;
+
+		$this->terminateWithSuccess(array(
+			'start' => $calender_start,
+			'end' => $calender_end
+		));
+	}
+
+	public function getPlan()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$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->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('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),  $result->code);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function getRaumvorschlag()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+
+		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
+		$this->terminateWithSuccess($this->_ci->raumvorschlaglib->getVorschlaege($filter->kalender_id));
+	}
+
+	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(getData($result));
+	}
+
+	public function sync()
+	{
+		$result = $this->_ci->kalendersynclib->sync();
+		$this->terminateWithSuccess(getData($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(getData($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(getData($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(getData($result));
+	}
+
+	public function calculateMultiWeekPlan()
+	{
+		$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->calculateMultiWeekPlan($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function confirmMultiWeekPlan()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('plan[]',"plan","required");
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$plan = $this->_ci->input->post('plan', TRUE);
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->confirmMultiWeekPlan($plan, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function addToKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('target_kalender_id',"target_kalender_id","required");
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$target_kalender_id = $this->_ci->input->post('target_kalender_id', TRUE);
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->addToKalenderEvent($target_kalender_id, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+
+	private function _checkFilter($filters)
+	{
+		$filter_valid = true;
+		$filter_object = new stdClass();
+		foreach ($filters as $filter)
+		{
+			if ($this->_ci->input->post($filter))
+			{
+				$filter_valid = true;
+				$filter_object->$filter = $this->_ci->input->post($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/KalenderSync.php

@@ -0,0 +1,298 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+
+class KalenderSync extends FHCAPI_Controller
+{
+	private $_ci;
+
+	const ALLOWED_STATUS = ['preview', 'live'];
+	public function __construct()
+	{
+		parent::__construct([
+			'getSyncs' => ['admin:r', 'assistenz:r'],
+			'loadSync' => ['admin:r', 'assistenz:r'],
+			'add' => ['admin:r', 'assistenz:r'],
+			'start' => ['admin:r', 'assistenz:r'],
+			'delete' => ['admin:r', 'assistenz:r'],
+			'updateSync' => ['admin:r', 'assistenz:r'],
+			'getStudienplan' => ['admin:r', 'assistenz:r'],
+			'getSyncStatus' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->loadPhrases([
+			'lehre',
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
+		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+		$this->_ci->load->library('KalenderSyncLib');
+	}
+
+	public function getSyncs()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
+
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderStatusModel->addSelect('tbl_kalender_syncstatus.*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS sync_status_kurzbz, tbl_organisationseinheit.bezeichnung as oebezeichnung, tbl_studienplan.bezeichnung as studienplanbezeichnung');
+		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_kalender_status', 'tbl_kalender_syncstatus.sync_status_kurzbz = tbl_kalender_status.status_kurzbz');
+		$this->_ci->KalenderStatusModel->addJoin('public.tbl_organisationseinheit', 'tbl_kalender_syncstatus.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz');
+		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_studienplan', 'tbl_kalender_syncstatus.studienplan_id = tbl_studienplan.studienplan_id', 'LEFT');
+
+		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('studiensemester_kurzbz' => $studiensemester_kurzbz));
+
+		if (isError($data))
+			$this->terminateWithError(getError($data));
+
+		$this->terminateWithSuccess(getData($data));
+	}
+
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('kalender_syncstatus_id', 'kalender_syncstatus_id', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$kalender_syncstatus_id = $this->input->post('kalender_syncstatus_id');
+
+		$result = $this->_ci->KalendersyncstatusModel->load($kalender_syncstatus_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		if (!hasData($result))
+			$this->terminateWithError($this->p->t('lehre', 'errorDeleting'));
+
+		$del_result = $this->_ci->KalendersyncstatusModel->delete(getData($result)[0]->kalender_syncstatus_id);
+
+		if (isError($del_result))
+			$this->terminateWithError(getError($del_result));
+		$this->terminateWithSuccess($del_result);
+	}
+
+	public function loadSync()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+		$kalender_syncstatus_id = $this->_ci->input->get('kalender_syncstatus_id', TRUE);
+		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('kalender_syncstatus_id' => $kalender_syncstatus_id));
+		if (isError($data))
+			$this->terminateWithError(getError($data));
+
+		$this->terminateWithSuccess(getData($data)[0]);
+	}
+
+	public function getSyncStatus()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS bezeichnung, status_kurzbz');
+		$this->_ci->KalenderStatusModel->db->where_in('status_kurzbz', self::ALLOWED_STATUS);
+		$data = $this->_ci->KalenderStatusModel->load();
+
+		if (isError($data))
+			$this->terminateWithError(getError($data));
+
+		$this->terminateWithSuccess(getData($data));
+	}
+
+
+	public function add()
+	{
+		$formData = $this->input->post('formData');
+
+		$this->_ci->form_validation->set_data($formData);
+
+		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
+		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
+
+		$existing = $this->_checkIfExist(
+			$formData['oe_kurzbz'],
+			$formData['studiensemester_kurzbz'],
+			$ausbildungssemester,
+			$studienplan_id
+		);
+
+		if (isError($existing))
+			$this->terminateWithError(getError($existing));
+
+		if (hasData($existing))
+		{
+			$this->terminateWithError('Es existiert bereits ein Eintrag.');
+		}
+
+		$result = $this->_ci->KalendersyncstatusModel->insert(
+			array(
+				'oe_kurzbz' => $formData['oe_kurzbz'],
+				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
+				'datum_bis' => $formData['datum_bis'],
+				'studienplan_id' => $studienplan_id,
+				'ausbildungssemester' => $ausbildungssemester,
+				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
+				'mail' => $formData['mail'],
+				'insertvon' => getAuthUID()
+			)
+		);
+
+		$this->terminateWithSuccess($result);
+	}
+
+
+	public function start()
+	{
+		$formData = $this->input->post('formData');
+
+		$this->_ci->form_validation->set_data($formData);
+
+		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$result = $this->_ci->kalendersynclib->runManual($formData['oe_kurzbz'], $formData['studiensemester_kurzbz'], $formData['ausbildungssemester'], $formData['studienplan_id'], $formData['mail'], $formData['datum_bis'], $formData['sync_status_kurzbz']);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+	public function updateSync()
+	{
+		$formData = $this->input->post('formData');
+
+		$this->_ci->form_validation->set_data($formData);
+
+		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
+		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
+		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
+
+		$existing = $this->_checkIfExist(
+			$formData['oe_kurzbz'],
+			$formData['studiensemester_kurzbz'],
+			$ausbildungssemester,
+			$studienplan_id,
+			$formData['kalender_syncstatus_id']
+		);
+
+		if (isError($existing))
+			$this->terminateWithError(getError($existing));
+
+		if (hasData($existing))
+		{
+			$this->terminateWithError('Es existiert bereits ein Eintrag.');
+		}
+
+		$this->_ci->KalendersyncstatusModel->update(
+			array('kalender_syncstatus_id' => $formData['kalender_syncstatus_id']),
+			array(
+				'oe_kurzbz' => $formData['oe_kurzbz'],
+				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
+				'datum_bis' => $formData['datum_bis'],
+				'studienplan_id' => $studienplan_id,
+				'ausbildungssemester' => $ausbildungssemester,
+				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
+				'mail' => $formData['mail'],
+				'updatevon' => getAuthUID(),
+				'updateamum' => date('c'),
+			)
+		);
+	}
+	public function getStudienplan()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$oe_kurzbz = $this->_ci->input->get('oe_kurzbz', TRUE);
+		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
+		$ausbildungssemester = $this->_ci->input->get('ausbildungssemester', TRUE);
+
+		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
+		$is_studiengang = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
+
+		if (hasData($is_studiengang) && !isEmptyString($studiensemester_kurzbz))
+		{
+			$studiengang = getData($is_studiengang)[0];
+
+			$studienplaene = $this->_ci->StudienplanModel->getStudienplaeneBySemester(
+				$studiengang->studiengang_kz,
+				$studiensemester_kurzbz,
+				isEmptyString($ausbildungssemester) ? null : $ausbildungssemester
+			);
+
+
+			$data = $this->getDataOrTerminateWithError($studienplaene);
+
+			$unique = array();
+			foreach ($data as $row)
+			{
+				$unique[$row->studienplan_id] = (object) array(
+					'studienplan_id' => $row->studienplan_id,
+					'studienordnung_id' => $row->studienordnung_id,
+					'bezeichnung' => $row->bezeichnung,
+					'orgform_kurzbz' => $row->orgform_kurzbz
+				);
+			}
+
+			$this->terminateWithSuccess(array_values($unique));
+		}
+		$this->terminateWithSuccess();
+	}
+
+	private function _checkIfExist($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $studienplan_id, $kalender_syncstatus_id = null)
+	{
+		$this->_ci->KalendersyncstatusModel->db->where('oe_kurzbz', $oe_kurzbz);
+		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+
+		if (is_null($ausbildungssemester))
+			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester IS NULL', null, false);
+		else
+			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester', $ausbildungssemester);
+
+		if (is_null($studienplan_id))
+			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id IS NULL', null, false);
+		else
+			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id', $studienplan_id);
+
+		if (!is_null($kalender_syncstatus_id))
+			$this->_ci->KalendersyncstatusModel->db->where('kalender_syncstatus_id !=', $kalender_syncstatus_id);
+		return $this->_ci->KalendersyncstatusModel->load();
+	}
+
+}

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(getError($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($result);
+	}
+
+
+	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/jobs/AbgabetoolJob.php

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

application/controllers/jobs/AntragJob.php

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

application/controllers/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/lehre/Studierendenantrag.php

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

application/controllers/system/MigrateKalender.php

@@ -0,0 +1,495 @@
+<?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 CLI_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$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, $bis = null, $studiengang_kz = null)
+	{
+		if (is_null($von))
+			return error('Parameter "von" ist erforderlich');
+
+		if (is_null($bis))
+			$bis = '2100-12-31';
+
+		$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,
+					array_agg(DISTINCT sp.lehreinheit_id) AS lehreinheit_id,
+					array_agg(DISTINCT 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_in('stundenplandev_id', $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);
+					}
+				}
+			}
+		}
+	}
+
+	public function migrateReservierung($von, $bis = null, $ort_kurzbz = null)
+	{
+		if (is_null($von))
+			return error('Parameter "von" ist erforderlich');
+
+		if (is_null($bis))
+			$bis = '2100-12-31';
+
+		$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, r.studiengang_kz)::text) AS svg_kombis,
+							array_agg(DISTINCT r.ort_kurzbz) AS ort_kurzbz,
+							MIN(r.studiengang_kz) AS studiengang_kz,
+							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;";
+
+		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_in('reservierung_id', $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')
+		{
+			$lehreinheit_ids = is_array($block->lehreinheit_id) ? $block->lehreinheit_id : explode(',', $block->lehreinheit_id);
+			foreach ($lehreinheit_ids as $lehreinheit_id)
+			{
+				$leResult = $this->KalenderLehreinheitModel->insert(
+					array (
+						'kalender_id' => $kalender_id,
+						'lehreinheit_id'=> $lehreinheit_id
+					)
+				);
+
+				if (!isSuccess($leResult))
+					return null;
+			}
+		}
+		else if ($typ === 'reservierung')
+		{
+			$eventResult = $this->KalenderEventModel->insert(array(
+				'kalender_id' => $kalender_id,
+				'titel' => $block->titel,
+				'beschreibung' => $block->beschreibung
+			));
+
+			if (!isSuccess($eventResult))
+				return null;
+
+			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 null;
+
+			$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, $stg_kz) = explode(',', $kombi_str);
+
+				$sem = trim($sem) === '' ? null : trim($sem);
+				$verb = trim($verb) === '' ? null : trim($verb);
+				$grp = trim($grp) === '' ? null : trim($grp);
+				$stg_kz = trim($stg_kz) === '' ? null : trim($stg_kz);
+
+				if (is_null($sem) && is_null($verb) && is_null($grp) && is_null($stg_kz))
+					continue;
+
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'studiengang_kz' => $stg_kz,
+					'semester' => $sem,
+					'verband' => $verb,
+					'gruppe' => $grp,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+		}
+
+		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
+
+		foreach ($orte as $ort)
+		{
+			$ort = trim($ort);
+			if (!empty($ort))
+			{
+				$this->KalenderOrtModel->insert(
+					array (
+						'kalender_id' => $kalender_id,
+						'ort_kurzbz' => $ort
+					)
+				);
+			}
+		}
+
+		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
+			)
+		);
+
+		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
+		$orte = array_filter(array_map('trim', $orte));
+
+		$this->KalenderOrtModel->delete(array('kalender_id' => $kalender_id));
+
+		foreach ($orte as $ort)
+		{
+			$this->KalenderOrtModel->insert(
+				array (
+					'kalender_id' => $kalender_id,
+					'ort_kurzbz' => $ort
+				)
+			);
+		}
+	}
+
+	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/AntragLib.php

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

application/libraries/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 = array_merge($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,171 @@
+<?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');
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+	}
+
+	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/>';
+
+		//TODO (david) richtigen Empfänger
+		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/KalenderSyncLib.php

@@ -0,0 +1,336 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class KalenderSyncLib
+{
+	private $_ci;
+
+	private $status_map = array(
+		'preview' => array('planning', 'sync_preview'),
+		'live' => array('planning', 'sync_preview', 'preview', 'sync_live')
+	);
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	public function run($studiensemester_kurzbz)
+	{
+		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+
+		$configs = $this->_ci->KalendersyncstatusModel->load();
+
+		if (isError($configs))
+			return $configs;
+
+		if (!hasData($configs))
+			return success([]);
+
+		$results = [];
+		$mail_infos_gesamt = [];
+
+		foreach (getData($configs) as $config)
+		{
+
+			$ziel_status = isEmptyString($config->sync_status_kurzbz) ? 'live' : $config->sync_status_kurzbz;
+
+			$relevante_stati = array_merge($this->status_map[$ziel_status], array('todelete'));
+
+			$kalender_ids_result = $this->getKalenderIds(
+				$config->oe_kurzbz,
+				$config->studiensemester_kurzbz,
+				$relevante_stati,
+				$config->ausbildungssemester,
+				$config->studienplan_id,
+				$config->datum_bis
+			);
+
+			if (isError($kalender_ids_result))
+				return $kalender_ids_result;
+
+			$kalender_ids = getData($kalender_ids_result);
+
+			$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
+
+			if (isError($sync_result))
+				return $sync_result;
+
+			$sync_data = getData($sync_result);
+
+			if ((bool) $config->mail)
+				$mail_infos_gesamt = array_merge($mail_infos_gesamt, $sync_data['mail_infos']);
+
+			$results[] = [
+				'kalender_syncstatus_id' => $config->kalender_syncstatus_id,
+				'oe_kurzbz' => $config->oe_kurzbz,
+				'ausbildungssemester' => $config->ausbildungssemester,
+				'studienplan_id' => $config->studienplan_id,
+				'ziel_status' => $ziel_status,
+				'mail' => (bool) $config->mail,
+				'synced' => $sync_data['synced']
+			];
+		}
+
+		if (!empty($mail_infos_gesamt))
+		{
+			$this->_ci->load->library('KalenderNotificationLib');
+			$this->_ci->kalendernotificationlib->sendMails($mail_infos_gesamt);
+		}
+
+		return success($results);
+	}
+
+	public function runManual($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester = null, $studienplan_id = null, $mail = true, $datum_bis = null, $ziel_status = 'live')
+	{
+		$relevante_stati = array_merge($this->status_map[$ziel_status], array('todelete'));
+
+		$kalender_ids_result = $this->getKalenderIds(
+			$oe_kurzbz,
+			$studiensemester_kurzbz,
+			$relevante_stati,
+			$ausbildungssemester,
+			$studienplan_id,
+			$datum_bis
+		);
+
+		if (isError($kalender_ids_result))
+			return $kalender_ids_result;
+
+		$kalender_ids = getData($kalender_ids_result);
+
+		$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
+
+		if (isError($sync_result))
+			return $sync_result;
+
+		$sync_data = getData($sync_result);
+
+		if ($mail && !empty($sync_data['mail_infos']))
+		{
+			$this->_ci->load->library('KalenderNotificationLib');
+			$this->_ci->kalendernotificationlib->sendMails($sync_data['mail_infos']);
+		}
+
+		return success(['synced' => $sync_data['synced']]);
+	}
+
+	public function sync()
+	{
+		$this->_ci->KalenderModel->addSelect('tbl_kalender.*, tbl_kalender_ort.ort_kurzbz, tbl_kalender_ort.location');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->db->where_in('status_kurzbz', array('sync_live', 'sync_preview', 'todelete'));
+		$this->_ci->KalenderModel->addOrder('tbl_kalender.kalender_id', 'DESC');
+		$to_update = $this->_ci->KalenderModel->load();
+
+		if (isError($to_update))
+			return $to_update;
+
+		if (!hasData($to_update))
+			return success(['synced' => 0]);
+
+		$mail_infos = [];
+		$synced = 0;
+
+		foreach (getData($to_update) as $entry)
+		{
+			if ($entry->status_kurzbz === 'todelete')
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted'));
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => array('lektor', 'student'));
+				$synced++;
+			}
+
+			if ($entry->status_kurzbz === 'sync_preview')
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'preview'));
+				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, true);
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'preview', 'notify' => array('lektor'));
+				$synced++;
+			}
+
+			if ($entry->status_kurzbz === 'sync_live')
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
+				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
+				$synced++;
+			}
+		}
+
+		$this->_ci->load->library('KalenderNotificationLib');
+		$this->_ci->kalendernotificationlib->sendMails($mail_infos);
+
+		return success(['synced' => $synced]);
+	}
+
+	public function getKalenderIds($oe_kurzbz, $studiensemester_kurzbz, $status_kurzbz_list, $ausbildungssemester = null, $studienplan_id = null, $datum_bis = null)
+	{
+		if (empty($status_kurzbz_list))
+			return success([]);
+
+		$studiengang_result = $this->_getStudiengang($oe_kurzbz);
+
+		if (isError($studiengang_result))
+			return $studiengang_result;
+
+		$studiengang_kz = getData($studiengang_result);
+
+		$this->_ci->KalenderModel->addDistinct('tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'tbl_kalender.kalender_id = tbl_kalender_lehreinheit.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'tbl_kalender_lehreinheit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
+
+		//TODO (david) oe_kurzbz rekursiv?
+		if (!is_null($studiengang_kz))
+			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang_kz);
+		else
+			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.oe_kurzbz', $oe_kurzbz);
+
+		$this->_ci->KalenderModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.status_kurzbz', $status_kurzbz_list);
+
+		$this->_ci->KalenderModel->db->where('NOT EXISTS (
+				SELECT 1 FROM lehre.tbl_kalender nachfolger
+				WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)', null, false);
+
+		if (!is_null($studienplan_id))
+		{
+			$this->_ci->KalenderModel->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id');
+			$this->_ci->KalenderModel->db->where('tbl_studienplan_lehrveranstaltung.studienplan_id', $studienplan_id);
+		}
+
+		if (!is_null($ausbildungssemester))
+			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.semester', $ausbildungssemester);
+
+		if (!is_null($datum_bis))
+		{
+			$end_date = date('Y-m-d', strtotime($datum_bis . ' +1 day'));
+			$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $end_date);
+		}
+
+		$result = $this->_ci->KalenderModel->load();
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return success([]);
+
+		return success(array_column(getData($result), 'kalender_id'));
+	}
+
+
+	private function _archiveVorgaenger($vorgaenger_kalender_id, $stop_at_live = false)
+	{
+		if (!$vorgaenger_kalender_id) return;
+
+		$current_id = $vorgaenger_kalender_id;
+
+		while ($current_id)
+		{
+			$vorgaenger = $this->_ci->KalenderModel->load(array('kalender_id' => $current_id));
+			if (!hasData($vorgaenger)) return;
+
+			$vorgaenger = getData($vorgaenger)[0];
+
+			if ($stop_at_live && $vorgaenger->status_kurzbz === 'live')
+				return;
+
+			if (in_array($vorgaenger->status_kurzbz, array('preview', 'live')))
+			{
+				$this->_ci->KalenderModel->update(
+					array('kalender_id' => $current_id),
+					array('status_kurzbz' => 'archived')
+				);
+			}
+
+			$current_id = $vorgaenger->vorgaenger_kalender_id;
+		}
+	}
+
+	private function _syncKalenderIds($kalender_ids, $ziel_status)
+	{
+		if (empty($kalender_ids))
+			return success(['synced' => 0, 'mail_infos' => []]);
+
+		$this->_ci->KalenderModel->addSelect('tbl_kalender.*, tbl_kalender_ort.ort_kurzbz, tbl_kalender_ort.location');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->addOrder('tbl_kalender.kalender_id', 'DESC');
+		$to_update = $this->_ci->KalenderModel->load();
+
+		if (isError($to_update))
+			return $to_update;
+
+		if (!hasData($to_update))
+			return success(['synced' => 0, 'mail_infos' => []]);
+
+		$mail_infos = [];
+		$synced = 0;
+
+		foreach (getData($to_update) as $entry)
+		{
+			if ($entry->status_kurzbz === 'todelete')
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted'));
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => array('lektor', 'student'));
+				$synced++;
+				continue;
+			}
+
+			if ($ziel_status === 'preview' && in_array($entry->status_kurzbz, array('planning', 'sync_preview')))
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'preview'));
+				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, true);
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'preview', 'notify' => array('lektor'));
+				$synced++;
+				continue;
+			}
+
+			if ($ziel_status === 'live' && in_array($entry->status_kurzbz, array('planning', 'sync_preview', 'sync_live')))
+			{
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
+				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
+				$synced++;
+				continue;
+			}
+
+			if ($ziel_status === 'live' && $entry->status_kurzbz === 'preview')
+			{
+				$current = getData($this->_ci->KalenderModel->load(array('kalender_id' => $entry->kalender_id)))[0];
+				if ($current->status_kurzbz === 'archived')
+					continue;
+
+				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
+				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
+				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
+				$synced++;
+			}
+		}
+
+		return success(['synced' => $synced, 'mail_infos' => $mail_infos]);
+	}
+
+
+	private function _getStudiengang($oe_kurzbz)
+	{
+		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
+		$result = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return success(null);
+
+		return success(getData($result)[0]->studiengang_kz);
+	}
+}

application/libraries/ProfilLib.php

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

application/libraries/RaumvorschlagLib.php

@@ -0,0 +1,275 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+use CI3_Events as Events;
+
+class RaumvorschlagLib
+{
+	private $_ci;
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$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');
+		$this->_ci->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
+		$this->_ci->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
+		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->_ci->load->model('education/LehreinheitMitarbeiter_model', 'LehreinheitMitarbeiterModel');
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
+		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
+		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
+
+		$this->_ci->load->library('CollisionChecker');
+		$this->_ci->load->library('KalenderLib');
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+	}
+
+
+	public function getVorschlaege($kalender_id)
+	{
+		$event = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
+		$event = $event[0];
+
+		$lektor_uids = array_column($event->lektor, 'mitarbeiter_uid');
+		$gruppen_kurzbz = array_values(array_filter(array_column($event->gruppe, 'gruppe_kurzbz')));
+
+		$lehrverband_gruppen = array_values(array_filter($event->gruppe, function($gruppe)
+		{
+			return empty($gruppe['gruppe_kurzbz']);
+		}));
+
+		$tages_events = $this->_ci->kalenderlib->getForRaumvorschlag(
+			$event->datum,
+			$event->datum,
+			$lektor_uids,
+			$gruppen_kurzbz,
+			$lehrverband_gruppen
+		);
+
+		$lektor_davor = $this->_getEventDavor($tages_events, $event->isostart, $lektor_uids, 'lektor');
+		$gruppen_davor = $this->_getEventDavor($tages_events, $event->isostart, $gruppen_kurzbz, 'gruppe');
+
+		$lektor_davor_ort = $lektor_davor ? $this->_getOrtDetails($lektor_davor->ort_kurzbz) : null;
+		$gruppen_davor_ort = $gruppen_davor ? $this->_getOrtDetails($gruppen_davor->ort_kurzbz) : null;
+
+		$kandidaten = $this->_getRaumkandidaten($event);
+		if (empty($kandidaten)) return [];
+
+
+		$ratings = [];
+		foreach ($kandidaten as $raum)
+		{
+			$rating = ['ort_kurzbz' => $raum->ort_kurzbz, 'score' => 100, 'details' => []];
+			$this->_rateLektor($rating, $raum, $lektor_davor_ort);
+			$this->_rateGruppen($rating, $raum, $gruppen_davor_ort);
+
+			Events::trigger('room_rating',
+				function & () use (&$rating) {
+					return $rating;
+				},
+				$raum,
+				$event
+			);
+			$ratings[] = $rating;
+		}
+
+		usort($ratings, function($a, $b)
+		{
+			return $b['score'] - $a['score'];
+		});
+
+		return $ratings;
+
+	}
+
+	private function _getOrtDetails($ort_kurzbz_array)
+	{
+		$ort_kurzbz_array = (array) $ort_kurzbz_array;
+		if (empty($ort_kurzbz_array)) return [];
+		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
+		$this->_ci->OrtModel->db->where_in('ort_kurzbz', $ort_kurzbz_array);
+		$result = $this->_ci->OrtModel->load();
+
+		return hasData($result) ? getData($result) : [];
+	}
+
+	private function _rateLektor(&$rating, $raum, $lektor_davor_orte)
+	{
+		if (empty($lektor_davor_orte)) return;
+
+		foreach ($lektor_davor_orte as $ort)
+		{
+			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
+			{
+				$rating['score'] += 20;
+				$rating['details'][] = '+20 ' . $this->_ci->phraseslib->t('ui', 'lecturer_already_here');
+				return;
+			}
+		}
+
+		$gleiches_gebaeude = array_filter($lektor_davor_orte, function($ort) use ($raum)
+		{
+			return $ort->standort_id === $raum->standort_id;
+		});
+
+		if (empty($gleiches_gebaeude))
+		{
+			$rating['score'] -= 20;
+			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'lecturer_building_change');
+			return;
+		}
+
+		$diffs = array_map(function($ort) use ($raum)
+		{
+			return abs($ort->stockwerk - $raum->stockwerk);
+		}, $gleiches_gebaeude);
+
+		$diff = min($diffs);
+
+		if ($diff > 0)
+		{
+			$rating['score'] -= $diff * 5;
+			$rating['details'][] = '-' . ($diff * 5) . ' ' . $this->_ci->phraseslib->t('ui', 'lecturer_floor_change');
+		}
+	}
+
+	private function _rateGruppen(&$rating, $raum, $gruppen_davor_orte)
+	{
+		if (empty($gruppen_davor_orte)) return;
+
+		foreach ($gruppen_davor_orte as $ort)
+		{
+			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
+			{
+				$rating['score'] += 10;
+				$rating['details'][] = '+10 ' . $this->_ci->phraseslib->t('ui', 'student_already_here');
+				return;
+			}
+		}
+
+		$gleiches_gebaeude = array_filter($gruppen_davor_orte, function($ort) use ($raum)
+		{
+			return $ort->standort_id === $raum->standort_id;
+		});
+
+		if (empty($gleiches_gebaeude))
+		{
+			$rating['score'] -= 20;
+			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'student_building_change');
+			return;
+		}
+
+		$diffs = array_map(function($ort) use ($raum)
+		{
+			return abs($ort->stockwerk - $raum->stockwerk);
+		}, $gleiches_gebaeude);
+
+		$diff = min($diffs);
+
+		if ($diff > 0)
+		{
+			$rating['score'] -= $diff * 5;
+			$rating['details'][] = '-' . ($diff * 5) . ' '. $this->_ci->phraseslib->t('ui', 'student_floor_change');
+		}
+	}
+
+	private function _getEventDavor($events, $von, $uids, $type)
+	{
+		$kandidat = null;
+
+		foreach ($events as $event)
+		{
+			if ($event->isoend > $von)
+				continue;
+
+			//Wenn zwischen zwei Events eine 30+ Minuten Pause liegt, wird das Event davor nicht berücksichtigt
+			if ((strtotime($von) - strtotime($event->isoend)) > 30 * 60)
+				continue;
+
+			if (empty($event->ort_kurzbz))
+				continue;
+
+			if ($type === 'lektor')
+				$event_uids = array_column($event->lektor, 'mitarbeiter_uid');
+			else
+				$event_uids = array_column($event->gruppe, 'gruppe_kurzbz');
+
+			if (empty(array_intersect($event_uids, $uids)))
+				continue;
+
+			if ($kandidat === null || $event->isoend > $kandidat->isoend)
+				$kandidat = $event;
+		}
+
+		return $kandidat;
+	}
+
+	private function _getRaumkandidaten($event)
+	{
+		$lehreinheit = $this->_ci->LehreinheitModel->load($event->lehreinheit_id[0]);
+		if (!hasData($lehreinheit)) return [];
+		$lehreinheit = getData($lehreinheit)[0];
+
+		$this->_ci->KalenderModel->addSelect('tbl_kalender_ort.ort_kurzbz');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id');
+		$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $event->isoend);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.bis >', $event->isostart);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['deleted']);
+		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz IS NOT NULL', null, false);
+		$belegte = $this->_ci->KalenderModel->load();
+
+		$belegte_orte = hasData($belegte) ? array_column(getData($belegte), 'ort_kurzbz') : [];
+
+		if (empty($lehreinheit->raumtyp))
+		{
+			$raeume = $this->_getFreieRaeume(null, $belegte_orte);
+			return hasData($raeume) ? getData($raeume) : [];
+		}
+
+		$vorschlaege = [];
+
+		$raeume = $this->_getFreieRaeume($lehreinheit->raumtyp, $belegte_orte);
+		if (hasData($raeume))
+			$vorschlaege = getData($raeume);
+
+		if (count($vorschlaege) < 5 && !empty($lehreinheit->raumtypalternativ))
+		{
+			$bereits_gefunden = array_merge($belegte_orte, array_column($vorschlaege, 'ort_kurzbz'));
+			$alternativ = $this->_getFreieRaeume($lehreinheit->raumtypalternativ, $bereits_gefunden);
+
+			if (!isError($alternativ) && hasData($alternativ))
+				$vorschlaege = array_merge($vorschlaege, getData($alternativ));
+		}
+
+		return $vorschlaege;
+	}
+
+	private function _getFreieRaeume($raumtyp, $belegte_orte)
+	{
+		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
+		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
+		$this->_ci->OrtModel->db->where('raumtyp_kurzbz', $raumtyp);
+		$this->_ci->OrtModel->db->where('aktiv', true);
+		$this->_ci->OrtModel->db->where("ort_kurzbz NOT LIKE '\_%'", null, false);
+
+		if (!empty($belegte_orte))
+			$this->_ci->OrtModel->db->where_not_in('ort_kurzbz', $belegte_orte);
+		$this->_ci->OrtModel->addOrder('hierarchie, ort_kurzbz');
+
+		return $this->_ci->OrtModel->load();
+	}
+
+
+
+
+
+
+
+}

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -0,0 +1,258 @@
+<?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 [
+				'message' => $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)) . ')',
+				'errorCode' => 'lector_collision',
+			];
+		}, 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 [
+				'message' => $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)) . ')',
+				'errorCode' => 'reservation_collision',
+			];
+		}, 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 [
+				'message' => $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)) . ')',
+				'errorCode' => 'absences_collision',
+			];
+		}, getData($result));
+	}
+
+}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -0,0 +1,81 @@
+<?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) || isEmptyArray($data->ort_kurzbz)) 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']);
+
+		$this->_ci->KalenderModel->db->where_in('ort_kurzbz', $data->ort_kurzbz);
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+		));
+
+		if (isError($result)) return [];
+		if (!hasData($result)) return [];
+
+		return array_map(function($row)
+		{
+			return [
+				'errorCode' => 'room_collision',
+				'message' => $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,247 @@
+<?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[] = [
+					'message' =>
+						$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)) . ')',
+					'errorCode' => 'student_collision'
+				];
+
+			}
+		}
+
+		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,362 @@
+<?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[] = [
+						'message' => $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)) . ')',
+						'errorCode' => 'verband_collision',
+					];
+				}
+			}
+		}
+
+		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[] = [
+						'errorCode' => 'reservation_collision',
+						'message' => $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/stv/StudentListLib.php

@@ -0,0 +1,363 @@
+<?php
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This generates a list of students and or prestudents used for Studierendenverwaltung
+ */
+class StudentListLib
+{
+	private $_ci; // Code igniter instance
+
+	private $_allowedStgs = [];
+	private $_selects = [];
+	private $_joins = [];
+	
+	/**
+	 * Gets the CI instance, loads model and prepares default values
+	 *
+	 * @param array		$params
+	 *
+	 * @return void
+	 */
+	public function __construct($params = null)
+	{
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		if (isset($params['allowedStgs']))
+			$this->_allowedStgs = $params['allowedStgs'];
+
+		// Add default SELECTs
+		$this->addSelect("b.uid");
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+			$this->addSelect('tag_data_agg.tags');
+		$this->addSelect('titelpre');
+		$this->addSelect('nachname');
+		$this->addSelect('vorname');
+		$this->addSelect('wahlname');
+		$this->addSelect('vornamen');
+		$this->addSelect('titelpost');
+		$this->addSelect('ersatzkennzeichen');
+		$this->addSelect('gebdatum');
+		$this->addSelect('geschlecht');
+		$this->addSelect('foto');
+		$this->addSelect('foto_sperre');
+		$this->addSelect('v.semester');
+		$this->addSelect('v.verband');
+		$this->addSelect('v.gruppe');
+		$this->addSelect("statusofsemester"); // Will be replaced later
+		$this->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->addSelect('tbl_prestudent.studiengang_kz');
+		$this->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->addSelect("s.matrikelnr");
+		$this->addSelect('p.person_id');
+		$this->addSelect('pls.status_kurzbz AS status');
+		$this->addSelect('pls.datum AS status_datum');
+		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->_ci->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->addSelect('p.anmerkung AS anmerkungen');
+		$this->addSelect('tbl_prestudent.anmerkung');
+		$this->addSelect('pls.orgform_kurzbz');
+		$this->addSelect('aufmerksamdurch_kurzbz');
+		$this->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->addSelect('tbl_prestudent.dual');
+		$this->addSelect('p.matr_nr');
+		$this->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->addSelect('tbl_prestudent.prestudent_id');
+		$this->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false); // TODO(chris): overwrite in fetchStudents
+		$this->addSelect('mentor');
+		$this->addSelect('b.aktiv AS bnaktiv');
+		$this->addSelect('unruly');
+		
+		// Add default JOINs
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_person p', 'person_id');
+		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); // TODO(chris): overwrite in fetchStudents
+		$this->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->addJoin("v", "", ""); // Will be replaced later
+		$this->addJoin("ps", "", ""); // Will be replaced later
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
+			$this->_ci->load->config('stv');
+			$tags = $this->_ci->config->item('stv_prestudent_tags');
+
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->_ci->PrestudentModel->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			}
+			$subQueryTag = "(
+				SELECT
+					tag.prestudent_id,
+					COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+				FROM (
+					SELECT DISTINCT ON (n.notiz_id)
+						n.notiz_id AS id,
+						nt.typ_kurzbz,
+						array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+						n.text AS notiz,
+						nt.style,
+						n.erledigt AS done,
+						nz.prestudent_id
+					FROM public.tbl_notizzuordnung AS nz
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz " . $whereTags . "
+				) AS tag
+				GROUP BY tag.prestudent_id
+			) AS tag_data_agg";
+
+			$this->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Adds a SELECT statement to the query.
+	 *
+	 * @param string|array	$select
+	 * @param boolean		$escape (optional)
+	 *
+	 * @return void
+	 */
+	public function addSelect($select, $escape = true)
+	{
+		if (is_array($select)) {
+			foreach ($select as $s)
+				$this->addSelect($s, $escape);
+			return;
+		}
+		$alias = $this->getAliasFromSelect($select);
+		$this->_selects[$alias] = [$select, $escape];
+	}
+
+	/**
+	 * Joins a table to the query.
+	 *
+	 * @param string		$table
+	 * @param string		$cond
+	 * @param string		$type (optional)
+	 * @param string		$position (optional)
+	 *
+	 * @return void
+	 */
+	public function addJoin($table, $cond, $type = '', $position = 'end')
+	{
+		$alias = $this->getAliasFromTable($table);
+
+		if ($position == 'end') {
+			return $this->_joins[$alias] = [$table, $cond, $type];
+		}
+
+		if ($position == 'start') {
+			return $this->_joins = [$alias => [$table, $cond, $type]] + $this->_joins;
+		}
+
+		if (substr($position, 0, 7) == 'before_') {
+			$ref = substr($position, 7);
+			$index = 0;
+		} elseif (substr($position, 0, 6) == 'after_') {
+			$ref = substr($position, 6);
+			$index = 1;
+		} else {
+			return $this->addJoin($table, $cond, $type);
+		}
+		if (!isset($this->_joins[$ref]))
+			return $this->addJoin($table, $cond, $type);
+
+		$key_indeces = array_flip(array_keys($this->_joins));
+		$index += $key_indeces[$ref];
+
+		if (!$index)
+			return $this->addJoin($table, $cond, $type, 'start');
+
+		$front_part = array_slice($this->_joins, 0, $index, true);
+		$back_part = array_slice($this->_joins, $index, null, true);
+
+		if (isset($front_part[$alias])) {
+			unset($front_part[$alias]);
+		}
+
+		$this->_joins = $front_part + [$alias => [$table, $cond, $type]] + $back_part;
+	}
+
+	/**
+	 * Adds a WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Adds a OR WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addOrWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->or_where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->or_where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Generates the query and executes it.
+	 *
+	 * @param string|null	$studiensemester_kurzbz
+	 *
+	 * @return stdClass		result of the query
+	 */
+	public function execute($studiensemester_kurzbz)
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+		$this->addSelect(
+			"public.get_rolle_prestudent(
+				public.tbl_prestudent.prestudent_id, 
+				" . $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) . "
+			)  AS statusofsemester"
+		);
+		$this->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			'LEFT'
+		);
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
+			',
+			'LEFT'
+		);
+
+		$this->addWhere('tbl_prestudent.studiengang_kz', $this->_allowedStgs);
+
+		foreach ($this->_joins as $join)
+			$this->_ci->PrestudentModel->addJoin($join[0], $join[1], $join[2]);
+
+		foreach ($this->_selects as $select)
+			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
+
+		$this->_ci->PrestudentModel->addOrder('nachname');
+		$this->_ci->PrestudentModel->addOrder('vorname');
+
+		return $this->_ci->PrestudentModel->load();
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string		$select
+	 *
+	 * @return string
+	 */
+	final protected function getAliasFromSelect($select)
+	{
+		if (strpos($select, ' ') !== false) {
+			return trim(strrchr($select, ' '));
+		}
+
+		if (strpos($select, '.') !== false) {
+			return substr(strrchr($select, '.'), 1);
+		}
+
+		return $select;
+	}
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string|array	$table
+	 *
+	 * @return string|array
+	 */
+	final protected function getAliasFromTable($table)
+	{
+		if (strpos($table, ' ') !== false) {
+			return trim(strrchr($table, ' '));
+		}
+
+		return $table;
+	}
+}

application/models/education/Lehreinheit_model.php

@@ -395,6 +395,77 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}
 
+	public function getOffeneStunden($lehreinheit_ids)
+	{
+		if (!is_array($lehreinheit_ids))
+			$lehreinheit_ids = [$lehreinheit_ids];
+
+		if (empty($lehreinheit_ids))
+			return success([]);
+
+		$db = new DB_Model();
+		$placeholders = implode(',', array_fill(0, count($lehreinheit_ids), '?'));
+
+		$qry = "WITH eventdauer AS (
+					SELECT
+						tbl_kalender_lehreinheit.lehreinheit_id,
+						tbl_kalender.von,
+						tbl_kalender.bis,
+						tbl_kalender.kalender_id
+					FROM lehre.tbl_lehreinheit
+							JOIN lehre.tbl_kalender_lehreinheit USING(lehreinheit_id)
+							JOIN lehre.tbl_kalender USING(kalender_id)
+					WHERE tbl_lehreinheit.lehreinheit_id IN ($placeholders)
+					GROUP BY tbl_kalender_lehreinheit.lehreinheit_id, tbl_kalender.von, tbl_kalender.bis, tbl_kalender.kalender_id
+				),
+				raster AS (
+					SELECT
+						eventdauer.lehreinheit_id,
+						eventdauer.kalender_id,
+						eventdauer.von,
+						eventdauer.bis,
+						vonstunde.stunde AS vonstunde_nr,
+						bisstunde.stunde AS bisstunde_nr
+					FROM eventdauer
+						LEFT JOIN lehre.tbl_stunde vonstunde ON eventdauer.von::time = vonstunde.beginn
+						LEFT JOIN lehre.tbl_stunde bisstunde ON eventdauer.bis::time = bisstunde.ende
+				),
+				unterrichtsdauer AS (
+					SELECT
+						raster.lehreinheit_id,
+						raster.kalender_id,
+						sum(EXTRACT(EPOCH FROM (LEAST(stunde.ende, raster.bis::time) - GREATEST(stunde.beginn, raster.von::time))) / 60) AS minuten
+					FROM raster JOIN lehre.tbl_stunde stunde ON stunde.beginn < raster.bis::time AND stunde.ende > raster.von::time
+					WHERE raster.vonstunde_nr IS NULL OR raster.bisstunde_nr IS NULL
+					GROUP BY raster.lehreinheit_id, raster.kalender_id
+				),
+				verplantestunden AS (
+					SELECT raster.lehreinheit_id, raster.kalender_id,
+						CASE
+							WHEN raster.vonstunde_nr IS NOT NULL AND raster.bisstunde_nr IS NOT NULL
+								THEN (raster.bisstunde_nr - raster.vonstunde_nr + 1)
+							ELSE coalesce(unterrichtsdauer.minuten, 0) / 45
+						END AS verplantestunde
+					FROM raster LEFT JOIN unterrichtsdauer ON unterrichtsdauer.lehreinheit_id = raster.lehreinheit_id AND unterrichtsdauer.kalender_id = raster.kalender_id
+				),
+				verplant_gesamt AS (
+					SELECT lehreinheit_id, SUM(verplantestunde) AS verplant
+					FROM verplantestunden
+					GROUP BY lehreinheit_id
+				)
+				SELECT
+					lema.lehreinheit_id,
+					lema.mitarbeiter_uid,
+					lema.planstunden,
+					ROUND(coalesce(verplant_gesamt.verplant, 0), 2) AS verplant,
+					ROUND((lema.planstunden - coalesce(verplant_gesamt.verplant, 0)), 2) AS offenestunden
+				FROM lehre.tbl_lehreinheitmitarbeiter lema
+					LEFT JOIN verplant_gesamt ON verplant_gesamt.lehreinheit_id = lema.lehreinheit_id
+				WHERE lema.lehreinheit_id IN ($placeholders)";
+
+		return $db->execReadOnlyQuery($qry, array_merge($lehreinheit_ids, $lehreinheit_ids));
+	}
+
 	private function getLVTmp($stg_kz = null)
 	{
 		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 

application/models/education/Projektarbeit_model.php

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

application/models/education/Studierendenantrag_model.php

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

application/models/education/Studierendenantragstatus_model.php

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

application/models/organisation/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/organisation/Studiensemester_model.php

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

application/models/person/Benutzerfunktion_model.php

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

application/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/Kalendersyncstatus_model.php

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

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/Cis/Abgabetool.php

@@ -38,7 +38,7 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 99%" route=<?php echo json_encode($route) ?> 
 	uid=<?php echo $uid ?> 
 	 student_uid_prop="<?php echo $student_uid_prop ?? '' ?>"
 	stg_kz_prop="<?php echo $stg_kz_prop ?? '' ?>"

application/views/Tempus.php

@@ -0,0 +1,52 @@
+<?php
+	$includesArray = array(
+		'title' => 'Tempus',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		'tabulator5' => true,
+		'filtercomponent' => true,
+		'navigationcomponent' => true,
+		'vuedatepicker11' => true,
+		'phrases' => array(
+			'global',
+			'ui',
+			'lehre'
+		),
+		'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/lehre/Antrag/Leitung/List.php

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

application/views/system/infocenter/infocenterData.php

@@ -315,22 +315,15 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT
+				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
 				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-				JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,22 +24,15 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-				SELECT
+					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
-					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

cis/private/lehre/notenliste.xls.php

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

cis/testtool/frage.php

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

cis/testtool/gebietfertig.php

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

cis/testtool/login.php

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

cis/testtool/menu.php

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

config/global.config-default.inc.php

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

content/statistik/notenspiegel_erweitert.php

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

include/benutzerberechtigung.class.php

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

include/pruefling.class.php

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

locale/de-AT/testtool.php

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

locale/en-US/testtool.php

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

package-lock.json

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

public/css/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/Studentenverwaltung.css

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

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/abgabetool/abgabe.css

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

public/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/js/api/factory/abgabe.js

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

public/js/api/factory/phrasen.js

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

public/js/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,44 @@
+/**
+ * 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
+		};
+	},
+	updateCollision () {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/config/updateCollision'
+		};
+	}
+};

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(studiengaenge, studiensemester_kurzbz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/coursepicker/getByStg',
+			params: { studiengaenge, studiensemester_kurzbz }
+		};
+	},
+
+};

public/js/api/factory/tempus/info.js

@@ -0,0 +1,8 @@
+export default {
+	getStudiengaenge() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Info/getStudiengaenge',
+		};
+	},
+};

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

@@ -0,0 +1,136 @@
+
+export default {
+	getPlan(filter, start_date, end_date)
+	{
+		return {
+			method: 'post',
+			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',
+		};
+	},
+	getCalendarHours() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/tempus/Kalender/getCalendarHours',
+		};
+	},
+	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}
+		};
+	},
+	calculateMultiWeekPlan(lehreinheit_id, ort_kurzbz, start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/calculateMultiWeekPlan',
+			params: { lehreinheit_id, ort_kurzbz, start_date, end_date }
+		};
+	},
+	confirmMultiWeekPlan(plan, lehreinheit_id ) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/confirmMultiWeekPlan',
+			params: { plan, lehreinheit_id }
+		};
+	},
+
+	addToKalenderEvent(target_kalender_id, lehreinheit_id ) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/addToKalenderEvent',
+			params: { target_kalender_id, lehreinheit_id }
+		};
+	},
+	getRaumvorschlag(kalender_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/tempus/Kalender/getRaumvorschlag',
+			params: { kalender_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/api/factory/tempus/studiengangtree.js

@@ -0,0 +1,43 @@
+/**
+ * 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(path) {
+		let url = 'api/frontend/v1/lv/StgTree';
+		if (path)
+			url += '/' + path;
+		return {
+			method: 'get',
+			url
+		};
+	},
+	favorites: {
+		get() {
+			return {
+				method: 'get',
+				url: 'api/frontend/v1/tempus/favorites'
+			};
+		},
+		set(favorites) {
+			return {
+				method: 'post',
+				url: 'api/frontend/v1/tempus/favorites/set',
+				params: { favorites }
+			};
+		}
+	}
+};

public/js/api/factory/tempus/sync.js

@@ -0,0 +1,83 @@
+/**
+ * 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 {
+	getSyncs(studiensemester_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/KalenderSync/getSyncs',
+			params: { studiensemester_kurzbz }
+		};
+	},
+	loadSync(kalender_syncstatus_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/KalenderSync/loadSync',
+			params: { kalender_syncstatus_id }
+		};
+	},
+	getSyncStatus() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/KalenderSync/getSyncStatus',
+		};
+	},
+	add(formData) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/KalenderSync/add',
+			params: { formData }
+		};
+	},
+	delete(kalender_syncstatus_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/KalenderSync/delete',
+			params: { kalender_syncstatus_id }
+		};
+	},
+	start(formData) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/KalenderSync/start',
+			params: { formData }
+		};
+	},
+	updateSync(formData) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/tempus/KalenderSync/updateSync',
+			params: { formData }
+		};
+	},
+	getStudienplan(oe_kurzbz, studiensemester_kurzbz, ausbildungssemester) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/tempus/KalenderSync/getStudienplan',
+			params: { oe_kurzbz, studiensemester_kurzbz, ausbildungssemester }
+		};
+	},
+
+	getMaxSemester(studiengang_kzs) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/status/getMaxSemester/',
+			params: { studiengang_kzs }
+		};
+	},
+
+};

public/js/apps/Abgabetool/Abgabetool.js

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

public/js/apps/Cis/Cis.js

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

public/js/apps/Tempus.js

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

public/js/components/AppConfig.js

@@ -79,26 +79,30 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/settings_saved'));
 				})
 				.catch(this.$fhcAlert.handleSystemErrors);
+		},
+		reload()
+		{
+			this.$api
+				.call(this.endpoints.get())
+				.then(res => {
+					Object.keys(res.data).forEach(key => {
+						const binding = { ...res.data[key] };
+						delete binding.value;
+						delete binding.options;
+						const options = res.data[key].options;
+						this.tempValues[key] = res.data[key].value;
+						this.setup[key] = {
+							binding,
+							options
+						};
+					});
+					this.$emit('update:modelValue', { ...this.tempValues });
+				})
+				.catch(this.$fhcAlert.handleSystemErrors);
 		}
 	},
 	created() {
-		this.$api
-			.call(this.endpoints.get())
-			.then(res => {
-				Object.keys(res.data).forEach(key => {
-					const binding = { ...res.data[key] };
-					delete binding.value;
-					delete binding.options;
-					const options = res.data[key].options;
-					this.tempValues[key] = res.data[key].value;
-					this.setup[key] = {
-						binding,
-						options
-					};
-				});
-				this.$emit('update:modelValue', { ...this.tempValues });
-			})
-			.catch(this.$fhcAlert.handleSystemErrors);
+		this.reload();
 	},
 	template: /* html */`
 	<fhc-form class="stv-config" ref="form" @submit.prevent="update">

public/js/components/Bootstrap/Modal.js

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

public/js/components/Calendar/Base.js

@@ -1,26 +1,35 @@
-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),
+			hoursPlan: Vue.computed(() => this.hoursPlan),
 			draggableEvents: Vue.computed(() => {
 				if (!this.draggableEvents)
 					return () => false;
@@ -43,8 +52,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 +114,18 @@ export default {
 			type: Boolean,
 			default: undefined
 		},
+		btnTableList: {
+			type: Boolean,
+			default: undefined
+		},
 		timeGrid: Array,
+		hoursPlan: Object,
 		draggableEvents: [Boolean, Array, Function],
 		dropableEvents: [Boolean, Array, Function],
+		resizableEvents: [Boolean, Array, Function],
 		onDragover: Function,
-		onDrop: Function
+		onDrop: Function,
+		onResize: Function
 	},
 	emits: [
 		"click:next",
@@ -136,7 +164,7 @@ export default {
 						res.start = luxon.DateTime.fromMillis(res.start, { zone: this.timezone, locale: this.locale });
 					else if (res.start instanceof Date)
 						res.start = luxon.DateTime.fromJSDate(res.start, { zone: this.timezone, locale: this.locale });
-					else if (typeof res.start === 
+					else if (typeof res.start ===
 						'string' || res.start instanceof String)
 						res.start = luxon.DateTime.fromISO(res.start, { zone: this.timezone, locale: this.locale });
 				}
@@ -145,7 +173,7 @@ export default {
 						res.end = luxon.DateTime.fromMillis(res.end, { zone: this.timezone, locale: this.locale });
 					else if (res.end instanceof Date)
 						res.end = luxon.DateTime.fromJSDate(res.end, { zone: this.timezone, locale: this.locale });
-					else if (typeof res.end === 
+					else if (typeof res.end ===
 						'string' || res.end instanceof String)
 						res.end = luxon.DateTime.fromISO(res.end, { zone: this.timezone, locale: this.locale });
 				}
@@ -171,7 +199,10 @@ export default {
 			// choose default mode
 			let mode = this.mode;
 			if (mode)
-				mode = mode.toLowerCase();
+			{
+				const lower = mode.toLowerCase();
+				mode = Object.keys(this.modes).find(key => key.toLowerCase() === lower) || null;
+			}
 			if (!mode || !this.modes[mode])
 				mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
 			return mode || '';
@@ -188,7 +219,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 +271,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 +292,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 +307,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 +319,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}" />
@@ -308,4 +335,4 @@ export default {
 		</bs-modal>
 	</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,153 @@ 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(),
+				ctrlKey: !!(evt?.ctrlKey || evt?.metaKey)
+			});
+		},
+
+		_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(),
+				ctrlKey: !!(evt?.ctrlKey || evt?.metaKey)
+			});
+		},
+		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 +545,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 +564,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 +578,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 +586,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 +599,4 @@ export default {
 		</div>
 	</div>
 	`
-}
+}

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

@@ -137,6 +137,7 @@ export default {
 				v-if="!event.display || event.display === 'default'"
 				: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,41 @@
-import CalDnd from '../../../../../directives/Calendar/DragAndDrop.js';
+import draggable from '../../../../../directives/draggable.js';
+import drop from '../../../../../directives/drop.js';
 import CalClick from '../../../../../directives/Calendar/Click.js';
 
 export default {
 	name: "GridLineEvent",
 	directives: {
-		CalDnd,
+		draggable,
+		drop,
 		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: () => ({})
+		},
+		onDrop: {
+			from: "onDrop",
+			default: () => null
+		}
 	},
 	props: {
 		event: {
@@ -27,6 +53,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 +66,131 @@ export default {
 				if (this.event.endsHere)
 					classes.push('event-end');
 			}
-			return classes
+
+			classes.push(`calender_id-${this.event.orig.kalender_id}`);
+			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);
+		},
+		onDropOnCard(evt, items) {
+			if (this.isHeaderOrFooter || !this.onDrop)
+				return;
+
+			const list = Array.isArray(items) ? items : [items];
+			const obj = list[0];
+			if (!obj)
+				return;
+
+			if ((evt.ctrlKey || evt.metaKey) && obj.type === 'lehreinheit')
+			{
+				return this.onDrop({
+					item: [obj],
+					ctrlKey: true,
+					targetKalenderId: this.event.orig?.kalender_id ?? null
+				});
+			}
+
+			return this.onDrop({
+				item: [obj],
+				start: this.event.start.toISO(),
+				end: this.event.end.toISO(),
+				ctrlKey: false,
+				targetKalenderId: null
+			});
+		},
+	},
+	template:`
 	<div
 		class="fhc-calendar-base-grid-line-event event"
 		:class="classes"
-		style="z-index: 1"
+		style="z-index: 11"
 		:draggable="draggable"
-		v-cal-dnd:draggable="event"
+		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"
 	>
+		<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,35 @@
+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
+		},
+		topicString() {
+			return Array.isArray(this.event.orig.topic) ? this.event.orig.topic.join(', ') : this.event.orig.topic;
+		},
+	},
+	template: `
+	<div
+		class="fhc-calendar-base-grid-line-event event"
+		v-draggable:move.noimage="dragKalenderCollection"
+		style="border:1px"
+	>
+		<div class="title">
+			{{ topicString || 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"