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

@@ -23,15 +23,6 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["slot_room"] = array(
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["ferien"] = array(
@@ -42,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/noten.php

@@ -1,17 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// 'entschuldigt' & 'noch nicht eingetragen' -> wirken sich nicht auf Antritte aus
-$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk
-
-$config['NOTEN_OCCURANCE_LIMIT_MAP'] = [17 => 1]; // across the 4 fixed antritte only one can be entschuldigt
-
-// tbl_note pk of the 'entschuldigt' note. An entschuldigt Termin is preserved as its own dated
-// entry when a new pruefung of the same type is created (instead of being overwritten).
-$config['NOTE_ENTSCHULDIGT'] = 17;
-
-// availability of the two Benotungstool import flows. When both are true they are shown as
-// separate buttons/dialogs.
-$config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'] = true;  // dated import that creates a pruefung per row
-$config['CIS_GESAMTNOTE_NOTENIMPORT'] = false;     // classic note-only import (uid + note, no date)

application/config/routes.php

@@ -67,7 +67,6 @@ $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 $route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
 //Route for LV Plan Stg/Semester/Verband/Gruppe
 $route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
-$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';

application/config/tempus.php

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

application/controllers/Cis/Benotungstool.php

@@ -1,37 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Benotungstool extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => self::PERM_LOGGED
-		]);
-
-		$this->_ci =& get_instance();
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
-	}
-	
-}

application/controllers/Cis/Compat.php

@@ -1,44 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Compat extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct([
-			'ci' => ['basis/cis:r'],
-			'legacy' => ['basis/cis:r'],
-			
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * @access public
-	 * @return void 
-	 */
-	public function ci()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-	/**
-	 * @access public
-	 * @return void
-	 */
-	public function legacy()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-}

application/controllers/Cis/ProjektabgabeUebersicht.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class ProjektabgabeUebersicht extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'ProjektabgabeUebersicht']);
-	}
-}

application/controllers/Cis/Zeitsperren.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * index loads the view Zeitsperren
-	 * @access public
-	 * @return void
-	 */
-	public function index()
-	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'zeitsperren']);
-	}
-}

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

@@ -18,9 +18,18 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+//require_once('../../../include/studiengang.class.php');
+//require_once('../../../include/student.class.php');
+//require_once('../../../include/datum.class.php');
+//require_once('../../../include/mail.class.php');
+//require_once('../../../include/benutzerberechtigung.class.php');
+//require_once('../../../include/phrasen.class.php');
+//require_once('../../../include/projektarbeit.class.php');
+//require_once('../../../include/projektbetreuer.class.php');
+
 class Lehre extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -31,56 +40,38 @@ class Lehre extends FHCAPI_Controller
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
 			'semesterAverageGrade' => self::PERM_LOGGED,
-			'getZugewieseneLv' => self::PERM_LOGGED,
-			'getLeForLv' => self::PERM_LOGGED
 		]);
-
-		$this->load->library('PhrasesLib');
-
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'abgabetool'
-			)
-		);
-
-		$this->load->helper('hlp_sancho_helper');
-
-		require_once(FHCPATH . 'include/studiengang.class.php');
-		require_once(FHCPATH . 'include/student.class.php');
-		require_once(FHCPATH . 'include/projektarbeit.class.php');
-		require_once(FHCPATH . 'include/projektbetreuer.class.php');
+		
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	/**
+    /**
 	 * constructs the emails of the groups from a lehrveranstaltung
 	 */
-	public function lvStudentenMail()
+    public function lvStudentenMail()
 	{
-		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        
+        // return early if the required parameter is missing
+        if(!isset($lehreinheit_id))
+        {
+            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+        }
 
-		// return early if the required parameter is missing
-		if(!isset($lehreinheit_id))
-		{
-			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-		}
+        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+        
+        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
 
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
-
-		$studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
 
 		//convert array of objects into array of strings
 		$studentenMails = array_map(function($element){
 			return $element->mail;
 		}, $studentenMails);
 
-		$this->terminateWithSuccess($studentenMails);
+        $this->terminateWithSuccess($studentenMails);
 	}
 
 	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
@@ -90,13 +81,13 @@ class Lehre extends FHCAPI_Controller
 		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
 
 		$result = current($this->getDataOrTerminateWithError($result));
-
+		
 		$this->terminateWithSuccess($result);
 	}
 
 	/**
 	 * fetches all Pruefungen of a student for a specific lehrveranstaltung
-	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
+	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database 
 	 * @param mixed $lehrveranstaltung_id
 	 * @return void
 	 */
@@ -154,46 +145,5 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(['average_grade' => $averageGrade, 'weighted_average_grade' => $weightedAverageGrade]);
 	}
-
-	/**
-	 * fetches all assigned lehrveranstaltungen of a mitarbeiter for a given semester
-	 * @param mixed $uid
-	 * @param mixed $sem_kurzbz
-	 * @return void
-	 */
-	public function getZugewieseneLv() {
-		$uid = $this->input->get("uid",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		// TODO: error messages
-
-		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if (!isset($uid) || isEmptyString($uid))
-			$uid = getAuthUID();
-
-		// querying other ma_uids data requires admin permission
-		if($uid !== getAuthUID()) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
-		}
-
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getLeForLv() {
-		$lv_id = $this->input->get("lv_id",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-//		$this->terminateWithSuccess($this->LehreinheitModel->getLesForLv($lv_id, $sem_kurzbz));
-		$this->terminateWithSuccess($this->LehreinheitModel->getAllLehreinheitenForLvaAndMaUid($lv_id, getAuthUID(), $sem_kurzbz));
-	}
-
 }
+

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

@@ -36,8 +36,7 @@ class LvMenu extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLvMenu' => self::PERM_LOGGED,
-			'getMultipleLvMenu' => self::PERM_LOGGED
+			'getLvMenu' => self::PERM_LOGGED
 		]);
 
 		$this->load->model("ressource/Mitarbeiter_model");
@@ -62,23 +61,24 @@ class LvMenu extends FHCAPI_Controller
 
 	/**
 	 * alternative function to get multiple lvMenus with a single http request
-	 * not yet working as intended as the menu_lv.inc.php scripts called by the
-	 * lvMenuBuild event have logic coupled to require_once import which results in
-	 * a wrong logic after the first invocation -> faulty results for lvinfo, moodle
-	 * and several others
 	 */
-	public function getMultipleLvMenu(){
-		$lvMenuOptionList = $this->input->post('lvMenuOptionList', true);
+	public function getMultipleLvMenu($lvMenuOptionList){
 		$result =[];
 		foreach($lvMenuOptionList as $lvMenuOptions){
-			$lvMenu = $this->getLvMenuInternal($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
-			
+			$lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+			if(isError($lvMenu)){
+				// TODO: some lvMenu threw an error, handle error here
+			}
 			$result[$lvMenuOptions['lvid']]=$lvMenu;
 		}
 		$this->terminateWithSuccess($result);
 	}
-	
-	private function getLvMenuInternal($lvid, $studiensemester_kurzbz) {
+
+	/**
+	 * 
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{
 
 		// return early if parameters are missing
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
@@ -89,14 +89,14 @@ class LvMenu extends FHCAPI_Controller
 
 		// get the user
 		if (!$user=getAuthUID())
-			$this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
+		    $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
 
 		// check if is_lector
 		$is_lector = false;
 		$mares = $this->Mitarbeiter_model->isMitarbeiter($user);
 		if(hasData($mares))
 		{
-			$is_lector = getData($mares);
+		    $is_lector = getData($mares);
 		}
 
 		// definition of user_is_allowed_to_upload
@@ -105,7 +105,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// load lehrveranstaltung
 		$lvres = $this->Lehrveranstaltung_model->load($lvid);
-		if(!hasData($lvres))
+		if(!hasData($lvres)) 
 		{
 			$this->terminateWithError('LV ' . $lvid . ' not found.');
 		}
@@ -124,7 +124,7 @@ class LvMenu extends FHCAPI_Controller
 		$stgres = $this->Studiengang_model->load(strval($studiengang_kz));
 		if(!hasData($stgres))
 		{
-			$this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
+		    $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
 		}
 		$stg = (getData($stgres))[0];
 		$kurzbz = strtoupper($stg->typ . $stg->kurzbz);
@@ -139,7 +139,7 @@ class LvMenu extends FHCAPI_Controller
 			$angemeldet = false;
 
 			$lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
-				$lvid, $user, $angezeigtes_stsem
+			    $lvid, $user, $angezeigtes_stsem
 			);
 
 			if(hasData($lesres) && count(getData($lesres)) > 0)
@@ -148,7 +148,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// lehrfach
 		$lehrfach_id='';
-
+		
 		if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
 		{
 			// Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
@@ -211,8 +211,8 @@ class LvMenu extends FHCAPI_Controller
 		foreach($fbs as $row)
 		{
 			$lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
-			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz)
-				|| $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
+			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz) 
+			    || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
 			{
 				$user_is_allowed_to_upload=true;
 			}
@@ -224,21 +224,21 @@ class LvMenu extends FHCAPI_Controller
 		$menu = array();
 
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
-
+		
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid);
-
+		
 		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
-
+		
 		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
-
+		
 
 		// Addons Menu Logic
 		// ##########################################################################################		
@@ -272,18 +272,18 @@ class LvMenu extends FHCAPI_Controller
 			'permissionLib' => &$this->PermissionLib,
 			'phrasesLib' => &$this->PhrasesLib
 		];
-
-		Events::trigger('lvMenuBuild',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
+		
+		Events::trigger('lvMenuBuild', 
+						// passing $menu per reference
+						function & () use (&$menu) {
+							return $menu;
+						},
+						$params
 		);
 
 		// Menu sortieren
 		// ##########################################################################################
-
+		
 		foreach ($menu as $key => $row){
 
 			// removes menu points that are not needed in the c4 lvUebersicht
@@ -291,7 +291,7 @@ class LvMenu extends FHCAPI_Controller
 				unset($menu[$key]);
 				continue;
 			}
-
+			
 			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];
 
@@ -299,18 +299,11 @@ class LvMenu extends FHCAPI_Controller
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
-
-		return $menu;
-	}
-	
-	/**
-	 * 
-	 */
-	public function getLvMenu($lvid, $studiensemester_kurzbz)
-	{
-		$menu = $this->getLvMenuInternal($lvid, $studiensemester_kurzbz);
+		// HTTP response
+		// ##########################################################################################
 		
 		$this->terminateWithSuccess($menu);
+
 	}
 
 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){
@@ -379,8 +372,7 @@ class LvMenu extends FHCAPI_Controller
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
 					'phrase' => 'lehre/gesamtnote',
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
-					'c4_link'=> site_url('Cis/Benotungstool/'.urlencode($lvid).'/'.urlencode($angezeigtes_stsem))
-					//'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
@@ -549,4 +541,4 @@ class LvMenu extends FHCAPI_Controller
 			);
 		}
     }
-}
+}

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

@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-class Studiensemester extends FHCAPI_Controller
-{
-
-	private $_ci;
-	
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudiensemester'=> self::PERM_LOGGED,
-
-		]);
-
-		$this->_ci =& get_instance();
-		
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * GET METHOD
-	 * returns List of all studiensemester as well as current one
-	 */
-	public function getStudiensemester()
-	{
-		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
-		$result = $this->_ci->StudiensemesterModel->load();
-
-		$studiensemester = getData($result);
-		$result = $this->_ci->StudiensemesterModel->getAkt();
-		$aktuell = getData($result);
-
-		$this->terminateWithSuccess(array($studiensemester, $aktuell));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-
-
-}
-

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

@@ -1,367 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getZeitsperrenUser' => self::PERM_LOGGED,
-			'getTypenZeitsperren' => self::PERM_LOGGED,
-			'getTypenErreichbarkeit' => self::PERM_LOGGED,
-			'getStunden' => self::PERM_LOGGED,
-			'loadZeitsperre' => self::PERM_LOGGED,
-			'add' => self::PERM_LOGGED,
-			'update' => self::PERM_LOGGED,
-			'delete' => self::PERM_LOGGED,
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'zeitsperren'
-		]);
-
-		// Load models
-		$this->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->load->model('ressource/Zeitsperretyp_model', 'ZeitsperretypModel');
-		$this->load->model('ressource/Erreichbarkeit_model', 'ErreichbarkeitModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->load->model('ressource/Zeitaufzeichnung_model', 'ZeitaufzeichnungModel');
-	}
-
-	public function getZeitsperrenUser($uid)
-	{
-		//check if $uid is passedUser
-		$loggedInUser = getAuthUID();
-		if($loggedInUser != $uid) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) {
-				$this->terminateWithError($this->p->t('ui', 'noAdmin'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->ZeitsperreModel->getZeitsperrenUser($uid);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenZeitsperren()
-	{
-		$this->ZeitsperretypModel->addOrder('beschreibung', 'ASC');
-		$result = $this->ZeitsperretypModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenErreichbarkeit()
-	{
-		$result = $this->ErreichbarkeitModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getStunden()
-	{
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->StundeModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function loadZeitsperre($zeitsperre_id)
-	{
-		$this->ZeitsperreModel->addSelect(
-			'campus.tbl_zeitsperre.*, typ.*,
-			ma.person_id AS ma_person_id, ma.vorname AS ma_vorname, ma.nachname AS ma_nachname,
-			ma.titelpre AS ma_titelpre, ma.titelpost AS ma_titelpost'
-		);
-		$this->ZeitsperreModel->addJoin('campus.tbl_zeitsperretyp typ', 'ON (typ.zeitsperretyp_kurzbz = campus.tbl_zeitsperre.zeitsperretyp_kurzbz)');
-		$this->ZeitsperreModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = campus.tbl_zeitsperre.vertretung_uid)', 'LEFT');
-		$this->ZeitsperreModel->addJoin('public.tbl_person ma', 'ON (ma.person_id = ben.person_id)', 'LEFT');
-		$result = $this->ZeitsperreModel->loadWhere(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((current(getData($result)) ?: []));
-	}
-
-	public function add($mitarbeiter_uid)
-	{
-		$loggedInUser = getAuthUID();
-
-		if($mitarbeiter_uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$this->form_validation->set_rules('zeitsperretyp_kurzbz', 'Grund Zeitsperre', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Grund Zeitsperre'])
-		]);
-
-		$this->form_validation->set_rules('vondatum', 'VonDatum', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
-		]);
-
-		$this->form_validation->set_rules('bisdatum', 'BisDatum', 'required|is_valid_date|callback_check_von_bis_datum|callback_check_diff_intval', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'BisDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum']),
-			'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-			'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$bezeichnung = $this->input->post('bezeichnung');
-		$vondatum = $this->input->post('vondatum');
-		$vonstunde = $this->input->post('vonstunde');
-		$bisdatum = $this->input->post('bisdatum');
-		$bisstunde = $this->input->post('bisstunde');
-		//$vonIso = $this->input->post('vonISO'); //Timestamp für Stunde
-		//$bisIso = $this->input->post('bisISO'); //Timestamp für Stunde
-		$erreichbarkeit_kurzbz = $this->input->post('erreichbarkeit_kurzbz');
-		$vertretung_uid = $this->input->post('vertretung_uid');
-		$zeitsperretyp_kurzbz = $this->input->post('zeitsperretyp_kurzbz');
-
-		//check if existing zeitsperre
-		$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if(hasData($result))
-		{
-			$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if existing zeitaufzeichnung
-		if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-		{
-			$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-			if(hasData($result))
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->ZeitsperreModel->insert(
-			[
-				'mitarbeiter_uid' => $mitarbeiter_uid,
-				'bezeichnung' => $bezeichnung,
-				'vondatum' => $vondatum,
-				'vonstunde' => $vonstunde,
-				'bisdatum' => $bisdatum,
-				'bisstunde' => $bisstunde,
-				'erreichbarkeit_kurzbz' => $erreichbarkeit_kurzbz,
-				'zeitsperretyp_kurzbz' => $zeitsperretyp_kurzbz,
-				'vertretung_uid' => $vertretung_uid,
-				'insertvon' =>  $loggedInUser,
-				'insertamum' => date('c'),
-			]
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update($zeitsperre_id)
-	{
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		if(!$zeitsperre_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-		//get current params
-		$array_update = [
-			'bezeichnung',
-			'vondatum',
-			'vonstunde',
-			'bisdatum',
-			'bisstunde',
-			//	'vonISO', //Timestamp für Stunde
-			//	'bisISO', //Timestamp für Stunde
-			'erreichbarkeit_kurzbz',
-			'vertretung_uid',
-			'zeitsperretyp_kurzbz',
-			'mitarbeiter_uid',
-		];
-		$post = $this->input->post();
-		$update = [];
-
-		foreach ($array_update as $prop)
-		{
-			if (array_key_exists($prop, $post))
-			{
-				$update[$prop] = $post[$prop];
-			}
-		}
-
-		// Validation
-		$rulesDefined = false;  //necessary, otherwise CI validation will always be triggered, even without rules
-		foreach ($update as $key => $val) {
-			switch ($key) {
-				case 'zeitsperretyp_kurzbz':
-					$this->form_validation->set_rules(
-						$key,
-						'Grund Zeitsperre',
-						'required',
-						['required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'Grund Zeitsperre'])]
-					);
-					$rulesDefined = true;
-					break;
-				case 'vondatum':
-					$this->form_validation->set_rules(
-						$key,
-						'VonDatum',
-						'required|is_valid_date',
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'VonDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'VonDatum'])
-						]
-					);
-					$rulesDefined = true;
-					break;
-				case 'bisdatum':
-					$rules = 'required|is_valid_date';
-					if (array_key_exists('vondatum', $update)) {
-						$rules .= '|callback_check_von_bis_datum|callback_check_diff_intval';
-					}
-					$this->form_validation->set_rules(
-						$key,
-						'BisDatum',
-						$rules,
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'BisDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'BisDatum']),
-							'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-							'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-						]
-					);
-					$rulesDefined = true;
-					break;
-			}
-		}
-
-		if ($rulesDefined && $this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if(array_key_exists('vondatum', $post) || array_key_exists('bisdatum', $post))
-		{
-			$result = $this->ZeitsperreModel->load($zeitsperre_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$data = current($data);
-
-			$mitarbeiter_uid = array_key_exists('mitarbeiter_uid', $post) ? $update['mitarbeiter_uid'] : $data->mitarbeiter_uid;
-			$vondatum = array_key_exists('vondatum', $post) ? $update['vondatum'] : $data->vondatum;
-			$bisdatum = array_key_exists('bisdatum', $post) ? $update['bisdatum'] : $data->bisdatum;
-			$vonstunde = array_key_exists('vonstunde', $post) ? $update['vonstunde'] : $data->vonstunde;
-			$zeitsperretyp_kurzbz = array_key_exists('zeitsperretyp_kurzbz', $post) ? $update['zeitsperretyp_kurzbz'] : $data->zeitsperretyp_kurzbz;
-
-			$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if(hasData($result))
-			{
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-			}
-
-			//check if existing zeitaufzeichnung
-			if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-			{
-				$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-				if(hasData($result))
-					$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		if (!empty($update)) {
-			$update['updatevon'] = $loggedInUser;
-			$update['updateamum'] = date('c');
-			$result = $this->ZeitsperreModel->update($zeitsperre_id, $update);
-
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$this->terminateWithSuccess($data);
-		}
-		else
-			$this->terminateWithSuccess("no update");
-	}
-
-	public function delete($zeitsperre_id)
-	{
-
-		if (!is_numeric($zeitsperre_id) || (int)$zeitsperre_id <= 0)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->ZeitsperreModel->delete(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function check_von_bis_datum($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		return $vondatum <= $bisdatum;
-	}
-
-	public function check_diff_intval($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		// Intervall in days
-		$vonTs = strtotime($vondatum);
-		$bisTs = strtotime($bisdatum);
-
-		$tage = ($bisTs - $vonTs) / 86400;
-
-		// if intervall > 14
-		return $tage <= 14;
-	}
-
-
-}

application/controllers/api/frontend/v1/calendar/RoomPlan.php

@@ -1,232 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class RoomPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addRoomReservation' => self::PERM_LOGGED,
-			'deleteRoomReservation' => self::PERM_LOGGED,
-			'getRoomCreationInfo' => self::PERM_LOGGED,
-			'getGruppen' => self::PERM_LOGGED,
-			'getLektor' => self::PERM_LOGGED,
-			'getReservableMap' => self::PERM_LOGGED,
-		]);
-
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API',
-			'dbExecuteUser' => 'RESTful API'
-		));
-
-		$this->load->library('form_validation');
-		$this->load->library('PermissionLib');
-		$this->load->library('StundenplanLib');
-
-		$this->loadPhrases(['ui']);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-
-	public function addRoomReservation()
-	{
-		$this->form_validation->set_rules('selectedStart', "Start", "required");
-		$this->form_validation->set_rules('selectedEnd', "End", "required");
-		$this->form_validation->set_rules('title', "Title", "required|max_length[10]");
-		$this->form_validation->set_rules('beschreibung', "Beschreibung", "required|max_length[32]");
-		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required|max_length[16]");
-		$this->form_validation->set_rules('studiengang', 'Studiengang', 'numeric');
-		$this->form_validation->set_rules('semester', 'Semester', 'integer|greater_than_equal_to[0]');
-		$this->form_validation->set_rules('verband', 'Verband', 'trim');
-		$this->form_validation->set_rules('gruppe', 'Gruppe', 'trim');
-		$this->form_validation->set_rules('spezialgruppe', 'Spezialgruppe', 'max_length[32]');
-		$this->form_validation->set_rules('lektoren', 'Lektoren');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$start = $this->input->post('selectedStart');
-		$end = $this->input->post('selectedEnd');
-		$title = $this->input->post('title');
-		$beschreibung = $this->input->post('beschreibung');
-		$ort_kurzbz = $this->input->post('ort_kurzbz');
-
-		$studiengang_kz = $this->input->post('studiengang');
-		$semester = $this->input->post('semester');
-		$verband = $this->input->post('verband');
-		$gruppe = $this->input->post('gruppe');
-		$spezialgruppe = $this->input->post('spezialgruppe');
-		$lektoren = $this->input->post('lektoren');
-
-
-		$result = $this->stundenplanlib->addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren, $studiengang_kz, $semester, $verband, $gruppe, $spezialgruppe);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function deleteRoomReservation()
-	{
-		$reservierung_id = $this->input->post('reservierung_id');
-
-		$result = $this->stundenplanlib->deleteReservation($reservierung_id);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getRoomCreationInfo()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-		if (!$this->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$this->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError($studiengaenge);
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-
-		$this->terminateWithSuccess($return_array);
-	}
-
-	public function getGruppen()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/gruppe_model', 'GruppeModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->GruppeModel->addOrder('gruppe_kurzbz');
-		$this->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->GruppeModel->db->group_start();
-			$this->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('beschreibung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('orgform_kurzbz ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->GruppeModel->db->or_where('studiengang_kz', $word);
-			}
-			$this->GruppeModel->db->group_end();
-		}
-		$this->GruppeModel->db->group_end();
-		$this->GruppeModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$gruppen = $this->GruppeModel->loadWhere(array('sichtbar' => true, 'lehre' => true));
-		if (isError($gruppen))
-			$this->terminateWithError($gruppen);
-
-		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : []);
-	}
-
-	public function getLektor()
-	{
-
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-		$this->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-		$this->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->MitarbeiterModel->db->group_start();
-			$this->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->group_end();
-		}
-		$this->MitarbeiterModel->db->group_end();
-
-		$this->MitarbeiterModel->addOrder('nachname');
-		$this->MitarbeiterModel->addOrder('vorname');
-		$mitarbeiter = $this->MitarbeiterModel->load();
-		if (isError($mitarbeiter))
-			$this->terminateWithError($mitarbeiter);
-
-		$this->terminateWithSuccess(hasData($mitarbeiter) ? getData($mitarbeiter) : []);
-	}
-
-	public function getReservableMap($ort_kurzbz = null)
-	{
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-
-		$result = $this->stundenplanlib->getReservableMap($ort_kurzbz, $start_date, $end_date);
-
-		$this->terminateWithSuccess(array('reservierbarMap' => hasData($result) ? getData($result) : []));
-	}
-
-}

application/controllers/api/frontend/v1/education/PaabgabeUebersicht.php

@@ -1,218 +0,0 @@
-<?php
-/**
- * FH-Complete
- *
- * @package		FHC-API
- * @author		FHC-Team
- * @copyright	Copyright (c) 2016, fhcomplete.org
- * @license		GPLv3
- * @link		http://fhcomplete.org
- * @since		Version 1.0
- * @filesource
- */
-// ------------------------------------------------------------------------
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class PaabgabeUebersicht extends FHCAPI_Controller
-{
-	const DOWNLOAD_PERMISSION = 'lehre/abgabetool:download';
-	const ABGABE_TYPES = ['Bachelor', 'Diplom'];
-
-	/**
-	 * PaabgabeUebersicht API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'viewData' => self::PERM_LOGGED,
-			'getPaAbgaben' => array('lehre/abgabetool:r'),
-			'getStudiengaenge' => array('lehre/abgabetool:r'),
-			'getTermine' => array('lehre/abgabetool:r'),
-			'getPaAbgabetypen' => array('lehre/abgabetool:r'),
-			'downloadZip' => array('lehre/abgabetool:r'),
-			//'downloadProjektarbeit' => array('lehre/abgabetool:r')
-		]);
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$this->load->library('PermissionLib');
-
-		// Load Phrases
-		$this->loadPhrases([
-			'abgabetool'
-		]);
-	}
-
-	public function viewData()
-	{
-		$viewData = [
-			"uid" => getAuthUID(),
-			// TODO create permission
-			"showEdit" => true,
-		];
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-	/**
-	 * Get Projektabgaben for search criteria.
-	 */
-	public function getPaAbgaben()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		// check wether Abgabe is in visual library
-		if (hasData($result))
-		{
-			Events::trigger('in_visual_library', getData($result));
-		}
-
-		$this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	/**
-	 * Get all Studiengänge for which user is entitled for
-	 */
-	public function getStudiengaenge()
-	{
-		$studiengang_kz_arr = $this->permissionlib->getSTG_isEntitledFor(self::DOWNLOAD_PERMISSION);
-
-		if (!$studiengang_kz_arr) $this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addSelect('tbl_studiengang.*, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) AS kuerzel', $studiengang_kz_arr);
-		$this->StudiengangModel->db->where_in('studiengang_kz', $studiengang_kz_arr);
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$result = $this->StudiengangModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get projekt work due dates, depending on search criteria.
-	 */
-	public function getTermine()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-
-		$result = $this->PaabgabeModel->getTermine(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get all submission types.
-	 */
-	public function getPaAbgabetypen()
-	{
-		// Load model PaabgabetypModel
-		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
-
-		$this->PaabgabetypModel->addOrder('bezeichnung');
-		$result = $this->PaabgabetypModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Download zip files with project works matching submission search criteria.
-	 */
-	public function downloadZip()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		if (!isset($studiengang_kz) && !isset($abgabetyp_kurzbz) && !isset($abgabedatum) && !isset($personSearchString))
-			$this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'nichtsAusgewaehlt'));
-
-		$this->load->library('zip');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithFileOutput('text/plain', getError($result));
-
-		$fileExists = false;
-		$studiengang_kuerzel = null;
-
-		if (!hasData($result)) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$abgaben = getData($result);
-
-		foreach ($abgaben as $abgabe)
-		{
-			$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$abgabe->uid.'.pdf';
-			if (file_exists($path))
-			{
-				$fileExists = true;
-				$studiengang_kuerzel = $abgabe->studiengang_kuerzel;
-				$this->zip->read_file($path);
-			}
-		}
-
-		if (!$fileExists) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$zipFileName = 'Abgabe'.(isset($studiengang_kz) && isset($studiengang_kuerzel) ? '_'.$studiengang_kuerzel : '').'.zip';
-		$this->zip->download($zipFileName);
-	}
-
-	/**
-	 * Download Projektarbeit document.
-	 */
-	//~ public function downloadProjektarbeit()
-	//~ {
-		//~ $paabgabe_id = $this->input->get('paabgabe_id');
-
-		//~ if (!is_numeric($paabgabe_id))
-			//~ $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Abgabe ID']), self::ERROR_TYPE_GENERAL);
-
-		//~ //$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
-		//~ $this->PaabgabeModel->addSelect("paabgabe_id, student_uid, tbl_paabgabe.datum, tbl_paabgabe.abgabedatum, projekttyp_kurzbz, titel, titel_english,
-					//~ paabgabe_id || '_' || student_uid || '.pdf' AS filename");
-		//~ $this->PaabgabeModel->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
-		//~ $abgabeRes = $this->PaabgabeModel->load($paabgabe_id);
-
-		//~ if (isError($abgabeRes))
-			//~ show_error(getError($abgabeRes));
-
-		//~ if (hasData($abgabeRes))
-		//~ {
-			//~ $endabgabe = getData($abgabeRes)[0];
-			//~ $filepath = PAABGABE_PATH.$endabgabe->filename;
-
-			//~ if (file_exists($filepath))
-			//~ {
-				//~ $this->output
-					//~ ->set_status_header(200)
-					//~ ->set_content_type('application/pdf', 'utf-8')
-					//~ ->set_header('Content-Disposition: attachment; filename="'.$endabgabe->filename.'"')
-					//~ ->set_output(file_get_contents($filepath))
-					//~ ->_display();
-			//~ }
-			//~ else
-			//~ {
-				//~ show_error("File does not exist.");
-			//~ }
-		//~ }
-	//~ }
-}

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

@@ -13,13 +13,12 @@ class Mylv extends Auth_Controller
 	 */
 	public function __construct()
 	{
-		
 		parent::__construct([
-			'Student' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Lvs' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Info' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'] // TODO(chris): permissions?
+			'Student' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 
@@ -45,27 +44,13 @@ class Mylv extends Auth_Controller
 	public function Studiensemester()
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
-		if($isMitarbeiter) {
-			$result = $this->StudiensemesterModel->getWhereMitarbeiterHasLvs(getAuthUID());
+		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
 
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
 
-			$this->outputJsonSuccess(getData($result));
-		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
-			$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
-
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
-
-			$this->outputJsonSuccess(getData($result));
-		} else {
-			$this->outputJsonError('neither student or mitarbeiter');
-		}
+		$this->outputJsonSuccess(getData($result));
 	}
 
 	/**
@@ -73,27 +58,13 @@ class Mylv extends Auth_Controller
 	public function Lvs($studiensemester_kurzbz)
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
-		if($isMitarbeiter) {
-			$result = $this->LehrveranstaltungModel->getLvsByMitarbeiterInSemester(getAuthUID(), $studiensemester_kurzbz);
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
 
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
 
-			$this->outputJsonSuccess(getData($result));
-		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
-			$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
-
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
-
-			$this->outputJsonSuccess(getData($result));
-		} else {
-			$this->outputJsonError('neither student or mitarbeiter');
-		}
+		$this->outputJsonSuccess(getData($result));
 	}
 
 	/**

application/controllers/jobs/TempusJob.php

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

application/controllers/lehre/Pruefungsprotokoll.php

@@ -215,11 +215,8 @@ class Pruefungsprotokoll extends Auth_Controller
 			if (hasData($abschlusspruefung))
 			{
 				$abschlusspruefung_data = getData($abschlusspruefung);
-				if ($this->permissionlib->isBerechtigt('admin')
-					|| (
-						isset($abschlusspruefung_data->studiengang_kz)
-						&& $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz)
-					)
+				if ($this->permissionlib->isBerechtigt('admin') ||
+					(isset($abschlusspruefung_data->studiengang_kz) && $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz))
 					|| $this->_uid === $abschlusspruefung_data->uid_vorsitz)
 					$result = $abschlusspruefung;
 				else

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

@@ -114,7 +114,6 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
-		$this->_ci->addMeta("stundenplanData", $stundenplan_data);
 		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
@@ -375,39 +374,6 @@ class StundenplanLib
 			$item->gruppe = $gruppe_obj_array;
 			$item->lektor = $lektor_obj_array;
 
-			$this->_ci->load->library('PermissionLib');
-			$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'sui');
-
-			$now = time();
-			$res_lektor_start = $this->jump_day($now, RES_TAGE_LEKTOR_MIN - 1);
-			$res_lektor_ende  = mktime(0, 0, 0, date('m', $now), date('d', $now) + RES_TAGE_LEKTOR_BIS, date('Y', $now));
-
-			$start_date = is_numeric($item->beginn) ? $item->beginn : strtotime($item->beginn);
-			if (!date('w', $start_date)) {
-				$start_date = $this->jump_day($start_date, 1);
-			}
-
-			$start_date_str = date('Y-m-d', $start_date);
-			$res_lektor_start_str = date('Y-m-d', $res_lektor_start);
-			$res_lektor_ende_str = date('Y-m-d', $res_lektor_ende);
-
-			$show_delete = (
-				(
-					$berechtigt_begrenzt &&
-					(
-						(isset($item->insertvon) && $item->insertvon == getAuthUID()) ||
-						(isset($item->uids) && in_array(getAuthUID(), $item->uids))
-					)
-				) &&
-				$start_date_str >= $res_lektor_start_str &&
-				$start_date_str <= $res_lektor_ende_str
-			);
-
-			if ($show_delete)
-				$item->deletable = true;
-			else
-				$item->deletable = false;
-
 		}
 	}
 
@@ -503,212 +469,6 @@ class StundenplanLib
 		return success($stundenplan_data);
 	}
 
-	public function addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren = null, $studiengang = null, $semester = null, $verband = null, $gruppe = null, $spezialgruppe = null)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
-		$this->_ci->load->model('ressource/stundenplan_model', 'StundenplanModel');
-		$this->_ci->load->library('PermissionLib');
-
-		$startTime = new DateTime($start);
-		$endTime = new DateTime($end);
-
-		$stunden = $this->_ci->StundeModel->loadWhere(array(
-			'beginn <' => $endTime->format('H:i:s'),
-			'ende >' => $startTime->format('H:i:s')
-		));
-
-		if (!hasData($stunden))
-		{
-			return error("Keine Stunden vorhanden");
-		}
-
-		$stunden = array_column(getData($stunden), 'stunde');
-
-		$this->_ci->StundenplandevModel->db->select('1');
-		$this->_ci->StundenplandevModel->db->where('datum', $startTime->format('Y-m-d'));
-		$this->_ci->StundenplandevModel->db->where('ort_kurzbz', $ort_kurzbz);
-		$this->_ci->StundenplandevModel->db->where_in('stunde', $stunden);
-		$stundenplandev_belegung = $this->_ci->StundenplandevModel->load();
-
-		$this->_ci->StundenplanModel->db->select('1');
-		$this->_ci->StundenplanModel->db->where('ort_kurzbz', $ort_kurzbz);
-		$this->_ci->StundenplanModel->db->where('datum', $startTime->format('Y-m-d'));
-		$this->_ci->StundenplanModel->db->where_in('stunde', $stunden);
-		$stundenplan_belegung = $this->_ci->StundenplanModel->load();
-
-		if ((hasData($stundenplandev_belegung) || hasData($stundenplan_belegung))
-			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
-			return error ('lvplan/bereitsReserviert');
-
-		$this->_ci->ReservierungModel->addSelect('stunde');
-		$reservation_hours = $this->_ci->ReservierungModel->loadWhere(array('datum' => $startTime->format('Y-m-d'), 'ort_kurzbz' => $ort_kurzbz));
-
-
-		if (isError($reservation_hours))
-			return $reservation_hours;
-
-		$reservation_hours = hasData($reservation_hours) ? array_column(getData($reservation_hours), 'stunde') : array();
-
-		if (!empty(array_intersect($stunden, $reservation_hours))
-			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
-			return error("lvplan/bereitsReserviert");
-
-
-		if (!empty($lektoren))
-		{
-			foreach ($lektoren as $lektor)
-			{
-				$insert = array('ort_kurzbz' => $ort_kurzbz,
-					'datum' => $startTime->format('Y-m-d'),
-					'titel' => $title,
-					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
-					'beschreibung' => $beschreibung,
-					'insertvon' => getAuthUID(),
-					'uid' => $lektor,
-					'semester' => is_null($semester) ? null : $semester,
-					'verband' => is_null($verband) ? null : $verband,
-					'gruppe' => is_null($gruppe) ? null : $gruppe,
-					'gruppe_kurzbz' => is_null($spezialgruppe) ? null : $spezialgruppe,
-				);
-
-				foreach ($stunden as $stunde)
-				{
-					$insert['stunde'] = $stunde;
-					$check_insert = $this->_ci->ReservierungModel->insert($insert);
-					if (isError($check_insert))
-						return $check_insert;
-				}
-			}
-		}
-		else
-		{
-			foreach ($stunden as $stunde)
-			{
-				$check_insert = $this->_ci->ReservierungModel->insert(array(
-					'ort_kurzbz' => $ort_kurzbz,
-					'uid' => getAuthUID(),
-					'stunde' => $stunde,
-					'datum' => $startTime->format('Y-m-d'),
-					'titel' => $title,
-					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
-					'beschreibung' => $beschreibung,
-					'insertvon' => getAuthUID()
-				));
-				if (isError($check_insert))
-					return $check_insert;
-			}
-		}
-
-		return success("Erfolgreich");
-	}
-
-	public function deleteReservation($reservierung_id)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->library('PermissionLib');
-
-
-		$this->_ci->ReservierungModel->db->where_in('reservierung_id', $reservierung_id);
-		$reservation = $this->_ci->ReservierungModel->load();
-		if (isError($reservation))
-			return $reservation;
-
-		if (!hasData($reservation))
-			return error("Reservierungen nicht gefunden");
-
-		$reservations = getData($reservation);
-
-		$today = new DateTime();
-		foreach ($reservations as $reservierung)
-		{
-			if ($today->format('Y-m-d') > $reservierung->datum)
-				return error("Vergangene Reservierungen können nicht gelöscht werden");
-
-			if (($this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt')) && ($reservierung->insertvon == getAuthUID() || $reservierung->uid === getAuthUID()))
-			{
-				$delete_result = $this->_ci->ReservierungModel->delete($reservierung->reservierung_id);
-
-				if (isError($delete_result))
-					return $delete_result;
-			}
-		}
-		return success("Erfolgreich");
-	}
-
-
-	public function getReservableMap($ort_kurzbz, $start_date, $end_date)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->library('PermissionLib');
-
-		$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'suid');
-		$berechtigt_erweitert = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung', 'suid');
-
-		$ort_data = $this->_ci->OrtModel->load($ort_kurzbz);
-		if (isError($ort_data) || !hasData($ort_data))
-			return [];
-
-		$ort_data = getData($ort_data)[0];
-
-		if (!$ort_data->reservieren)
-			return [];
-
-		if (!$berechtigt_begrenzt && !$berechtigt_erweitert)
-			return [];
-
-		$start_ts = is_numeric($start_date) ? (int)$start_date : strtotime($start_date);
-		$end_ts = is_numeric($end_date) ? (int)$end_date : strtotime($end_date);
-
-		if (!$start_ts || !$end_ts)
-			return [];
-
-		if ($end_ts < $start_ts)
-		{
-			$tmp = $start_ts;
-			$start_ts = $end_ts;
-			$end_ts = $tmp;
-		}
-
-		$now = time();
-		$tage_min = defined('RES_TAGE_LEKTOR_MIN') ? (int)RES_TAGE_LEKTOR_MIN : 0;
-		$tage_bis = defined('RES_TAGE_LEKTOR_BIS') ? (int)RES_TAGE_LEKTOR_BIS : 0;
-
-		$datum_res_lektor_start = $this->jump_day($now, $tage_min - 1);
-		$datum_res_lektor_ende = $this->jump_day($now, $tage_bis);
-
-		$start_ymd_allowed = date('Y-m-d', $datum_res_lektor_start);
-		$end_ymd_allowed = date('Y-m-d', $datum_res_lektor_ende);
-
-		$result = [];
-
-		$current = strtotime(date('Y-m-d', $start_ts) . ' 00:00:00');
-		$end_day = strtotime(date('Y-m-d', $end_ts) . ' 00:00:00');
-
-		while ($current <= $end_day)
-		{
-			$ymd = date('Y-m-d', $current);
-
-			$result[$ymd] = ($ymd >= $start_ymd_allowed && $ymd <= $end_ymd_allowed) ? true : false;
-
-			$current = $this->jump_day($current, 1);
-		}
-
-		return success($result);
-	}
-
-	private function jump_day($timestamp, $days)
-	{
-		$days = (int)$days;
-		$prefix = ($days >= 0 ? '+' : '');
-		return strtotime($prefix . $days . ' days', $timestamp);
-	}
-
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

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/models/codex/Mobilitaet_model.php

@@ -11,73 +11,4 @@ class Mobilitaet_model extends DB_Model
 		$this->dbTable = 'bis.tbl_mobilitaet';
 		$this->pk = 'mobilitaet_id';
 	}
-	
-	public function getMobilityZusatzForUids($uids) {
-		$qry = "SELECT distinct on(nachname, vorname, public.tbl_benutzer.person_id) uid,
-			tbl_mitarbeiter.mitarbeiter_uid,
-			tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung,
-			tbl_mobilitaet.mobilitaetstyp_kurzbz,
-			(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree,
-			public.tbl_prestudent.gsstudientyp_kurzbz as ddtype,
-			(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
-			campus.vw_student_lehrveranstaltung
-			 JOIN public.tbl_benutzer USING(uid)
-			 JOIN public.tbl_person USING(person_id)
-			 LEFT JOIN public.tbl_student ON(uid=student_uid)
-			 LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
-			 LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
-			 LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
-				AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
-				AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
-			LEFT JOIN lehre.tbl_note USING (note)
-			LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
-			LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
-				LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
-				LEFT JOIN public.tbl_prestudent USING(prestudent_id)
-		WHERE uid IN ?";
-		
-		return $this->execReadOnlyQuery($qry, [$uids]);
-	}
-
-	public function formatZusatz($entry, $erhalter_kz) {
-		$zusatz = '';
-
-		if (isset($entry->studienstatus) && $entry->studienstatus === 'Incoming') {
-			$zusatz = '(i)';
-		}
-
-		if (isset($entry->lkt_ueberschreibbar) && $entry->lkt_ueberschreibbar === false) {
-			$zusatz .= ' (' . ($entry->anmerkung ?? '') . ')';
-		}
-
-		if (isset($entry->mitarbeiter_uid) && $entry->mitarbeiter_uid !== null) {
-			$zusatz .= ' (ma)';
-		}
-
-		if (isset($entry->stg_kz_student) && $entry->stg_kz_student == $erhalter_kz) {
-			$zusatz .= ' (a.o.)';
-		}
-
-		if (
-			isset($entry->mobilitaetstyp_kurzbz) && $entry->mobilitaetstyp_kurzbz &&
-			isset($entry->doubledegree) && $entry->doubledegree === 1
-		) {
-			$zusatz .= ' (d.d.';
-
-			$ddtype = $entry->ddtype ?? null;
-
-			if ($ddtype == 'Intern') {
-				$zusatz .= 'i.)';
-			} elseif ($ddtype == 'Extern') {
-				$zusatz .= 'o.)';
-			} else {
-				$zusatz .= ')';
-			}
-		}
-
-		return $zusatz;
-	}
 }

application/models/education/Abschlusspruefung_model.php

@@ -100,14 +100,12 @@ class Abschlusspruefung_model extends DB_Model
 
 					if (isError($abschlussarbeit))
 						return $abschlussarbeit;
-
 					if (hasData($abschlussarbeit))
 					{
 						$abschlussarbeit = getData($abschlussarbeit)[0];
 						$abschlusspruefungdata->projektarbeit_studiengangstyp_name = $abschlussarbeit->projekttyp_kurzbz;
 						$abschlusspruefungdata->abschlussarbeit_titel = $abschlussarbeit->titel;
 						$abschlusspruefungdata->abschlussarbeit_note = $abschlussarbeit->note;
-						$abschlusspruefungdata->abschlussarbeit_sprache = $abschlussarbeit->sprache_bezeichnung;
 					}
 				}
 			}

application/models/education/LePruefung_model.php

@@ -52,53 +52,4 @@ class LePruefung_model extends DB_Model
 			'student_uid' => $student_uid
 		]);
 	}
-
-	public function getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz) {
-		$qry = "SELECT lehre.tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
-				   tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
-			FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
-			WHERE lehre.tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
-			  AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
-			  AND lehre.tbl_pruefung.note = tbl_note.note
-			  AND lehre.tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz
-			  AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?
-			  AND tbl_lehreinheit.studiensemester_kurzbz = ?
-			ORDER BY datum DESC;";
-
-		return $this->execReadOnlyQuery($qry, array($lv_id, $sem_kurzbz));
-	}
-
-	public function getPruefungenByUidTypLvStudiensemester($uid, $typ = null, $lv_id = null, $sem_kurzbz = null) {
-		$params = [$uid];
-		$qry = "SELECT tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
-			    tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
-			    FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
-			    WHERE student_uid= ?
-			    AND tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
-			    AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
-			    AND tbl_pruefung.note = tbl_note.note
-			    AND tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz";
-		if ($typ != null)
-		{
-			$qry .= " AND tbl_pruefungstyp.pruefungstyp_kurzbz = ?";
-			$params[] = $typ;
-		}
-
-		if ($lv_id != null)
-		{
-			$qry .= " AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?";
-			$params[] = $lv_id;
-		}
-
-		if ($sem_kurzbz != null)
-		{
-			$qry .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
-			$params[] = $sem_kurzbz;
-		}
-
-
-		$qry .= " ORDER BY datum DESC";
-
-		return $this->execReadOnlyQuery($qry, $params);
-	}
 }

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) *, 
@@ -739,26 +810,4 @@ EOSQL;
 				)";
 	}
 
-
-	public function getAllLehreinheitenForLvaAndMaUid($lva_id, $ma_uid, $sem_kurzbz)
-	{
-		$query = "SELECT DISTINCT tbl_lehreinheitmitarbeiter.lehreinheit_id, tbl_lehreinheit.lehrveranstaltung_id, tbl_lehreinheit.lehrform_kurzbz,
-						tbl_lehreinheitmitarbeiter.mitarbeiter_uid,
-						tbl_lehreinheitgruppe.semester,
-						tbl_lehreinheitgruppe.verband,
-						tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz,
-						tbl_lehrveranstaltung.kurzbz,
-			 			tbl_studiengang.kurzbzlang,
-			 			(SELECT COUNT(DISTINCT datum) FROM campus.vw_stundenplan WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as termincount,
-						(SELECT COUNT(*) FROM campus.vw_student_lehrveranstaltung WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as studentcount
-		FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-			JOIN lehre.tbl_lehreinheitgruppe USING(lehreinheit_id)
-			JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-			JOIN public.tbl_studiengang ON (tbl_lehreinheitgruppe.studiengang_kz = tbl_studiengang.studiengang_kz)
-		WHERE lehrveranstaltung_id = ? AND studiensemester_kurzbz = ? AND mitarbeiter_uid = ?
-		ORDER BY tbl_lehreinheitgruppe.gruppe_kurzbz";
-
-		return $this->execQuery($query, [$lva_id, $sem_kurzbz, $ma_uid]);
-	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -317,7 +317,7 @@ class Lehrveranstaltung_model extends DB_Model
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
 			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
-			tbl_student.prestudent_id, campus.vw_student_lehrveranstaltung.lehreinheit_id
+			tbl_student.prestudent_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -1346,68 +1346,4 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
-
-	public function getLvForLektorInSemester($sem_kurzbz, $uid) {
-		$qry = "SELECT DISTINCT (tbl_lehrveranstaltung.lehrveranstaltung_id),
-				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kurzbz,
-				tbl_studiengang.studiengang_kz,
-				tbl_lehrveranstaltung.semester as lv_semester,
-				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-				(SELECT kurzbz FROM public.tbl_mitarbeiter
-				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor,
-				 lehre.tbl_lehrveranstaltung.orgform_kurzbz as orgform
-			
-			FROM
-				lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-									  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-									  JOIN public.tbl_studiengang USING(studiengang_kz)
-									  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-			WHERE
-				tbl_lehreinheit.studiensemester_kurzbz = ?
-			  AND mitarbeiter_uid = ?
-			ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
-
-		return $this->execReadOnlyQuery($qry, array($sem_kurzbz, $uid));
-	}
-
-	// used for cis4 mylv mitarbeiter
-	public function getLvsByMitarbeiterInSemester($mitarbeiter_uid, $sem_kurzbz) {
-		$qry = "SELECT * FROM (
-					SELECT DISTINCT ON (lehre.tbl_lehrveranstaltung.lehrveranstaltung_id) 
-						public.tbl_studiengang.studiengang_kz,
-						lehre.tbl_lehrveranstaltung.semester,
-						public.tbl_studiengang.bezeichnung as sg_bezeichnung,
-						public.tbl_studiengang.english as sg_bezeichnung_eng,
-						UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as studiengang_kuerzel,
-						lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,
-						lehre.tbl_lehrveranstaltung.bezeichnung,
-						lehre.tbl_lehrveranstaltung.bezeichnung_english as bezeichnung_eng,
-						lehre.tbl_lehrveranstaltung.farbe,
-						lehre.tbl_lehrveranstaltung.lvinfo,
-						lehre.tbl_lehrveranstaltung.benotung,
-						lehre.tbl_lehrveranstaltung.orgform_kurzbz,
-						lehre.tbl_lehrveranstaltung.sprache,
-						lehre.tbl_lehrveranstaltung.ects,
-						lehre.tbl_lehrveranstaltung.incoming
-					FROM
-						lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-											  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-											  JOIN public.tbl_studiengang USING(studiengang_kz)
-											  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-					WHERE
-						tbl_lehreinheit.studiensemester_kurzbz = ?
-					AND mitarbeiter_uid = ?) as distincted_by_lva_id
-					JOIN (
-						SELECT lehrveranstaltung_id, TRUNC(SUM(lehre.tbl_lehreinheitmitarbeiter.semesterstunden)) as semesterstunden
-						FROM lehre.tbl_lehreinheit
-								 JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-								 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-						WHERE tbl_lehreinheit.studiensemester_kurzbz = ?
-							AND mitarbeiter_uid = ?
-						GROUP BY lehrveranstaltung_id
-					) semesterstundenAggregatedSubquery USING(lehrveranstaltung_id)
-				ORDER BY studiengang_kuerzel, semester, bezeichnung";
-		
-		return $this->execReadOnlyQuery($qry, [$sem_kurzbz, $mitarbeiter_uid, $sem_kurzbz, $mitarbeiter_uid]);
-	}
 }

application/models/education/Lvgesamtnote_model.php

@@ -14,7 +14,7 @@ class Lvgesamtnote_model extends DB_Model
 	}
 
 	/**
-	 * Laedt die Noten - lvgesamtnote (Vorschlag) JOIN tbl.note (zeugnisnote)
+	 * Laedt die Noten
 	 *
 	 * @param integer				$lehrveranstaltung_id
 	 * @param string				$student_uid
@@ -46,19 +46,4 @@ class Lvgesamtnote_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
-
-	public function getLvGesamtNoteVorschlag($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
-	{
-		$qry = "SELECT * FROM campus.tbl_lvgesamtnote
-				WHERE campus.tbl_lvgesamtnote.student_uid = ? 
-				  AND campus.tbl_lvgesamtnote.studiensemester_kurzbz = ?";
-		$params = [$student_uid, $studiensemester_kurzbz];
-		
-		if ($lehrveranstaltung_id) {
-			$qry .= "AND campus.tbl_lvgesamtnote.lehrveranstaltung_id = ?";
-			$params[] = $lehrveranstaltung_id;
-		}
-
-		return $this->execReadOnlyQuery($qry, $params);
-	}
 }

application/models/education/Note_model.php

@@ -11,33 +11,12 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
-	
+
 	public function getAllActive() {
 		$qry ="SELECT *
 			FROM lehre.tbl_note
 			WHERE aktiv = true";
-		
-		return $this->execReadOnlyQuery($qry);
-	}
-	
-	// used to determine the primary key of note "entschuldigt" to avoid hardcoded magic numbers
-	// that might differ in a different installation of fhcomplete
-	public function getEntschuldigtNote() {
-		$qry ="SELECT *
-			FROM lehre.tbl_note
-			WHERE bezeichnung = 'entschuldigt'";
 
 		return $this->execReadOnlyQuery($qry);
 	}
-
-	// used to determine the primary key of note "noch nicht eingetragen" to avoid hardcoded magic numbers
-	// that might differ in a different installation of fhcomplete
-	public function getNochNichtEingetragenNote() {
-		$qry ="SELECT *
-			FROM lehre.tbl_note
-			WHERE bezeichnung = 'Noch nicht eingetragen'";
-
-		return $this->execReadOnlyQuery($qry);
-	}
-	
 }

application/models/education/Notenschluesselaufteilung_model.php

@@ -26,9 +26,6 @@ class Notenschluesselaufteilung_model extends DB_Model
 		$this->load->model('education/Notenschluesselzuordnung_model', 'NotenschluesselzuordnungModel');
 		$notenschluessel_kurzbz = $this->NotenschluesselzuordnungModel->getKurzbzForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
 
-		if($notenschluessel_kurzbz == null)
-			return success(null);
-		
 		$this->addSelect("note");
 		$this->addOrder("punkte", "DESC");
 		$this->addLimit(1);

application/models/education/Paabgabe_model.php

@@ -61,174 +61,6 @@ class Paabgabe_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
 
-	/**
-	 * Gets project submissions for search criteria.
-	 * @param array $projekttyp_kurzbz_arr contains all relevant project types (e.g. Bachelor)
-	 * @param int $studiengang_kz study program
-	 * @param string $abgabetyp_kurzbz project submission type (e.g. end upload, intermediate submission)
-	 * @param string $abgabedatum due date for hand-in
-	 * @param string $personSearchString for searching by person, i.e. name, uid, person/prestudent id
-	 * @param int $limit limiting max number of results if search criteria is not precise enough
-	 * @return object
-	 */
-	public function getPaAbgaben(
-		$projekttyp_kurzbz_arr,
-		$studiengang_kz = null,
-		$abgabetyp_kurzbz = null,
-		$abgabedatum = null,
-		$personSearchString = null,
-		$limit = 1000
-	) {
-		$params = [];
-
-		$qry = "
-			SELECT
-				stg.bezeichnung AS stgbez, paabg.datum AS termin,
-				paabg.paabgabe_id, paabg.projektarbeit_id, paabg.paabgabetyp_kurzbz, paabg.abgabedatum,
-				abgabetyp.bezeichnung AS paabgabetyp_bezeichnung, ben.uid, pers.vorname, pers.nachname, pa.projekttyp_kurzbz, pa.titel,
-				UPPER(stg.typ || stg.kurzbz) AS studiengang_kuerzel,
-				(
-					 /* show all relevant Studiengänge of person and wether it is an employee*/
-					SELECT
-						STRING_AGG(studiengang || ' ' || last_status, ' | ')
-						|| (CASE WHEN EXISTS (
-							SELECT 1 FROM public.tbl_mitarbeiter ma
-							JOIN public.tbl_benutzer ben ON ma.mitarbeiter_uid = ben.uid
-							WHERE person_id = prestudents.person_id
-							AND ben.aktiv
-							) THEN ' | Mitarbeiter' ELSE '' END)
-					FROM (
-						SELECT
-							DISTINCT person_id, prestudent_id, UPPER(stg.typ || stg.kurzbz) AS studiengang,
-							get_rolle_prestudent(ps.prestudent_id, null) AS last_status
-						FROM
-							public.tbl_prestudent ps
-						JOIN public.tbl_studiengang stg USING (studiengang_kz)
-						WHERE
-							person_id = pers.person_id
-						ORDER BY
-							prestudent_id DESC
-					) prestudents
-					WHERE
-						last_status IN ('Abgewiesener','Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
-					GROUP BY
-						person_id
-					LIMIT 1;
-				) AS status
-			FROM
-				lehre.tbl_projektarbeit pa
-				JOIN campus.tbl_paabgabe paabg USING(projektarbeit_id)
-				JOIN campus.tbl_paabgabetyp abgabetyp USING(paabgabetyp_kurzbz)
-				LEFT JOIN public.tbl_benutzer ben ON(uid=student_uid)
-				LEFT JOIN public.tbl_person pers ON(ben.person_id=pers.person_id)
-				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-				LEFT JOIN public.tbl_studiengang stg USING(studiengang_kz)
-			WHERE
-				TRUE";
-
-		if (isset($projekttyp_kurzbz_arr) && !isEmptyArray($projekttyp_kurzbz_arr))
-		{
-			$qry .= " AND projekttyp_kurzbz IN ?";
-			$params[] = $projekttyp_kurzbz_arr;
-		}
-
-		if (isset($studiengang_kz) && is_numeric($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz=?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($abgabetyp_kurzbz))
-		{
-			$qry .= " AND paabg.paabgabetyp_kurzbz=?";
-			$params[] = $abgabetyp_kurzbz;
-		}
-
-		if (isset($abgabedatum))
-		{
-			$qry .= " AND paabg.datum=?";
-			$params[] = $abgabedatum;
-		}
-
-		if (is_numeric($personSearchString))
-		{
-			$personSearchString = (int) $personSearchString;
-			$params = array_merge($params, [$personSearchString, $personSearchString]);
-			$qry .= " AND (
-				pers.person_id = ?
-				OR EXISTS (SELECT 1 FROM public.tbl_prestudent WHERE person_id = pers.person_id AND prestudent_id = ?)
-			)";
-		}
-		elseif (is_string($personSearchString))
-		{
-			// remove empty spaces and lowercase
-			$personSearchString = strtolower(str_replace(' ', '', $personSearchString));
-			$qry .= " AND (
-				LOWER(REPLACE(pers.nachname || pers.vorname || pers.nachname, ' ', '')) LIKE ".$this->db->escape('%'.$personSearchString.'%')."
-				OR ben.uid LIKE ".$this->db->escape('%'.$personSearchString.'%')."
-			)";
-		}
-
-		$qry .= " ORDER BY nachname";
-
-		if (isset($limit) && is_numeric($limit) && (!isset($studiengang_kz) || !is_numeric($studiengang_kz)) && !isset($abgabedatum))
-		{
-			$qry .= " LIMIT ?";
-			$params[] = $limit;
-		}
-
-		return $this->execReadOnlyQuery($qry, $params);
-	}
-
-	/**
-	 * Gets due dates for projekt submission search criteria.
-	 * @param array $projekttyp_kurzbz_arr contains all relevant project types (e.g. Bachelor)
-	 * @param int $studiengang_kz study program
-	 * @param string $abgabetyp_kurzbz project submission type (e.g. end upload, intermediate submission)
-	 * @return object
-	 */
-	public function getTermine($projekttyp_kurzbz_arr, $studiengang_kz, $abgabetyp_kurzbz)
-	{
-		$params = [];
-
-		$qry = "
-			SELECT
-				DISTINCT tbl_paabgabe.datum as termin, to_char(tbl_paabgabe.datum, 'DD.MM.YYYY') as termin_anzeige
-			FROM
-				lehre.tbl_projektarbeit
-				JOIN campus.tbl_paabgabe USING(projektarbeit_id)
-				LEFT JOIN public.tbl_benutzer ON(uid=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 USING(studiengang_kz)
-			WHERE
-				TRUE";
-
-		if (isset($projekttyp_kurzbz_arr) && !isEmptyArray($projekttyp_kurzbz_arr))
-		{
-			$qry .= " AND projekttyp_kurzbz IN ?";
-			$params[] = $projekttyp_kurzbz_arr;
-		}
-
-		if (isset($studiengang_kz) && is_numeric($studiengang_kz))
-		{
-			$qry .= " AND public.tbl_studiengang.studiengang_kz=?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($abgabetyp_kurzbz))
-		{
-			$qry .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz=?";
-			$params[] = $abgabetyp_kurzbz;
-		}
-
-		$qry .= " ORDER BY termin DESC";
-
-		return $this->execReadOnlyQuery($qry, $params);
-	}
-
 	public function findAbgabenNewOrUpdatedSince($interval, $relevantTypes)
 	{
 

application/models/education/Projektarbeit_model.php

@@ -23,11 +23,9 @@ class Projektarbeit_model extends DB_Model
 	 */
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
-		$sprache_index = "COALESCE((SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->escape(getUserLanguage()) . " LIMIT 1), 1)";
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
 					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
-					tbl_sprache.bezeichnung[".$sprache_index."] AS sprache_bezeichnung,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -46,7 +44,6 @@ class Projektarbeit_model extends DB_Model
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
-					LEFT JOIN public.tbl_sprache ON pa.sprache = tbl_sprache.sprache
 				WHERE
 					pa.student_uid = ?";
 

application/models/education/Pruefung_model.php

@@ -306,5 +306,4 @@ class Pruefung_model extends DB_Model
 
 		return $this->loadWhereCommitteeExamsFailed();
 	}
-	
 }

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

@@ -59,37 +59,6 @@ class Studienplan_model extends DB_Model
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
 		));
 	}
-	
-	public function getStudienplanByLvaSemKurzbz($lehrveranstaltung_id, $studiensemester_kurzbz) {
-		$qry= "
-			SELECT
-				DISTINCT tbl_studienplan.*
-			FROM
-				lehre.tbl_studienplan
-				JOIN lehre.tbl_studienplan_lehrveranstaltung 
-					USING(studienplan_id)
-			WHERE
-				tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN (
-					SELECT 
-						lv.lehrveranstaltung_id
-					FROM
-						lehre.tbl_lehrveranstaltung AS lv
-						LEFT JOIN lehre.tbl_lehrveranstaltung AS t ON t.lehrveranstaltung_id=lv.lehrveranstaltung_template_id
-					WHERE
-						lv.lehrtyp_kurzbz<>'tpl'
-						AND (lv.lehrveranstaltung_id= ? OR (lv.lehrveranstaltung_template_id= ? AND t.lehrtyp_kurzbz='tpl'))
-					)
-				AND EXISTS (
-					SELECT 1 
-					FROM 
-						lehre.tbl_studienplan_semester
-					WHERE studienplan_id=tbl_studienplan.studienplan_id
-						AND studiensemester_kurzbz= ?
-						AND semester = tbl_studienplan_lehrveranstaltung.semester)
-			ORDER BY bezeichnung";
-		
-		return $this->execReadOnlyQuery($qry, array($lehrveranstaltung_id, $lehrveranstaltung_id, $studiensemester_kurzbz));
-	}
 
 	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
 	{

application/models/organisation/Studiensemester_model.php

@@ -283,30 +283,6 @@ class Studiensemester_model extends DB_Model
 		return $this->loadWhere(['uid' => $student_uid, 'v.lehre' => true]);
 	}
 
-	public function getWhereMitarbeiterHasLvs($uid) {
-		// first order by year with last 2 letter from right,
-		// then order by WS/SS inside the years
-		// query it asc so the ordering magic in cis4 turns it around again
-		$qry = "WITH unique_semesters AS (
-				SELECT DISTINCT ON (studiensemester_kurzbz)
-					studiensemester_kurzbz, 
-					start, 
-					ende, 
-					bezeichnung, 
-					studienjahr_kurzbz
-				FROM lehre.tbl_lehreinheit
-				JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-				JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
-				WHERE mitarbeiter_uid = ?
-			)
-			SELECT * FROM unique_semesters
-			ORDER BY 
-				RIGHT(studiensemester_kurzbz, 2) ASC,
-				LEFT(studiensemester_kurzbz, 2) ASC;";
-		
-		return $this->execReadOnlyQuery($qry, [$uid]);
-	}
-
 	public function getAktAndFutureSemester()
 	{
 		$query = 'SELECT studiensemester_kurzbz

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

@@ -50,12 +50,11 @@ class Reservierung_model extends DB_Model
 
 		$query_result = $this->execReadOnlyQuery("
 		SELECT 
-		DISTINCT(insertvon),  
-		'reservierung' as type, beginn, ende, datum, array_agg(DISTINCT reservierung_id) AS reservierung_id,
+		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		array_agg(DISTINCT(uid)) as uids,
+		
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
@@ -63,7 +62,7 @@ class Reservierung_model extends DB_Model
 			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
@@ -95,12 +94,11 @@ class Reservierung_model extends DB_Model
 
 		$query_result = $this->execReadOnlyQuery("
 		SELECT 
-		DISTINCT(insertvon),  
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		array_agg(DISTINCT(uid)) as uids,
+		
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
@@ -108,7 +106,7 @@ class Reservierung_model extends DB_Model
 			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
 		", [$uid ?? getAuthUID(), $start_date, $end_date]);

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/models/ressource/Zeitsperre_model.php

@@ -12,8 +12,6 @@ class Zeitsperre_model extends DB_Model
 		$this->pk = 'zeitsperre_id';
 	}
 
-	const BLOCKIERENDE_ZEITSPERREN = ['Krank','Urlaub','ZA','DienstV','PflegeU','DienstF','CovidSB','CovidKS'];
-
     /**
      * Save or update Zeitsperre.
      *
@@ -63,128 +61,4 @@ class Zeitsperre_model extends DB_Model
 
         return $this->execQuery($qry);
     }
-
-	/**
-	 * get Zeitsperren of a user
-	 *
-	 * @param $uid mitarbeiteruid
-	 * @param $bisgrenze @true show only entries of actual business year (1.9.- 31.8.)
-	 *
-	 * @return array
-	 */
-	public function getZeitsperrenUser($uid, $bisgrenze = true)
-	{
-		$qry = "
-  			SELECT
-			    tbl_zeitsperre.*, tbl_zeitsperretyp.*, tbl_erreichbarkeit.farbe  AS erreichbarkeit_farbe,
-  			    tbl_erreichbarkeit.beschreibung AS erreichbarkeit_beschreibung,
-            	CONCAT (ps.vorname, ' ', ps.nachname) as vertretung
-			FROM (campus.tbl_zeitsperre JOIN campus.tbl_zeitsperretyp USING (zeitsperretyp_kurzbz))
-			LEFT JOIN campus.tbl_erreichbarkeit USING (erreichbarkeit_kurzbz)
-			LEFT JOIN public.tbl_benutzer ON campus.tbl_zeitsperre.vertretung_uid = public.tbl_benutzer.uid
-			LEFT JOIN public.tbl_person ps USING (person_id)
-			WHERE mitarbeiter_uid= ?
-			";
-
-		if($bisgrenze)
-		{
-			$qry.=" 
-				AND (
-					(date_part('month',vondatum)>=9 AND date_part('year', vondatum)>='".(date('Y')-1)."')
-					OR
-					(date_part('month',vondatum)<9 AND date_part('year', vondatum)>='".(date('Y'))."')
-				)";
-		}
-
-		$qry.= " ORDER BY vondatum DESC";
-
-		return $this->execQuery($qry, array('mitarbeiter_uid' => $uid));
-	}
-
-	/**
-	 * check a date for existing zeitsperre
-	 *
-	 * @param $uid mitarbeiteruid
-	 * @param $datum datum to check
-	 * @param $stunde stunde (default = null)
-	 * @param bool $nurblockierend if only hr relevante zeitsperren have to be checked
-	 *
-	 * @return array
-	 */
-	public function getSperreByDate($uid, $datum, $stunde = null, $nurblockierend = false)
-	{
-		$parametersArray = [$datum, $datum];
-
-		$qry = "
-			SELECT
-				*
-			FROM
-				campus.tbl_zeitsperre
-			WHERE
-				vondatum <= ?
-				AND bisdatum>= ?";
-
-		if($nurblockierend)
-		{
-			$qry .= " AND zeitsperretyp_kurzbz IN ('"
-				. implode("','", self::BLOCKIERENDE_ZEITSPERREN)
-				. "')";
-		}
-
-		if(!is_null($stunde))
-		{
-			$parametersArray = array_merge(
-				$parametersArray,
-				[$datum, $stunde, $datum, $datum, $stunde, $datum]
-			);
-
-			$qry.=" AND
-					((vondatum= ? AND vonstunde<= ? OR vonstunde is null OR vondatum<> ?) AND
-					(bisdatum= ? AND bisstunde>= ? OR bisstunde is null OR bisdatum<> ?))";
-		}
-
-		array_push($parametersArray, $uid);
-
-		$qry .= "AND mitarbeiter_uid= ? ";
-
-		return $this->execQuery($qry, $parametersArray);
-	}
-
-	/**
-	 * check a date for existing zeitsperre
-	 *
-	 * @param $uid mitarbeiteruid
-	 * @param $vondatum datum in Format IS0
-	 * @param $bisdatum datum in Format ISO
-	 *
-	 * @return array
-	 */
-	public function existsZeitaufzeichnung($uid, $vonDay, $bisDay)
-	{
-		try {
-			$from = new DateTime($vonDay);
-			$to   = new DateTime($bisDay);
-		} catch (Exception $e) {
-			throw new Exception("Invalid date format");
-		}
-
-		//remove hour stamps
-		$from->setTime(0, 0, 0);
-		$to->setTime(0, 0, 0)->modify('+1 day');
-
-		$fromSql = $from->format('Y-m-d');
-		$toSql   = $to->format('Y-m-d');
-		$params = [$uid, $fromSql, $toSql];
-
-		$qry = "
-			SELECT *
-			FROM campus.tbl_zeitaufzeichnung
-			WHERE uid = ?
-			AND start >= ?
-			AND ende < ? ";
-
-		$result = $this->execQuery($qry, $params);
-
-		return $result;
-	}
 }

application/views/CisRouterView/CisRouterView.php

@@ -11,7 +11,6 @@ $includesArray = array(
 	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
-		'vendor/vuejs/vuedatepicker_css/main.css',
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
@@ -24,9 +23,7 @@ $includesArray = array(
 		'public/css/components/FormUnderline.css',
 		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
-		'public/css/Cis4/Studium.css',
-		'public/css/Cis4/Benotungstool.css',
-		'public/css/Cis4/Zeitsperren.css',
+		'public/css/Cis4/Studium.css'
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
@@ -40,15 +37,11 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/npm-asset/primevue/message/message.min.js',
-		'vendor/npm-asset/primevue/divider/divider.min.js',
-		'vendor/npm-asset/primevue/password/password.js',
-		'vendor/npm-asset/primevue/multiselect/multiselect.js',
 		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Cis/Cis.js',
-		'vendor/olifolkerd/tabulator5/src/js/modules/ColumnCalcs/ColumnCalcs.js'
 	),
 
 );

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/lehrauftrag/Dashboard.php

@@ -1,5 +1,7 @@
 <?php
-$includesArray = array(
+$this->load->view(
+    'templates/FHC-Header',
+    array(
         'title' => 'Lehrauftrag bestellen',
         'jquery3' => true,
         'jqueryui1' => true,
@@ -10,15 +12,8 @@ $includesArray = array(
         'dialoglib' => true,
         'navigationwidget' => true,
 		'addons' => true,
+    )
 );
-
-
-$this->load->view(
-	'templates/FHC-Header',
-	$includesArray
-);
-
-
 ?>
 
     <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -38,12 +33,4 @@ $this->load->view(
         </div>
     </div>
 
-<?php 
-
-
-$this->load->view(
-	'templates/FHC-Footer',
-	$includesArray
-);
-
- ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/lehre/lehrauftrag/LehrendeUebersicht.php

@@ -1,6 +1,7 @@
 <?php
-
-$includesArray = array(
+$this->load->view(
+	'templates/FHC-Header',
+	array(
 		'title' => 'Lehrauftrag bestellen',
 		'jquery3' => true,
 		'bootstrap3' => true,
@@ -8,13 +9,8 @@ $includesArray = array(
 		'sbadmintemplate3' => true,
 		'ajaxlib' => true,
 		'navigationwidget' => true,
+	)
 );
-
-$this->load->view(
-	'templates/FHC-Header',
-	$includesArray
-);
-
 ?>
 
 <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -38,11 +34,4 @@ $this->load->view(
 		</div>
 	</div>
 
-<?php 
-
-$this->load->view(
-	'templates/FHC-Footer',
-	$includesArray
-);
-
-?>
+<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/lehre/lehrauftrag/acceptLehrauftrag.php

@@ -1,101 +1,89 @@
 <?php
-
-$includesArray = array(
-	'title' => 'Lehrauftrag annehmen',
-	'jquery3' => true,
-	'jqueryui1' => true,
-	'jquerycheckboxes1' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'sbadmintemplate' => false,
-	'tabulator5' => true,
-	'tabulator5JQuery' => true,
-	'cis'=>true,
-	'momentjs2' => true,
-	'ajaxlib' => true,
-	'dialoglib' => true,
-	'tablewidget' => true,
-	'phrases' => array(
-		'global' => array(
-			'lehrauftraegeAnnehmen',
-			'dokumentePDF',
-			'PDFLehrauftraegeFH',
-			'PDFLehrauftraegeLehrgaenge'
-		),
-		'ui' => array(
-			'anzeigen',
-			'alleAnzeigen',
-			'nurBestellteAnzeigen',
-			'nurErteilteAnzeigen',
-			'nurAngenommeneAnzeigen',
-			'nurStornierteAnzeigen',
-			'hilfeZuDieserSeite',
-			'alleAuswaehlen',
-			'alleAbwaehlen',
-			'ausgewaehlteZeilen',
-			'hilfe',
-			'tabelleneinstellungen',
-			'keineDatenVorhanden',
-			'spaltenEinstellen',
-			'bestelltVon',
-			'erteiltVon',
-			'angenommenVon',
-			'storniertVon',
-			'lehrauftragInBearbeitung',
-			'wartetAufErteilung',
-			'wartetAufErneuteErteilung',
-			'letzterStatusBestellt',
-			'letzterStatusErteilt',
-			'letzterStatusAngenommen',
-			'vertragWurdeStorniert',
+$this->load->view(
+	'templates/FHC-Header',
+	array(
+		'title' => 'Lehrauftrag annehmen',
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'jquerycheckboxes1' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'sbadmintemplate' => false,
+		'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'cis'=>true,
+		'momentjs2' => true,
+		'ajaxlib' => true,
+		'dialoglib' => true,
+		'tablewidget' => true,
+		'phrases' => array(
+			'global' => array(
+				'lehrauftraegeAnnehmen',
+                'dokumentePDF',
+                'PDFLehrauftraegeFH',
+                'PDFLehrauftraegeLehrgaenge'
+            ),
+			'ui' => array(
+				'anzeigen',
+				'alleAnzeigen',
+				'nurBestellteAnzeigen',
+				'nurErteilteAnzeigen',
+				'nurAngenommeneAnzeigen',
+				'nurStornierteAnzeigen',
+				'hilfeZuDieserSeite',
+				'alleAuswaehlen',
+				'alleAbwaehlen',
+				'ausgewaehlteZeilen',
+				'hilfe',
+				'tabelleneinstellungen',
+				'keineDatenVorhanden',
+				'spaltenEinstellen',
+				'bestelltVon',
+				'erteiltVon',
+				'angenommenVon',
+				'storniertVon',
+				'lehrauftragInBearbeitung',
+				'wartetAufErteilung',
+				'wartetAufErneuteErteilung',
+				'letzterStatusBestellt',
+				'letzterStatusErteilt',
+				'letzterStatusAngenommen',
+				'vertragWurdeStorniert',
+				),
+			'password' => array('password'),
+			'dms' => array('informationsblattExterneLehrende'),
+			'table' => array(
+				'spaltenEinAusblenden',
+                'spaltenEinAusblendenMitKlickOeffnen',
+                'spaltenEinAusblendenAufEinstellungenKlicken',
+                'spaltenEinAusblendenMitKlickAktivieren',
+                'spaltenEinAusblendenMitKlickSchliessen',
+                'spaltenbreiteVeraendern',
+                'spaltenbreiteVeraendernText',
+                'spaltenbreiteVeraendernInfotext',
+                'zeilenAuswaehlen',
+                'zeilenAuswaehlenEinzeln',
+                'zeilenAuswaehlenBereich',
+                'zeilenAuswaehlenAlle'
 			),
-		'password' => array('password'),
-		'dms' => array('informationsblattExterneLehrende'),
-		'table' => array(
-			'spaltenEinAusblenden',
-			'spaltenEinAusblendenMitKlickOeffnen',
-			'spaltenEinAusblendenAufEinstellungenKlicken',
-			'spaltenEinAusblendenMitKlickAktivieren',
-			'spaltenEinAusblendenMitKlickSchliessen',
-			'spaltenbreiteVeraendern',
-			'spaltenbreiteVeraendernText',
-			'spaltenbreiteVeraendernInfotext',
-			'zeilenAuswaehlen',
-			'zeilenAuswaehlenEinzeln',
-			'zeilenAuswaehlenBereich',
-			'zeilenAuswaehlenAlle'
+             'lehre' => array(
+		        'lehrauftraegeAnnehmen',
+		        'lehrauftraegeAnnehmenText',
+		        'lehrauftraegeAnnehmenKlickStatusicon',
+		        'lehrauftraegeAnnehmenLehrauftraegeWaehlen',
+		        'lehrauftraegeAnnehmenMitKlickAnnehmen',
+		        'lehrauftraegeNichtAuswaehlbar',
+		        'lehrauftraegeNichtAuswaehlbarTextBeiAnnahme',
+		        'filterAlleBeiAnnahme',
+		        'filterErteiltBeiAnnahme',
+		        'filterAngenommen'
+            )
 		),
-			'lehre' => array(
-			'lehrauftraegeAnnehmen',
-			'lehrauftraegeAnnehmenText',
-			'lehrauftraegeAnnehmenKlickStatusicon',
-			'lehrauftraegeAnnehmenLehrauftraegeWaehlen',
-			'lehrauftraegeAnnehmenMitKlickAnnehmen',
-			'lehrauftraegeNichtAuswaehlbar',
-			'lehrauftraegeNichtAuswaehlbarTextBeiAnnahme',
-			'filterAlleBeiAnnahme',
-			'filterErteiltBeiAnnahme',
-			'filterAngenommen'
-		)
-	),
-	'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/lehrauftrag/acceptLehrauftrag.js'
+		'customJSs' => array(
+				'public/js/bootstrapper.js',
+				'public/js/lehre/lehrauftrag/acceptLehrauftrag.js')
 	)
 );
-
-if (defined("CIS4")) {
-	$this->load->view(
-		'templates/CISVUE-Header',
-		$includesArray
-	);
-} else {
-	$this->load->view(
-		'templates/FHC-Header',
-		$includesArray
-	);
-}
-
 ?>
 
 
@@ -242,17 +230,5 @@ if (defined("CIS4")) {
 </div><!-- end page-wrapper -->
 <br>
 
-<?php 
-if (defined("CIS4")) {
-	$this->load->view(
-		'templates/CISVUE-Footer',
-		$includesArray
-	);
-} else {
-	$this->load->view(
-		'templates/FHC-Footer',
-		$includesArray
-	);
-}
-?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
 

application/views/lehre/lehrauftrag/approveLehrauftrag.php

@@ -1,101 +1,98 @@
 <?php
-$includesArray = array(
-	'title' => 'Lehrauftrag erteilen',
-	'jquery3' => true,
-	'jqueryui1' => true,
-	'jquerycheckboxes1' => true,
-	'bootstrap3' => true,
-	'fontawesome6' => true,
-	'sbadmintemplate3' => true,
-	'tabulator5' => true,
-	'tabulator5JQuery' => true,
-	'momentjs2' => true,
-	'ajaxlib' => true,
-	'dialoglib' => true,
-	'tablewidget' => true,
-	'navigationwidget' => true,
-	'phrases' => array(
-		'global' => array(
-			'lehrauftraegeErteilen',
-			'mehrHilfe',
-			'weitereInformationenUnter'
-		),
-		'ui' => array(
-			'anzeigen',
-			'alleAnzeigen',
-			'nurNeueAnzeigen',
-			'nurBestellteAnzeigen',
-			'nurErteilteAnzeigen',
-			'nurAngenommeneAnzeigen',
-			'nurGeaenderteAnzeigen',
-			'nurDummiesAnzeigen',
-			'hilfeZuDieserSeite',
-			'alleAuswaehlen',
-			'alleAbwaehlen',
-			'ausgewaehlteZeilen',
-			'hilfe',
-			'tabelleneinstellungen',
-			'keineDatenVorhanden',
-			'spaltenEinstellen',
-			'bestelltVon',
-			'erteiltVon',
-			'angenommenVon',
-			'stundenStundensatzGeaendert',
-			'neuerLehrauftragOhneLektorVerplant',
-			'wartetAufBestellung',
-			'wartetAufErneuteBestellung',
-			'neuerLehrauftragWartetAufBestellung',
-			'letzterStatusBestellt',
-			'letzterStatusErteilt',
-			'letzterStatusAngenommen',
-		),
-		'table' => array(
-			'spaltenEinAusblenden',
-			'spaltenEinAusblendenMitKlickOeffnen',
-			'spaltenEinAusblendenAufEinstellungenKlicken',
-			'spaltenEinAusblendenMitKlickAktivieren',
-			'spaltenEinAusblendenMitKlickSchliessen',
-			'spaltenbreiteVeraendern',
-			'spaltenbreiteVeraendernText',
-			'spaltenbreiteVeraendernInfotext',
-			'zeilenAuswaehlen',
-			'zeilenAuswaehlenEinzeln',
-			'zeilenAuswaehlenBereich',
-			'zeilenAuswaehlenAlle'
-		),
-		'lehre' => array(
-			'lehrauftragStandardBestellprozess',
-			'lehrauftragStandardBestellprozessBestellen',
-			'lehrauftragStandardBestellprozessErteilen',
-			'lehrauftragStandardBestellprozessAnnehmen',
-			'lehrauftraegeErteilen',
-			'lehrauftraegeErteilenText',
-			'lehrauftraegeErteilenKlickStatusicon',
-			'lehrauftraegeErteilenLehrauftraegeWaehlen',
-			'lehrauftraegeErteilenMitKlickErteilen',
-			'geaenderteLehrauftraege',
-			'geaenderteLehrauftraegeTextBeiErteilung',
-			'lehrauftraegeNichtAuswaehlbar',
-			'lehrauftraegeNichtAuswaehlbarTextBeiErteilung',
-			'filterAlle',
-			'filterNeu',
-			'filterBestellt',
-			'filterErteilt',
-			'filterAngenommen',
-			'filterGeaendert',
-			'filterDummies'
-		)
-	),
-	'customJSs' => array(
-			'public/js/bootstrapper.js',       
-			'public/js/lehre/lehrauftrag/approveLehrauftrag.js'
-	)
-);
-
-
 $this->load->view(
-	'templates/FHC-Header',
-	$includesArray
+    'templates/FHC-Header',
+    array(
+        'title' => 'Lehrauftrag erteilen',
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'jquerycheckboxes1' => true,
+        'bootstrap3' => true,
+        'fontawesome6' => true,
+        'sbadmintemplate3' => true,
+        'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'momentjs2' => true,
+        'ajaxlib' => true,
+        'dialoglib' => true,
+        'tablewidget' => true,
+        'navigationwidget' => true,
+        'phrases' => array(
+            'global' => array(
+                'lehrauftraegeErteilen',
+	            'mehrHilfe',
+	            'weitereInformationenUnter'
+            ),
+	        'ui' => array(
+		        'anzeigen',
+		        'alleAnzeigen',
+		        'nurNeueAnzeigen',
+		        'nurBestellteAnzeigen',
+		        'nurErteilteAnzeigen',
+		        'nurAngenommeneAnzeigen',
+		        'nurGeaenderteAnzeigen',
+		        'nurDummiesAnzeigen',
+		        'hilfeZuDieserSeite',
+		        'alleAuswaehlen',
+		        'alleAbwaehlen',
+		        'ausgewaehlteZeilen',
+		        'hilfe',
+		        'tabelleneinstellungen',
+		        'keineDatenVorhanden',
+		        'spaltenEinstellen',
+                'bestelltVon',
+                'erteiltVon',
+                'angenommenVon',
+                'stundenStundensatzGeaendert',
+                'neuerLehrauftragOhneLektorVerplant',
+                'wartetAufBestellung',
+                'wartetAufErneuteBestellung',
+                'neuerLehrauftragWartetAufBestellung',
+                'letzterStatusBestellt',
+                'letzterStatusErteilt',
+                'letzterStatusAngenommen',
+	        ),
+	        'table' => array(
+		        'spaltenEinAusblenden',
+		        'spaltenEinAusblendenMitKlickOeffnen',
+		        'spaltenEinAusblendenAufEinstellungenKlicken',
+		        'spaltenEinAusblendenMitKlickAktivieren',
+		        'spaltenEinAusblendenMitKlickSchliessen',
+		        'spaltenbreiteVeraendern',
+		        'spaltenbreiteVeraendernText',
+		        'spaltenbreiteVeraendernInfotext',
+		        'zeilenAuswaehlen',
+		        'zeilenAuswaehlenEinzeln',
+		        'zeilenAuswaehlenBereich',
+		        'zeilenAuswaehlenAlle'
+            ),
+	        'lehre' => array(
+		        'lehrauftragStandardBestellprozess',
+		        'lehrauftragStandardBestellprozessBestellen',
+		        'lehrauftragStandardBestellprozessErteilen',
+		        'lehrauftragStandardBestellprozessAnnehmen',
+		        'lehrauftraegeErteilen',
+		        'lehrauftraegeErteilenText',
+		        'lehrauftraegeErteilenKlickStatusicon',
+		        'lehrauftraegeErteilenLehrauftraegeWaehlen',
+		        'lehrauftraegeErteilenMitKlickErteilen',
+		        'geaenderteLehrauftraege',
+		        'geaenderteLehrauftraegeTextBeiErteilung',
+		        'lehrauftraegeNichtAuswaehlbar',
+		        'lehrauftraegeNichtAuswaehlbarTextBeiErteilung',
+		        'filterAlle',
+		        'filterNeu',
+		        'filterBestellt',
+		        'filterErteilt',
+		        'filterAngenommen',
+		        'filterGeaendert',
+		        'filterDummies'
+            )
+        ),
+        'customJSs' => array(
+                'public/js/bootstrapper.js',       
+                'public/js/lehre/lehrauftrag/approveLehrauftrag.js'
+        )
+    )
 );
 ?>
 
@@ -211,13 +208,5 @@ $this->load->view(
     </div><!-- end page-wrapper -->
 	<br>
 
-<?php 
-
-
-$this->load->view(
-	'templates/FHC-Footer',
-	$includesArray
-);
-
- ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
 

application/views/lehre/lehrauftrag/orderLehrauftrag.php

@@ -1,101 +1,98 @@
 <?php
-$includesArray = array(
-	'title' => 'Lehrauftrag bestellen',
-	'jquery3' => true,
-	'jqueryui1' => true,
-	'jquerycheckboxes1' => true,
-	'bootstrap3' => true,
-	'fontawesome6' => true,
-	'sbadmintemplate3' => true,
-	'tabulator5' => true,
-	'tabulator5JQuery' => true,
-	'momentjs2' => true,
-	'ajaxlib' => true,
-	'dialoglib' => true,
-	'tablewidget' => true,
-	'navigationwidget' => true,
-	'phrases' => array(
-		'global' => array(
-			'lehrauftraegeBestellen',
-			'mehrHilfe',
-			'weitereInformationenUnter'
-			),
-		'ui' => array(
-			'anzeigen',
-			'alleAnzeigen',
-			'nurNeueAnzeigen',
-			'nurBestellteAnzeigen',
-			'nurErteilteAnzeigen',
-			'nurAngenommeneAnzeigen',
-			'nurGeaenderteAnzeigen',
-			'nurDummiesAnzeigen',
-			'hilfeZuDieserSeite',
-			'alleAuswaehlen',
-			'alleAbwaehlen',
-			'ausgewaehlteZeilen',
-			'hilfe',
-			'tabelleneinstellungen',
-			'keineDatenVorhanden',
-			'spaltenEinstellen',
-			'bestelltVon',
-			'erteiltVon',
-			'angenommenVon',
-			'neuerLehrauftragOhneLektorVerplant',
-			'neuerLehrauftragWartetAufBestellung',
-			'letzterStatusBestellt',
-			'letzterStatusErteilt',
-			'letzterStatusAngenommen',
-			'nachAenderungStundensatzStunden',
-			'vorAenderungStundensatzStunden'
-		),
-		'table' => array(
-			'spaltenEinAusblenden',
-			'spaltenEinAusblendenMitKlickOeffnen',
-			'spaltenEinAusblendenAufEinstellungenKlicken',
-			'spaltenEinAusblendenMitKlickAktivieren',
-			'spaltenEinAusblendenMitKlickSchliessen',
-			'spaltenbreiteVeraendern',
-			'spaltenbreiteVeraendernText',
-			'spaltenbreiteVeraendernInfotext',
-			'zeilenAuswaehlen',
-			'zeilenAuswaehlenEinzeln',
-			'zeilenAuswaehlenBereich',
-			'zeilenAuswaehlenAlle'
-		),
-		'lehre' => array(
-			'lehrauftragStandardBestellprozess',
-			'lehrauftragStandardBestellprozessBestellen',
-			'lehrauftragStandardBestellprozessErteilen',
-			'lehrauftragStandardBestellprozessAnnehmen',
-			'lehrauftraegeBestellen',
-			'lehrauftraegeBestellenText',
-			'lehrauftraegeBestellenKlickStatusicon',
-			'lehrauftraegeBestellenLehrauftraegeWaehlen',
-			'lehrauftraegeBestellenMitKlickBestellen',
-			'lehrauftraegeBestellenVertragWirdAngelegt',
-			'geaenderteLehrauftraege',
-			'geaenderteLehrauftraegeText',
-			'lehrauftraegeNichtAuswaehlbar',
-			'lehrauftraegeNichtAuswaehlbarText',
-			'filterAlle',
-			'filterNeu',
-			'filterBestellt',
-			'filterErteilt',
-			'filterAngenommen',
-			'filterGeaendert',
-			'filterDummies'
-		)
-	),
-	'customJSs' => array(
-			'public/js/bootstrapper.js',
-			'public/js/lehre/lehrauftrag/orderLehrauftrag.js'
-	)
-);
-
-
 $this->load->view(
-	'templates/FHC-Header',
-	$includesArray
+    'templates/FHC-Header',
+    array(
+        'title' => 'Lehrauftrag bestellen',
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'jquerycheckboxes1' => true,
+        'bootstrap3' => true,
+        'fontawesome6' => true,
+        'sbadmintemplate3' => true,
+        'tabulator5' => true,
+        'tabulator5JQuery' => true,
+        'momentjs2' => true,
+        'ajaxlib' => true,
+        'dialoglib' => true,
+        'tablewidget' => true,
+        'navigationwidget' => true,
+        'phrases' => array(
+            'global' => array(
+                'lehrauftraegeBestellen',
+                'mehrHilfe',
+                'weitereInformationenUnter'
+                ),
+	        'ui' => array(
+		        'anzeigen',
+		        'alleAnzeigen',
+		        'nurNeueAnzeigen',
+		        'nurBestellteAnzeigen',
+		        'nurErteilteAnzeigen',
+		        'nurAngenommeneAnzeigen',
+		        'nurGeaenderteAnzeigen',
+		        'nurDummiesAnzeigen',
+		        'hilfeZuDieserSeite',
+		        'alleAuswaehlen',
+		        'alleAbwaehlen',
+		        'ausgewaehlteZeilen',
+		        'hilfe',
+		        'tabelleneinstellungen',
+		        'keineDatenVorhanden',
+		        'spaltenEinstellen',
+		        'bestelltVon',
+		        'erteiltVon',
+		        'angenommenVon',
+		        'neuerLehrauftragOhneLektorVerplant',
+		        'neuerLehrauftragWartetAufBestellung',
+		        'letzterStatusBestellt',
+		        'letzterStatusErteilt',
+		        'letzterStatusAngenommen',
+                'nachAenderungStundensatzStunden',
+                'vorAenderungStundensatzStunden'
+	        ),
+	        'table' => array(
+		        'spaltenEinAusblenden',
+		        'spaltenEinAusblendenMitKlickOeffnen',
+		        'spaltenEinAusblendenAufEinstellungenKlicken',
+		        'spaltenEinAusblendenMitKlickAktivieren',
+		        'spaltenEinAusblendenMitKlickSchliessen',
+		        'spaltenbreiteVeraendern',
+		        'spaltenbreiteVeraendernText',
+		        'spaltenbreiteVeraendernInfotext',
+		        'zeilenAuswaehlen',
+		        'zeilenAuswaehlenEinzeln',
+		        'zeilenAuswaehlenBereich',
+		        'zeilenAuswaehlenAlle'
+            ),
+            'lehre' => array(
+                'lehrauftragStandardBestellprozess',
+                'lehrauftragStandardBestellprozessBestellen',
+                'lehrauftragStandardBestellprozessErteilen',
+                'lehrauftragStandardBestellprozessAnnehmen',
+                'lehrauftraegeBestellen',
+                'lehrauftraegeBestellenText',
+                'lehrauftraegeBestellenKlickStatusicon',
+                'lehrauftraegeBestellenLehrauftraegeWaehlen',
+                'lehrauftraegeBestellenMitKlickBestellen',
+                'lehrauftraegeBestellenVertragWirdAngelegt',
+                'geaenderteLehrauftraege',
+                'geaenderteLehrauftraegeText',
+                'lehrauftraegeNichtAuswaehlbar',
+                'lehrauftraegeNichtAuswaehlbarText',
+                'filterAlle',
+                'filterNeu',
+                'filterBestellt',
+                'filterErteilt',
+                'filterAngenommen',
+                'filterGeaendert',
+                'filterDummies'
+            )
+        ),
+        'customJSs' => array(
+                'public/js/bootstrapper.js',
+                'public/js/lehre/lehrauftrag/orderLehrauftrag.js'
+        )
+    )
 );
 ?>
 
@@ -212,11 +209,5 @@ $this->load->view(
     </div><!-- end page-wrapper -->
 	<br>
 
-<?php 
-
-$this->load->view(
-	'templates/FHC-Footer',
-	$includesArray
-);
- ?>
+<?php $this->load->view('templates/FHC-Footer'); ?>
 

application/views/lehre/pruefungsprotokoll.php

@@ -9,8 +9,22 @@ $sitesettings = array(
 	'ajaxlib' => true,
 	'sbadmintemplate3' => true,
 	'phrases' => array(
-		'abschlusspruefung',
-		'ui'
+		'abschlusspruefung' => array(
+			'freigegebenAm',
+			'pruefungGespeichert',
+			'pruefungSpeichernFehler',
+			'abschlussbeurteilungLeer',
+			'beginnzeitLeer',
+			'beginnzeitFormatError',
+			'endezeitLeer',
+			'endezeitFormatError',
+			'endezeitBeforeError',
+			'verfNotice'
+		),
+		'ui' => array(
+			'stunde',
+			'minute'
+		)
 	),
 	'customCSSs' => array(
 		'public/css/sbadmin2/admintemplate_contentonly.css',
@@ -23,18 +37,10 @@ $sitesettings = array(
 	)
 );
 
-if(defined('CIS4')){
-	$this->load->view(
-		'templates/CISVUE-Header',
-		$sitesettings
-	);
-}else{
-	$this->load->view(
-		'templates/FHC-Header',
-		$sitesettings
-	);
-}
-
+$this->load->view(
+	'templates/FHC-Header',
+	$sitesettings
+);
 ?>
 <div id="wrapper">
 	<div id="page-wrapper">
@@ -155,14 +161,6 @@ if(defined('CIS4')){
 										<?php  echo ($abschlusspruefung->studiengangstyp == 'Bachelor' ? $this->p->t('abschlusspruefung', 'pruefungsgegenstandBachelor') : $this->p->t('abschlusspruefung', 'pruefungsgegenstandMaster')) ?>
 									</td>
 								</tr>
-								<tr>
-									<td>
-										<?php echo $this->p->t('abschlusspruefung', 'spracheDerArbeit') ?>&nbsp;<?php echo $arbeit_name ?>
-									</td>
-									<td colspan="5">
-										<?php echo $abschlusspruefung->abschlussarbeit_sprache ?? '' ?>
-									</td>
-								</tr>
 								<tr>
 									<td colspan="6">
 										<?php echo ucfirst($this->p->t('global', 'notizen')); ?>
@@ -203,9 +201,7 @@ if(defined('CIS4')){
 				<div class="col-lg-12 text-right">
 					<p>
 						<?php $freigegeben = isset($abschlusspruefung->freigabedatum); ?>
-						<button id="saveProtocolBtn" class="btn btn-default"<?php echo $freigegeben ? ' disabled title="'.$this->p->t('abschlusspruefung', 'bereitsFreigegeben').'"' : '' ?>>
-							<?php echo $this->p->t('ui', 'speichern') ?>
-						</button>
+						<button id="saveProtocolBtn" class="btn btn-default"<?php echo $freigegeben ? " disabled" : "" ?>><?php echo $this->p->t('ui', 'speichern') ?></button>
 					</p>
 				</div>
 			</div>
@@ -240,14 +236,7 @@ if(defined('CIS4')){
 	</div>
 </div>
 <?php
-if (defined('CIS4')) {
-	$this->load->view(
-		'templates/CISVUE-Footer',
-		$sitesettings
-	);
-} else {
-	$this->load->view(
-		'templates/FHC-Footer',
-		$sitesettings
-	);
-}
+$this->load->view(
+	'templates/FHC-Footer',
+	$sitesettings
+);

application/views/lehre/pruefungsprotokollUebersicht.php

@@ -1,45 +1,33 @@
 <?php
-	$includesArray = array(
-		'title' => 'Prüfungsprotokoll',
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'jquerycheckboxes1' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'tablesorter2' => true,
-		'tabulator5' => true,
-		'tabulator5JQuery' => true,
-		'cis'=>true,
-		'ajaxlib' => true,
-		'dialoglib' => true,
-		'tablewidget' => true,
-		'phrases' => array(
-			'ui' => array(
-				'keineDatenVorhanden',
-				'heute',
-				'letzteWoche',
-				'alle',
-				'zeitraum'
-				)
-		),
-		'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css'),
-		'customJSs' => array('public/js/bootstrapper.js')
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Prüfungsprotokoll',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'tablesorter2' => true,
+			'tabulator5' => true,
+			'tabulator5JQuery' => true,
+			'cis'=>true,
+			'ajaxlib' => true,
+			'dialoglib' => true,
+			'tablewidget' => true,
+			'phrases' => array(
+				'ui' => array(
+					'keineDatenVorhanden',
+                    'heute',
+                    'letzteWoche',
+                    'alle',
+                    'zeitraum'
+					)
+			),
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css'),
+			'customJSs' => array('public/js/bootstrapper.js')
+		)
 	);
-
-	if(defined("CIS4") && CIS4)
-	{
-		$this->load->view(
-			'templates/CISVUE-Header',
-			$includesArray
-		);
-	}
-	else
-	{
-		$this->load->view(
-			'templates/FHC-Header',
-			$includesArray
-		);
-	}
 ?>
 
 <div id="page-wrapper">
@@ -78,15 +66,4 @@
 	</div>
 </div>
 
-<?php
-	if (defined("CIS4") && CIS4) {
-		$this->load->view(
-			'templates/CISVUE-Footer',
-			$includesArray
-		);
-	} else {
-		$this->load->view(
-			'templates/FHC-Footer',
-			$includesArray
-		);
-	}
+<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/templates/CISVUE-Footer.php

@@ -5,11 +5,6 @@ $includesArray = array(
 	'bootstrap5' => true,
 	'fontawesome6' => true,
 	'axios027' => true,
-	'primevue3' => true,
-	'vuedatepicker11' => true,
-	'customJSs' => array_merge([
-		'vendor/moment/luxonjs/luxon.min.js'
-	], $customJSs ?? []),
 	'customJSModules' => array_merge([
 		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),

application/views/templates/CISVUE-Header.php

@@ -7,10 +7,6 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'primevue3' => true,
-	'vuedatepicker11' => true,
-	'customJSs' => array_merge([
-		'vendor/moment/luxonjs/luxon.min.js'
-	], $customJSs ?? []),
 	'customJSModules' => array_merge([
 		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
@@ -40,4 +36,4 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		></cis-menu>
 </header>
 
-<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">
+<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">

application/views/widgets/navigationMenu.php

@@ -1,4 +1,4 @@
-<div class="navbar-default sidebar top-0" role="navigation">
+<div class="navbar-default sidebar" role="navigation">
 	<div class="sidebar-nav navbar-collapse">
 		<ul class="nav" id="side-menu"></ul>
 	</div>

cis/private/lehre/notenliste.xls.php

@@ -159,39 +159,6 @@ if (!$berechtigung->isBerechtigt('admin')
 	// let's merge
 	$format_title->setAlign('merge');
 
-	// Importkonfiguration aus dem CI-Config (application/config/noten.php) lesen, damit nur die
-	// Spalten des jeweils aktiven Importtyps hervorgehoben (grau) werden.
-	$CIS_GESAMTNOTE_NOTENIMPORT = false;
-	$CIS_GESAMTNOTE_PRUEFUNGSIMPORT = true;
-	$notenConfigFile = __DIR__.'/../../../application/config/noten.php';
-	if(is_file($notenConfigFile))
-	{
-		if(!defined('BASEPATH')) define('BASEPATH', true);
-		$config = array();
-		include($notenConfigFile);
-		if(isset($config['CIS_GESAMTNOTE_NOTENIMPORT'])) $CIS_GESAMTNOTE_NOTENIMPORT = $config['CIS_GESAMTNOTE_NOTENIMPORT'];
-		if(isset($config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'])) $CIS_GESAMTNOTE_PRUEFUNGSIMPORT = $config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'];
-		unset($config);
-	}
-
-	// plain (non-highlighted) variants used when an import type is disabled
-	$format_plain =& $workbook->addFormat();
-	$format_plain->setAlign('left');
-	$format_plain->setNumFormat(49);
-
-	$format_plainright =& $workbook->addFormat();
-	$format_plainright->setAlign('right');
-	$format_plainright->setNumFormat(49);
-
-	// highlight only the cells belonging to an enabled import flow:
-	//  - Notenimport    -> Personenkennzeichen + Note (main block)
-	//  - Prüfungsimport -> Personenkennzeichen + Datum + Note (Termin2/Termin3 blocks)
-	$fmtNoteImportPkz   = $CIS_GESAMTNOTE_NOTENIMPORT     ? $format_highlight           : $format_plain;
-	$fmtNoteImportNote  = $CIS_GESAMTNOTE_NOTENIMPORT     ? $format_highlightright      : $format_plainright;
-	$fmtPruefImportPkz  = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlight           : $format_plain;
-	$fmtPruefImportDate = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlightright_date : $format_plainright;
-	$fmtPruefImportNote = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlightright      : $format_plainright;
-
 	$worksheet->write(0,0,$p->t('anwesenheitsliste/notenliste')." ".($sprache=='English'?$lvobj->bezeichnung_english:$lvobj->bezeichnung),$format_bold);
 
 	$stg_obj = new studiengang($stg);
@@ -385,13 +352,13 @@ if (!$berechtigung->isBerechtigt('admin')
 						$worksheet->write($lines,3,$elem->vorname);
 					}
 					$worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
-					$worksheet->write($lines,5,trim($elem->matrikelnr),$fmtNoteImportPkz);
-					$worksheet->write($lines,6, $note, $fmtNoteImportNote);
+					$worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight);
+					$worksheet->write($lines,6, $note, $format_highlightright);
 
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 					{
-						$worksheet->write($lines,8, trim($elem->matrikelnr), $fmtPruefImportPkz);
+						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
 						$output2 = $pr->result;
@@ -399,23 +366,23 @@ if (!$berechtigung->isBerechtigt('admin')
 						if ($output2)
 						{
 							$resultPr = $output2[0];
-							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $fmtPruefImportDate);
+							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
 							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,10, $resultPr->punkte, $fmtPruefImportNote);
+								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
 							else
-								$worksheet->write($lines,10, $resultPr->note, $fmtPruefImportNote);
+								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
 						}
 						else
 						{
-								$worksheet->write($lines,9, '', $fmtPruefImportDate);
-								$worksheet->write($lines,10, '', $fmtPruefImportNote);
+								$worksheet->write($lines,9, '', $format_highlightright_date);
+								$worksheet->write($lines,10, '', $format_highlightright);
 						}
 					}
 
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 					{
-						$worksheet->write($lines,12, trim($elem->matrikelnr), $fmtPruefImportPkz);
+						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
 						$output3 = $pr->result;
@@ -423,16 +390,16 @@ if (!$berechtigung->isBerechtigt('admin')
 						if ($output3)
 						{
 							$resultPr = $output3[0];
-							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $fmtPruefImportDate);
+							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
 							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,14, $resultPr->punkte, $fmtPruefImportNote);
+								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
 							else
-								$worksheet->write($lines,14, $resultPr->note, $fmtPruefImportNote);
+								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
 						}
 						else
 						{
-								$worksheet->write($lines,13, '', $fmtPruefImportDate);
-								$worksheet->write($lines,14, '', $fmtPruefImportNote);
+								$worksheet->write($lines,13, '', $format_highlightright_date);
+								$worksheet->write($lines,14, '', $format_highlightright);
 						}
 					}
 

public/css/Cis4/Benotungstool.css

@@ -1,90 +0,0 @@
-/* Sticky identity columns. The four freezable columns (selection/uid/Vorname/Nachname) always carry
-   the .sticky-col class for the opaque background; whether a column is actually pinned is toggled
-   per column via a `sticky-on-<field>` class on #notentable (set in JS from the user's selection).
-   The cumulative left offsets (--sl-<field>) are computed in JS (recomputeStickyOffsets) so that
-   multiple sticky columns stack next to each other instead of overlapping at left:0. */
-#notentable .tabulator-header .tabulator-col.sticky-col,
-#notentable .tabulator-tableholder .tabulator-row .tabulator-cell.sticky-col {
-	background-color: #fff;       /* opaque so scrolled cells don't show through */
-}
-
-/* keep sticky cells opaque on row hover */
-#notentable .tabulator-row:hover .tabulator-cell.sticky-col {
-	background-color: #ccc;
-}
-
-/* enable pinning per column only when the container opts the field in.
-   left offset comes from the matching --sl-<field> CSS variable (set on #notentable from JS). */
-#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"],
-#notentable.sticky-on-uid .sticky-col[tabulator-field="uid"],
-#notentable.sticky-on-vorname .sticky-col[tabulator-field="vorname"],
-#notentable.sticky-on-nachname .sticky-col[tabulator-field="nachname"] {
-	position: sticky;
-	z-index: 10;                  /* float above the scrolling pruefungs columns */
-	border-right: 1px solid #ddd; /* separator on the sticky block */
-}
-
-#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"] { left: var(--sl-selectCol, 0); }
-#notentable.sticky-on-uid       .sticky-col[tabulator-field="uid"]       { left: var(--sl-uid, 0); }
-#notentable.sticky-on-vorname   .sticky-col[tabulator-field="vorname"]   { left: var(--sl-vorname, 0); }
-#notentable.sticky-on-nachname  .sticky-col[tabulator-field="nachname"]  { left: var(--sl-nachname, 0); }
-
-
-/* styling for points input column for notenvorschläge in benotungstool*/
-#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="punkte"] {
-	position: relative;
-	background-color: rgba(255, 255, 157, 0.73);
-}
-
-/* styling for editable dropdown column of notenvorschläge in benotungstool*/
-#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"] {
-	position: relative;
-	background-color: rgba(255, 255, 157, 0.73);
-	cursor: pointer;
-}
-
-#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"]::after {
-	content: "▾";
-	position: absolute;
-	right: 8px;
-	top: 50%;
-	transform: translateY(-50%) rotate(0deg);
-	transform-origin: center;
-	color: rgba(120, 120, 60, 0.85);
-	font-size: 0.9rem;
-	line-height: 1;
-	pointer-events: none;
-	transition: transform 0.15s ease;
-}
-
-/* rotate the indicator up while the dropdown editor is open */
-#notentable .tabulator-tableholder .tabulator-cell.tabulator-editing[tabulator-field="note_vorschlag"]::after {
-	transform: translateY(-50%) rotate(180deg);
-}
-
-.pruefung-badge {
-	position: relative;
-	padding-left: 32px; /* badge width (20) + its left offset (6) + gap (6) */
-}
-
-.pruefung-badge::before {
-	content: attr(data-attempt);
-	position: absolute;
-	left: 6px;
-	top: 50%;
-	transform: translateY(-50%);
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	min-width: 20px;
-	height: 20px;
-	border-radius: 50%;
-	color: #fff;
-	font-size: 0.75rem;
-	font-weight: bold;
-}
-
-.pruefung-badge.attempt-t1::before { background: #0072B2; }
-.pruefung-badge.attempt-t2::before { background: #E69F00; }
-.pruefung-badge.attempt-t3::before { background: #CC79A7; }
-.pruefung-badge.attempt-k::before  { background: #D55E00; }

public/css/Cis4/CoreCalendarEvents.css

@@ -97,17 +97,15 @@
 	display: none;
 }
 
-.fhc-calendar-empty-slot-plus {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%,-50%);
-	font-size: 18px;
-	opacity: 0;
-	pointer-events: none;
-	user-select: none;
-}
-
-.part-body:hover .fhc-calendar-empty-slot-plus {
-	opacity: 1;
-}
+.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/Cis4/Zeitsperren.css

@@ -1,39 +0,0 @@
-/* Repositioning clear icon Datepicker for not being outside the textfield */
-/* Wrapper */
-.dp__input_wrap {
-    position: relative;
-}
-
-/* calender-Icon left */
-.dp__input_icon {
-    position: absolute;
-    left: 10px;
-    right: auto;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-/* Clear-Icon right */
-.dp__clear_icon {
-    position: absolute;
-    right: 10px;
-    left: auto;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-/* padding for Icons */
-.dp__input {
-    padding-left: 36px !important;
-    padding-right: 36px !important;
-}
-
-.info-feedback {
-    display: block;
-    font-size: 0.875em;
-    color: #0d6efd; /* Bootstrap primary */
-}
-
-.is-info {
-    border-color: #0d6efd;
-}

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/MyLv.css

@@ -6,13 +6,3 @@
 	color: var(--fhc-myLv-disabled) !important;
 	cursor: default;
 }
-
-/* adjustment to have bs5 dropdownmenus rendered properly over a tabulator table */
-.mylv-semester-table .tabulator-cell {
-	overflow: unset;
-}
-
-.mylv-semester-table .tabulator-cell .action-col {
-	/*min-height: 2.5rem;*/
-	align-items: flex-start; /* so wrapped rows don't stretch vertically */
-}

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

@@ -21,20 +21,5 @@ export default {
 			method: 'get',
 			url: `/api/frontend/v1/LvMenu/getLvMenu/${lvid}/${studiensemester_kurzbz}`
 		};
-	},
-	getMultipleLvMenu(lvas, studiensemester_kurzbz) {
-		// format params for backend bulk function
-		const lvMenuOptionList = lvas.map(lva => {
-			return {
-				lvid: lva.lehrveranstaltung_id,
-				studiensemester_kurzbz
-			}
-		})
-		
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/LvMenu/getMultipleLvMenu`,
-			params: { lvMenuOptionList }
-		};
 	}
 };

public/js/api/factory/calendar/roomPlan.js

@@ -1,44 +0,0 @@
-export default {
-	getReservableMap(ort_kurzbz, start_date, end_date) {
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/calendar/RoomPlan/getReservableMap/${ort_kurzbz}`,
-			params: { start_date, end_date }
-		};
-	},
-
-	getRoomCreationInfo() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/calendar/RoomPlan/getRoomCreationInfo'
-		};
-	},
-	getGruppen(query) {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/calendar/RoomPlan/getGruppen?query=${encodeURIComponent(query)}`
-		};
-	},
-	getLektor(query) {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/calendar/RoomPlan/getLektor?query=${encodeURIComponent(query)}`
-		};
-	},
-	addRoomReservation(formData) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/calendar/RoomPlan/addRoomReservation',
-			params: formData
-		};
-	},
-	deleteRoomReservation(reservierung_id) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/calendar/RoomPlan/deleteRoomReservation',
-			params: {
-				reservierung_id: reservierung_id
-			}
-		};
-	}
-}

public/js/api/factory/lehre.js

@@ -41,19 +41,5 @@ export default {
 			method: 'get',
 			url: `/api/frontend/v1/Lehre/semesterAverageGrade/${semester}`
 		}
-	},
-	getZugewieseneLv(uid, sem_kurzbz){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Lehre/getZugewieseneLv',
-			params: { uid, sem_kurzbz}
-		};
-	},
-	getLeForLv(lv_id, sem_kurzbz) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Lehre/getLeForLv',
-			params: { lv_id, sem_kurzbz }
-		};
 	}
-};
+};

public/js/api/factory/noten.js

@@ -1,87 +0,0 @@
-/**
- * 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 {
-	getCisConfig(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getCisConfig'
-		};
-	},
-	getStudentenNoten(lv_id, sem_kurzbz) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getStudentenNoten',
-			params: { lv_id, sem_kurzbz }
-		};
-	},
-	getNoten(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getNoten'
-		};
-	},
-	saveStudentenNoten(password, noten, lv_id, sem_kurzbz) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveStudentenNoten',
-			params: { password, noten, lv_id, sem_kurzbz }
-		};
-	},
-	saveNotenvorschlag(lv_id, sem_kurzbz, student_uid, note, punkte = null) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveNotenvorschlag',
-			params: { lv_id, sem_kurzbz, student_uid, note, punkte }
-		};
-	},
-	saveStudentPruefung(student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id = null){
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveStudentPruefung',
-			params: { student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id }
-		};
-	},
-	createPruefungen(uids, datum, lva_id, sem_kurzbz){
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/createPruefungen',
-			params: { uids, datum, lva_id, sem_kurzbz }
-		};
-	},
-	saveNotenvorschlagBulk(lv_id, sem_kurzbz, noten) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveNotenvorschlagBulk',
-			params: { lv_id, sem_kurzbz, noten }
-		};
-	},
-	saveStudentPruefungBulk(lv_id, sem_kurzbz, pruefungen) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/savePruefungenBulk',
-			params: { lv_id, sem_kurzbz, pruefungen }
-		};
-	},
-	getNoteByPunkte(punkte, lv_id, sem_kurzbz) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/getNoteByPunkte',
-			params: { punkte, lv_id, sem_kurzbz }
-		};
-	}
-}

public/js/api/factory/paabgabeUebersicht.js

@@ -1,36 +0,0 @@
-export default {
-	getPaAbgaben(studiengang_kz, abgabetyp_kurzbz, abgabedatum, personSearchString) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/education/PaabgabeUebersicht/getPaAbgaben',
-			params: {
-				studiengang_kz: studiengang_kz, abgabetyp_kurzbz: abgabetyp_kurzbz, abgabedatum: abgabedatum, personSearchString: personSearchString
-			}
-		};
-	},
-	getStudiengaenge() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/education/PaabgabeUebersicht/getStudiengaenge'
-		};
-	},
-	getTermine(studiengang_kz, abgabetyp_kurzbz) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/education/PaabgabeUebersicht/getTermine',
-			params: { studiengang_kz: studiengang_kz, abgabetyp_kurzbz: abgabetyp_kurzbz }
-		};
-	},
-	getPaAbgabetypen() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/education/PaabgabeUebersicht/getPaAbgabetypen'
-		};
-	},
-	getViewData() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/education/PaabgabeUebersicht/viewData'
-		};
-	}
-};

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

@@ -29,11 +29,5 @@ export default {
 			url: 'api/frontend/v1/organisation/studiensemester/getAll',
 			params: { order, start }
 		};
-	},
-	getStudiensemester() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Studiensemester/getStudiensemester'
-		};
-	},
+	}
 };

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2026 fhcomplete.org
+ * 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
@@ -16,55 +16,44 @@
  */
 
 export default {
-	getTimelocksUser(uid) {
+	getInformation() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Zeitsperren/getZeitsperrenUser/' + uid
+			url: '/api/frontend/v1/tempus/Reservierung/getInformation',
 		};
 	},
-	getTypenZeitsperren(){
+	searchTeilnehmer(query)
+	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Zeitsperren/getTypenZeitsperren/'
+			url: `/api/frontend/v1/tempus/Reservierung/getLektor?query=${encodeURIComponent(query)}`
 		};
 	},
-	getTypenErreichbarkeit(){
+	searchGroup(query)
+	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Zeitsperren/getTypenErreichbarkeit/'
+			url: `/api/frontend/v1/tempus/Reservierung/searchGroup?query=${encodeURIComponent(query)}`
 		};
 	},
-	getStunden(){
+	getGruppen(query) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Zeitsperren/getStunden/'
+			url: `/api/frontend/v1/tempus/Reservierung/getGruppen?query=${encodeURIComponent(query)}`
 		};
 	},
-	addZeitsperre(uid, params) {
+	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/Zeitsperren/add/' + uid,
-			params
+			url: '/api/frontend/v1/tempus/Reservierung/addReservierung',
+			params: { titel, beschreibung, ort_kurzbz, start_date, end_date, teilnehmer, specialFinalGroups, specialGroups, groups}
 		};
 	},
-	editZeitsperre(zeitsperre_id, params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Zeitsperren/update/' + zeitsperre_id,
-			params
-		};
-	},
-	loadZeitsperre(zeitsperre_id) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Zeitsperren/loadZeitsperre/' + zeitsperre_id
-		};
-	},
-	deleteZeitsperre(zeitsperre_id) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Zeitsperren/delete/' + zeitsperre_id
-		};
-	}
 
 };

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 }
+			};
+		}
+	}
+};