Merge branch 'cis40_2026-09_ma_rc' into demo-cis40

prevent editing contact data of employees

application/config/Events.php

@@ -23,6 +23,15 @@ 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(
@@ -33,27 +42,5 @@ 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

@@ -0,0 +1,64 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// Noten die keinen Prüfungsantritt verbrauchen. Fallback-PKs; massgeblich sind die per Bezeichnung
+// aufgelösten Noten (NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN), da die PKs je Installation abweichen.
+$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk
+
+// 'Nicht beurteilt' ist eine Altlast: formal eine Note, inhaltlich keine Leistungsfeststellung.
+// Wird weiterhin häufig vergeben und darf daher keinen Antritt kosten.
+$config['NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN'] = ['Noch nicht eingetragen', 'entschuldigt', 'Nicht beurteilt'];
+
+// Anrechnungsnoten: die Leistung wurde vorab anerkannt, der/die Studierende ist zwar Teil der
+// Lehrveranstaltung, tritt aber zu keiner Prüfung an. Solange die ZEUGNISNOTE eine davon ist, sind
+// für diese Lehrveranstaltung keine Prüfungen möglich. Auflösung wie oben über die Bezeichnung,
+// die PKs sind nur Fallback.
+$config['NOTEN_ANRECHNUNG_BEZEICHNUNGEN'] = ['angerechnet', 'intern angerechnet'];
+$config['NOTEN_ANRECHNUNG'] = [6, 16]; // tbl_note pk
+
+$config['NOTEN_OCCURANCE_LIMIT_MAP'] = [17 => 1]; // über alle Antritte hinweg nur ein 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;
+
+// The maximum number of attempts that count, the first attempt and the kommissionelle attempt
+// included. null derives the number from the old flags:
+//   1 (the original assessment) + TERMIN2 + TERMIN3 + KOMMPRUEF
+// The examination rules permit three attempts. With TERMIN2 and KOMMPRUEF the formula gives 3.
+// An installation with TERMIN3 gets 4, which is one more attempt in the same chain.
+$config['CIS_GESAMTNOTE_MAX_ANTRITTE'] = null;
+
+// The exam types that take place before a commission.
+$config['PRUEFUNG_KOMMISSIONELL_TYPEN'] = ['kommPruef', 'zusKommPruef'];
+
+// The type that the tool writes for the last attempt. The last attempt is always kommissionell.
+$config['PRUEFUNG_TYP_KOMMISSIONELL'] = 'kommPruef';
+
+// Exam types that never use an attempt. A zusKommPruef repeats a kommissionelle Prüfung that had
+// a procedural fault. It stands outside the attempt chain, and the student administration enters
+// it. The examination rules do not describe it.
+$config['PRUEFUNG_TYPEN_OHNE_ANTRITT'] = ['zusKommPruef'];
+
+// Spaltenaufteilung der Prüfungen in der Notentabelle:
+//   'antritt' - eine Spalte je Antrittsnummer, Datum steht in der Zelle (robust bei Einzelterminen)
+//   'datum'   - eine Spalte je Prüfungsdatum (kompakt, wenn ganze Jahrgänge am selben Tag antreten)
+// Nur die Vorgabe; im Tool umschaltbar und pro Benutzer gespeichert.
+$config['CIS_GESAMTNOTE_PRUEFUNGSSPALTEN'] = 'antritt';
+
+// Bei der Notenübernahme durch die Assistenz den ersten Antritt als eigene Prüfung anlegen.
+$config['CIS_GESAMTNOTE_ERSTANTRITT_BEI_UEBERNAHME'] = true;
+
+// 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)
+
+// Noteneintragungsfrist (Prüfungsordnung §1): grade/pruefung entry is only permitted up to this
+// deadline. The month/day below is applied to the studiensemester's year:
+//   Sommersemester (SSyyyy) -> deadline in the SAME calendar year   (default 15th November)
+//   Wintersemester (WSyyyy) -> deadline in the FOLLOWING calendar year (default 15th May)
+$config['CIS_GESAMTNOTE_NOTENEINTRAGUNGSFRIST'] = false; // switch to use the window enforcement
+$config['NOTENEINTRAGUNGSFRIST_SS'] = ['month' => 11, 'day' => 15]; // Sommersemester deadline (same year)
+$config['NOTENEINTRAGUNGSFRIST_WS'] = ['month' => 5,  'day' => 15];  // Wintersemester deadline (following year)

application/config/routes.php

@@ -61,12 +61,29 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
+// Legacy CMS news routes
+$route['api/frontend/v1/Cms/getNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/getNewsItem/$1';
+$route['api/frontend/v1/Cms/storeNewsItem'] = 'api/frontend/v1/NewsAdministrationAPI/storeNewsItem';
+$route['api/frontend/v1/Cms/updateNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/updateNewsItem/$1';
+$route['api/frontend/v1/Cms/deleteNewsItem/(:num)'] = 'api/frontend/v1/NewsAdministrationAPI/deleteNewsItem/$1';
+
+// Keep legacy uppercase URLs refreshable while using the canonical controller method casing
+$route['CisVue/Cms/NewsAdministration'] = 'CisVue/Cms/newsAdministration';
+
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $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['Cis/MyReservation'] = 'Cis/MyReservation/index/$1';
+
+//Route for Zeitsperrenma
+$route['Cis/Zeitsperrenma/.*'] = 'Cis/Zeitsperrenma/index/$1';
+//Route für Zeitsperren
+$route['Cis/Zeitsperren/.*'] = 'Cis/Zeitsperren/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
@@ -146,8 +163,6 @@ $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/lv/(:any)'] = 'a
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 
-$route['api/frontend/v1/tempus/Tags/getTagsByCalendar/(:num)'] = 'api/frontend/v1/tempus/Tags/getTagsByCalendar/$1';
-
 foreach($subdirs as $subdir)
 {
 	if(is_dir($subdir))

application/config/tempus.php

@@ -1,12 +0,0 @@
-<?php
-
-$config['send_update_mails'] = false;
-$config['calendar_start'] = 7;
-$config['calendar_end'] = 23;
-
-
-$config['tempus_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => true],
-	'hinweis' => ['readonly' => false],
-];

application/config/treemenu.php

@@ -27,8 +27,3 @@ $config['lvv'] = [
 	"library" => "treemenu/LvVwLib",
 	"permissions" => ["admin:r", "assistenz:r"]
 ];
-
-$config['tempus'] = [
-	"library" => "treemenu/TempusLib",
-	"permissions" => ["admin:r", "assistenz:r", "lehre/lvplan:r"]
-];

application/controllers/Cis/Benotungstool.php

@@ -0,0 +1,37 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Benotungstool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => array('lehre/benotungstool:rw', 'lehre/benotungstool_assistenz:rw')
+		]);
+
+		$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/MyReservation.php

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

application/controllers/Cis/ProjektabgabeUebersicht.php

@@ -0,0 +1,30 @@
+<?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

@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Zeitsperren extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['cis/eigene_zeitsperren: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/Cis/Zeitsperrenma.php

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

application/controllers/CisVue/Cms.php

@@ -17,14 +17,15 @@ class Cms extends Auth_Controller
 		    array(
 			'content' => 'basis/cis:r',
 			'getNews' => 'basis/cis:r',
-			'getNewsRowCount' => 'basis/cis:r',
 			'getRoomInformation' => 'basis/cis:r',
-			'news' => 'basis/cis:r'
+			'news' => 'basis/cis:r',
+			'newsAdministration' => ['basis/news:r'],
 		    )
 		);
 
 		// Loads Libraries
 		$this->load->library('CmsLib');
+		$this->load->library('PermissionLib');
 
 		// Loads phrases system
 		$this->loadPhrases([
@@ -83,10 +84,18 @@ class Cms extends Auth_Controller
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
 	{	
-		$viewData = array();
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
+		$this->load->view('CisRouterView/CisRouterView.php', [
+			'route' => 'News',
+		]);
 	}
 	
+	public function newsAdministration()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php', [
+			'route' => 'NewsAdministration',
+		]);
+	}
+
 	public function getRoomInformation($ort_kurzbz)
 	{
 		// Load Config

application/controllers/Tempus.php

@@ -1,69 +0,0 @@
-<?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->OrganisationseinheitModel->addJoin('tbl_studiengang', 'oe_kurzbz', 'LEFT');
-
-		$this->OrganisationseinheitModel->addSelect('public.tbl_organisationseinheit.organisationseinheittyp_kurzbz,
-															public.tbl_organisationseinheit.bezeichnung,
-															public.tbl_studiengang.studiengang_kz,
-															public.tbl_organisationseinheit.oe_kurzbz,
-															tbl_studiengang.typ,
-															COALESCE(public.tbl_studiengang.bezeichnung, \'\') as stgbezeichnung');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.aktiv', 'DESC');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.organisationseinheittyp_kurzbz');
-		$organisationen = getData($this->OrganisationseinheitModel->loadWhere(array("tbl_organisationseinheit.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'),
-				'stundenraster' => $this->permissionlib->isBerechtigt('basis/tempus_stundenraster'),
-			],
-			'variables' => array_merge([
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			], $extraVariables)
-		]);
-	}
-}

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

@@ -1916,7 +1916,7 @@ class Abgabe extends FHCAPI_Controller
 
 				if (!$mailres)
 				{
-					$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
+					$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
 				}
 
 			}

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Benutzer extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getUserData' => self::PERM_LOGGED,
+		]);
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getUserData()
+	{
+		$uid = $this->input->get("uid") ?? getAuthUID();
+		$this->BenutzerModel->addSelect("uid, person_id, insertamum");
+		$userResult = $this->BenutzerModel->load(["uid" => $uid]);
+		$userData = $this->getDataOrTerminateWithError($userResult);
+		$this->terminateWithSuccess($userData);
+	}
+}
+

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

@@ -36,14 +36,15 @@ class Cms extends FHCAPI_Controller
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
             'content' => self::PERM_LOGGED,
-			'news' => self::PERM_LOGGED,
-			'getNewsRowCount' => self::PERM_LOGGED,
+			'newsForWidget' => self::PERM_LOGGED,
 			'getNews' => self::PERM_LOGGED,
 
 		]);
 
 		$this->load->model('content/News_model', 'NewsModel');
-
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		
 		// setting up the papgination_size
 		$this->page_size = 10;
 
@@ -59,7 +60,6 @@ class Cms extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
@@ -106,7 +106,7 @@ class Cms extends FHCAPI_Controller
 		$this->terminateWithSuccess($content_id);
 	}
 
-	public function news()
+	public function newsForWidget()
 	{
 
 		// form validation
@@ -118,7 +118,7 @@ class Cms extends FHCAPI_Controller
 		$this->load->model('content/news_model', 'NewsModel');
 		
 		$limit =  $this->input->get('limit',TRUE);
-		
+
 		//query the news
 		$news = $this->NewsModel->getAll($limit);
 
@@ -157,23 +157,7 @@ class Cms extends FHCAPI_Controller
         
 	}
 
-	public function getNewsRowCount($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $fachbereich_kurzbz = null, $maxalter = 0, $edit = false, $sichtbar = true, $page = 1, $page_size = 10)
-	{
-		list($studiengang_kz, $semester) = $this->cmslib->getStgAndSem($studiengang_kz, $semester);
-		$all = $edit;
-		
-		$this->load->model('content/News_model','NewsModel');
-
-		$num_rows = $this->NewsModel->countNewsWithContent(getSprache(), $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
-		
-		$num_rows = $this->getDataOrTerminateWithError($num_rows);
-		
-		$this->terminateWithSuccess($num_rows);
-		
-	}
-
-
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = false, $titel = '', $edit = false, $sichtbar = true)
 	{
 		//form validation
 		$this->load->library('form_validation');
@@ -193,15 +177,45 @@ class Cms extends FHCAPI_Controller
 
 		// default value for the page_size is 10
 		$page_size = $page_size ?? 10;
+
+		$passedSichtbar = $this->input->get('published', true);
+		if($passedSichtbar !== null)
+		{
+			$sichtbar = $passedSichtbar;
+		}
 		
-		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size, $sprache);
+		$filterForDegreePrograms = false;
+		$entitledDegreePrograms = [];
+		$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+		if(isError($student))
+		{
+			$this->terminateWithError(getError($student));
+		}
+		if(hasData($student))
+		{
+			$student = current(getData($student));
+
+			$degreeProgramSemesterDataResult = $this->PrestudentModel->getStudiengaengAndAusbildungssemesterByStudentUid(getAuthUID());
+			$degreeProgramSemesterData = $this->getDataOrTerminateWithError($degreeProgramSemesterDataResult)[0];
+			if ($degreeProgramSemesterData) {
+				$studiengang_kz = isset($degreeProgramSemesterData->studiengang_kz) ? $degreeProgramSemesterData->studiengang_kz : null;
+				$semester = isset($degreeProgramSemesterData->ausbildungssemester) ? $degreeProgramSemesterData->ausbildungssemester : null;
+			}
+
+			$mischen = true;
+		} else {
+			$filterForDegreePrograms = true;
+			$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
+			array_push($entitledDegreePrograms, 0);
+		}
+
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, $mischen, $titel, $edit, $sichtbar, $page, $page_size, $sprache, $filterForDegreePrograms, $entitledDegreePrograms, true);
 		$news = $this->getDataOrTerminateWithError($news);
 
-		$this->addMeta('phrases', json_decode($this->p->getJson()));
-		$this->terminateWithSuccess($news);
+		$this->addMeta('row_count', $news["row_count"] ?? 0);
+		$this->terminateWithSuccess($news["content"]);
 
 	}
 
 	
 }
-

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

@@ -18,18 +18,9 @@
 
 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
 	 */
@@ -40,38 +31,56 @@ 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);
-        
-        // return early if the required parameter is missing
-        if(!isset($lehreinheit_id))
-        {
-            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-        }
+		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
 
-        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-        
-        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+		// return early if the required parameter is missing
+		if(!isset($lehreinheit_id))
+		{
+			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+		}
 
-        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+
+		$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)
@@ -81,13 +90,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
 	 */
@@ -145,5 +154,46 @@ 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,7 +36,8 @@ class LvMenu extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLvMenu' => self::PERM_LOGGED
+			'getLvMenu' => self::PERM_LOGGED,
+			'getMultipleLvMenu' => self::PERM_LOGGED
 		]);
 
 		$this->load->model("ressource/Mitarbeiter_model");
@@ -61,24 +62,23 @@ 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){
+	public function getMultipleLvMenu(){
+		$lvMenuOptionList = $this->input->post('lvMenuOptionList', true);
 		$result =[];
 		foreach($lvMenuOptionList as $lvMenuOptions){
-			$lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
-			if(isError($lvMenu)){
-				// TODO: some lvMenu threw an error, handle error here
-			}
+			$lvMenu = $this->getLvMenuInternal($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+			
 			$result[$lvMenuOptions['lvid']]=$lvMenu;
 		}
 		$this->terminateWithSuccess($result);
 	}
-
-	/**
-	 * 
-	 */
-	public function getLvMenu($lvid, $studiensemester_kurzbz)
-	{
+	
+	private function getLvMenuInternal($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,11 +299,18 @@ class LvMenu extends FHCAPI_Controller
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
-		// HTTP response
-		// ##########################################################################################
+
+		return $menu;
+	}
+	
+	/**
+	 * 
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{
+		$menu = $this->getLvMenuInternal($lvid, $studiensemester_kurzbz);
 		
 		$this->terminateWithSuccess($menu);
-
 	}
 
 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){
@@ -372,7 +379,8 @@ 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'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
+					'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('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 				);
 			}
@@ -541,4 +549,4 @@ class LvMenu extends FHCAPI_Controller
 			);
 		}
     }
-}
+}

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

@@ -0,0 +1,167 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MaZeitsperren extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllActiveZeitsperren' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getAllZeitsperrenFixeMa' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getAllZeitsperrenLector' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getAllZeitsperrenOes' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getZeitsperrenAss' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getStgLectors' => self::PERM_LOGGED,
+			'loadZeitsperrenLectorStg' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'loadZeitsperrenMa' => ['cis/andere_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getDetailsMa' => 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');
+	}
+
+	//only user with zeitsperren
+	public function getAllActiveZeitsperren($days)
+	{
+		$result = $this->ZeitsperreModel->getZeitsperrenForNextDays($days);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	//TODO: check query: more results after join with hr-table
+	//all fixe Ma
+	public function getAllZeitsperrenFixeMa($days)
+	{
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, true, false, null, false);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllZeitsperrenLector($days)
+	{
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, true, null, false);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getZeitsperrenAss($days)
+	{
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, false, null, true);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllZeitsperrenOes($days, $oe)
+	{
+		if(!$oe)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'OE Kurzbezeichnung']), self::ERROR_TYPE_GENERAL);
+		}
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, false, $oe, false);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadZeitsperrenLectorStg($days, $stg)
+	{
+		if(!$stg)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
+		}
+		if(!is_numeric($stg))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_paramNoNumber', ['param'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+		$result = $this->ZeitsperreModel->getMitarbeiterWithZeitsperren($von, $bis, false, true, false, false, $stg);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStgLectors()
+	{
+		$sql = "
+			select
+				studiengang_kz,
+				kurzbz,
+				kurzbzlang,
+				typ,
+				bezeichnung,
+				kurzbzlang || ' (' || bezeichnung || ')' AS label,
+				aktiv
+			from
+				public.tbl_studiengang
+			where 
+				typ in ('b','m')
+			order by typ asc, kurzbz Asc
+			";
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadZeitsperrenMa($days, $uid)
+	{
+		if ($uid === null || $uid === '')
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mitarbeiter UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$result = $this->ZeitsperreModel->getZeitsperrenForNextDays($days, $uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDetailsMa($uid)
+	{
+		if ($uid === null || $uid === '')
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mitarbeiter UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$this->load->model('person/Person_model', 'PersonModel');
+		$result = $this->PersonModel->getFullName($uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+}
+

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

@@ -0,0 +1,948 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class NewsAdministrationAPI extends FHCAPI_Controller
+{
+	/**
+	 * News API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getNews' => 'basis/news:r',
+			'getNewsItem' => 'basis/news:r',
+			'storeNewsItem' => 'basis/news:w',
+			'updateNewsItem' => 'basis/news:w',
+			'deleteNewsItem' => 'basis/news:w'
+		]);
+
+		$this->load->model('content/Content_model', 'ContentModel');
+		$this->load->model('content/Contentsprache_model', 'ContentspracheModel');
+		$this->load->model('content/News_model', 'NewsModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$this->loadPhrases([
+			'global'
+		]);
+
+		$this->load->library('CmsLib');
+
+		$this->load->helper('hlp_sancho_helper');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $titel = '', $active = true, $sichtbar = true)
+	{
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('page','Page','required|is_natural');
+		$this->form_validation->set_rules('page_size', 'PageSize', 'is_natural');
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$page = intval($this->input->get('page', true));
+		$page_size = intval($this->input->get('page_size', true));
+		$sprache = $this->input->get('sprache', true);
+		if(!$sprache)
+		{
+			$sprache = getUserLanguage();
+		}
+
+		// default value for the page_size is 10
+		$page_size = $page_size ?? 10;
+
+		$passedSichtbar = $this->input->get('published', true);
+		if($passedSichtbar !== null)
+		{
+			$sichtbar = $passedSichtbar;
+		}
+
+		$passedIsActive = $this->input->get('isActive', true);
+		if ($passedIsActive !== null)
+		{
+			$isActive = filter_var(
+				$passedIsActive,
+				FILTER_VALIDATE_BOOLEAN,
+				FILTER_NULL_ON_FAILURE
+			);
+			if ($isActive !== null)
+			{
+				$active = $isActive;
+			}
+		}
+
+		$degreeProgramShortCode = $this->input->get('degreeProgramShortCode', true);
+		if ($degreeProgramShortCode !== null && $degreeProgramShortCode !== '')
+		{
+			if (!ctype_digit((string)$degreeProgramShortCode))
+			{
+				$this->terminateWithValidationErrors([
+					'degreeProgramShortCode' => 'A valid degree program is required'
+				]);
+			}
+			$studiengang_kz = $degreeProgramShortCode;
+		}
+
+		$passedSemester = $this->input->get('semester', true);
+		if ($passedSemester !== null && $passedSemester !== '')
+		{
+			if (
+				!ctype_digit((string)$passedSemester)
+				|| (int)$passedSemester < 1
+				|| (int)$passedSemester > 8
+			)
+			{
+				$this->terminateWithValidationErrors([
+					'semester' => 'A valid semester is required'
+				]);
+			}
+			$semester = filter_var($passedSemester, FILTER_VALIDATE_INT);
+		}
+
+		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
+
+		$news = $this->cmslib->getNews($infoscreen, $studiengang_kz, $semester, false, $titel, true, $sichtbar, $page, $page_size, $sprache, true, $entitledDegreePrograms, $active);
+		$news = $this->getDataOrTerminateWithError($news);
+
+		$this->addMeta('row_count', $news["row_count"] ?? 0);
+		$this->terminateWithSuccess($news["content"]);
+	}
+
+	/**
+	 * Returns one news entry with all available language versions for editing.
+	 *
+	 * @return void
+	 */
+	public function getNewsItem($newsId)
+	{
+		if (!is_numeric($newsId) || (int)$newsId < 1)
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'A valid news ID is required'
+			]);
+		}
+		
+		$newsId = (int)$newsId;
+		$newsResult = $this->NewsModel->load($newsId);
+
+		if (isError($newsResult))
+		{
+			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
+		}
+
+		if (!hasData($newsResult))
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'The requested news entry does not exist'
+			]);
+		}
+
+		$news = current(getData($newsResult));
+		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
+		
+		if (!in_array($news->studiengang_kz, $entitledDegreePrograms)) {
+			$this->terminateWithError('You are not entitled to access this news entry', self::ERROR_TYPE_PERMISSION);
+		}
+		$translationsResult = $this->ContentspracheModel->loadWhere([
+			'content_id' => $news->content_id
+		]);
+
+		if (isError($translationsResult))
+		{
+			$this->terminateWithError(getError($translationsResult), self::ERROR_TYPE_DB);
+		}
+
+		$languages = [];
+
+		foreach ((array)getData($translationsResult) as $translation)
+		{
+			$languages[$translation->sprache] = true;
+		}
+
+		$translations = [];
+
+		foreach (array_keys($languages) as $language)
+		{
+			$contentResult = $this->ContentModel->getContent(
+				$news->content_id,
+				$language,
+				null,
+				null,
+				false
+			);
+
+			if (isError($contentResult))
+			{
+				$this->terminateWithError(getError($contentResult), self::ERROR_TYPE_DB);
+			}
+
+			$content = getData($contentResult);
+			$document = new DOMDocument('1.0', 'UTF-8');
+
+			if ($content->content !== '' && $document->loadXML($content->content) === false)
+			{
+				$this->terminateWithError(
+					'The stored news content is invalid',
+					self::ERROR_TYPE_GENERAL
+				);
+			}
+
+			$author = $document->getElementsByTagName('verfasser')->item(0);
+			$title = $document->getElementsByTagName('betreff')->item(0);
+			$text = $document->getElementsByTagName('text')->item(0);
+
+			$translations[] = [
+				'language' => $language,
+				'author' => $author ? $author->nodeValue : '',
+				'title' => $title ? $title->nodeValue : '',
+				'text' => $text ? str_replace('dms.php', APP_ROOT . 'cms/dms.php', $text->nodeValue) : '',
+				'isPublished' => (bool)$content->sichtbar
+			];
+		}
+
+		$this->terminateWithSuccess([
+			'newsId' => (int)$news->news_id,
+			'visibleFrom' => $news->datum,
+			'visibleTo' => $news->datum_bis,
+			'degreeProgramShortCode' => $news->studiengang_kz,
+			'semester' => $news->semester,
+			'translations' => $translations
+		]);
+	}
+
+	/**
+	 * Creates a news entry and all supplied translations.
+	 *
+	 * @return void
+	 */
+	public function storeNewsItem()
+	{
+		$this->load->library('form_validation');
+		$postData = $this->input->post(null, true);
+		$this->form_validation->set_data(is_array($postData) ? $postData : []);
+		$this->form_validation->set_rules('visibleFrom', 'Visible from', 'required|is_valid_date');
+		$this->form_validation->set_rules('visibleTo', 'Visible to', 'is_valid_date');
+		$this->form_validation->set_rules(
+			'degreeProgramShortCode',
+			'Degree program',
+			'required|is_natural'
+		);
+		$this->form_validation->set_rules(
+			'semester',
+			'Semester',
+			'is_natural_no_zero|less_than_equal_to[8]'
+		);
+
+		$errors = $this->form_validation->run() === false
+			? $this->form_validation->error_array()
+			: [];
+		$visibleFrom = $this->input->post('visibleFrom', true);
+		$visibleTo = $this->input->post('visibleTo', true);
+		$translations = $this->input->post('translations', true);
+
+		if (
+			is_string($visibleFrom)
+			&& is_string($visibleTo)
+			&& $visibleTo !== ''
+			&& is_valid_date($visibleFrom)
+			&& is_valid_date($visibleTo)
+			&& new DateTime($visibleTo) < new DateTime($visibleFrom)
+		)
+		{
+			$errors['visibleTo'] = 'Visible to must not be before Visible from';
+		}
+
+		if (!is_array($translations) || count($translations) === 0)
+		{
+			$errors['translations'] = 'At least one translation is required';
+		}
+		else
+		{
+			foreach ($translations as $index => $translation)
+			{
+				if (!is_array($translation))
+				{
+					$errors['translations.' . $index] = 'Each translation must be an object';
+				}
+			}
+		}
+
+		if (count($errors) > 0)
+		{
+			$this->terminateWithValidationErrors($errors);
+		}
+
+
+		$this->_ensureUserIsEntitledForDegreeProgram($this->input->post('degreeProgramShortCode', true));
+
+		$degreeProgramShortCode = $this->input->post('degreeProgramShortCode', true);
+		$semester = $this->input->post('semester', true);
+		$semester = $semester === '' ? null : $semester;
+		$visibleTo = $visibleTo === '' ? null : $visibleTo;
+
+		$studiengang = $this->_getStudiengang($degreeProgramShortCode);
+
+		$data = [
+			'studiengang_kz' => $degreeProgramShortCode,
+			'semester' => $semester,
+			'datum' => $visibleFrom,
+			'datum_bis' => $visibleTo,
+			'translations' => []
+		];
+
+		foreach ($translations as $index => $translation)
+		{
+			$data['translations'][$index] = [
+				'sprache' => $translation['language'] ?? '',
+				'verfasser' => $translation['author'] ?? '',
+				'betreff' => $translation['title'] ?? '',
+				'text' => $translation['text'] ?? '',
+				'sichtbar' => isset($translation['isPublished']) ? (bool)$translation['isPublished'] : false
+			];
+		}
+
+		$this->_validateLanguages($data['translations']);
+
+		foreach ($data['translations'] as $index => $translation)
+		{
+			$data['translations'][$index]['content'] = $this->_buildNewsXml($translation);
+		}
+
+		$uid = getAuthUID();
+		$now = date('Y-m-d H:i:s');
+
+		if ($this->db->trans_begin() === false)
+		{
+			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
+		}
+
+		$contentResult = $this->ContentModel->insert([
+			'template_kurzbz' => 'news',
+			'oe_kurzbz' => $studiengang->oe_kurzbz,
+			'aktiv' => true,
+			'menu_open' => false,
+			'insertamum' => $now,
+			'insertvon' => $uid
+		]);
+		$contentId = (int)$this->_getInsertedIdOrRollback($contentResult);
+
+		$newsResult = $this->NewsModel->insert([
+			'uid' => $uid,
+			'studiengang_kz' => $data['studiengang_kz'],
+			'semester' => $data['semester'],
+			'datum' => $data['datum'],
+			'datum_bis' => $data['datum_bis'],
+			'content_id' => $contentId,
+			'insertamum' => $now,
+			'insertvon' => $uid,
+			'updateamum' => $now,
+			'updatevon' => $uid
+		]);
+		$newsId = (int)$this->_getInsertedIdOrRollback($newsResult);
+
+		foreach ($data['translations'] as $translation)
+		{
+			$translation['content'] = $this->formatContentURLsToRelative($translation['content']);
+
+			$translationResult = $this->ContentspracheModel->insert([
+				'sprache' => $translation['sprache'],
+				'content_id' => $contentId,
+				'version' => 1,
+				'sichtbar' => $translation['sichtbar'],
+				'content' => $translation['content'],
+				'titel' => $translation['betreff'],
+				'insertamum' => $now,
+				'insertvon' => $uid,
+				'updateamum' => $now,
+				'updatevon' => $uid
+			]);
+
+			$this->_getInsertedIdOrRollback($translationResult);
+		}
+
+		$newsItemResult = $this->NewsModel->load($newsId);
+		$newsItem = $this->getDataOrTerminateWithError($newsItemResult);
+		$newsItem = $newsItem[0];
+
+		$this->_sendNewsItemTranslationRequiredMail(
+			$newsItem
+		);
+
+		if ($this->db->trans_status() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		if ($this->db->trans_commit() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+		
+		$this->terminateWithSuccess($newsId);
+	}
+
+	/**
+	 * Updates a news entry and its supplied translations.
+	 *
+	 * @return void
+	 */
+	public function updateNewsItem($newsId)
+	{
+		if (!is_numeric($newsId) || (int)$newsId < 1)
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'A valid news ID is required'
+			]);
+		}
+
+		$newsId = (int)$newsId;
+		$existingNewsResult = $this->NewsModel->load($newsId);
+
+		if (isError($existingNewsResult))
+		{
+			$this->terminateWithError(getError($existingNewsResult), self::ERROR_TYPE_DB);
+		}
+
+		if (!hasData($existingNewsResult))
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'The requested news entry does not exist'
+			]);
+		}
+
+		$existingNews = current(getData($existingNewsResult));
+
+		$this->_ensureUserIsEntitledForDegreeProgram($existingNews->studiengang_kz);
+
+		$this->load->library('form_validation');
+		$postData = $this->input->post(null, true);
+		$this->form_validation->set_data(is_array($postData) ? $postData : []);
+		$this->form_validation->set_rules('visibleFrom', 'Visible from', 'required|is_valid_date');
+		$this->form_validation->set_rules('visibleTo', 'Visible to', 'is_valid_date');
+		$this->form_validation->set_rules(
+			'degreeProgramShortCode',
+			'Degree program',
+			'required|is_natural'
+		);
+		$this->form_validation->set_rules(
+			'semester',
+			'Semester',
+			'is_natural_no_zero|less_than_equal_to[8]'
+		);
+
+		$errors = $this->form_validation->run() === false
+			? $this->form_validation->error_array()
+			: [];
+		$visibleFrom = $this->input->post('visibleFrom', true);
+		$visibleTo = $this->input->post('visibleTo', true);
+		$translations = $this->input->post('translations', true);
+
+		if (
+			is_string($visibleFrom)
+			&& is_string($visibleTo)
+			&& $visibleTo !== ''
+			&& is_valid_date($visibleFrom)
+			&& is_valid_date($visibleTo)
+			&& new DateTime($visibleTo) < new DateTime($visibleFrom)
+		)
+		{
+			$errors['visibleTo'] = 'Visible to must not be before Visible from';
+		}
+
+		if (!is_array($translations) || count($translations) === 0)
+		{
+			$errors['translations'] = 'At least one translation is required';
+		}
+		else
+		{
+			foreach ($translations as $index => $translation)
+			{
+				if (!is_array($translation))
+				{
+					$errors['translations.' . $index] = 'Each translation must be an object';
+				}
+			}
+		}
+
+		if (count($errors) > 0)
+		{
+			$this->terminateWithValidationErrors($errors);
+		}
+
+		$degreeProgramShortCode = $this->input->post('degreeProgramShortCode', true);
+		$semester = $this->input->post('semester', true);
+		$semester = $semester === '' ? null : $semester;
+		$visibleTo = $visibleTo === '' ? null : $visibleTo;
+
+		$studiengang = $this->_getStudiengang($degreeProgramShortCode);
+
+		$data = [
+			'studiengang_kz' => $degreeProgramShortCode,
+			'semester' => $semester,
+			'datum' => $visibleFrom,
+			'datum_bis' => $visibleTo,
+			'translations' => []
+		];
+
+		foreach ($translations as $index => $translation)
+		{
+			$data['translations'][$index] = [
+				'sprache' => $translation['language'] ?? '',
+				'verfasser' => $translation['author'] ?? '',
+				'betreff' => $translation['title'] ?? '',
+				'text' => $translation['text'] ?? '',
+				'sichtbar' => isset($translation['isPublished']) ? (bool)$translation['isPublished'] : false
+			];
+		}
+
+		$this->_validateLanguages($data['translations']);
+
+		foreach ($data['translations'] as $index => $translation)
+		{
+			$data['translations'][$index]['content'] = $this->_buildNewsXml($translation);
+		}
+
+		$uid = getAuthUID();
+		$now = date('Y-m-d H:i:s');
+
+		if ($this->db->trans_begin() === false)
+		{
+			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
+		}
+
+		$contentResult = $this->ContentModel->update($existingNews->content_id, [
+			'oe_kurzbz' => $studiengang->oe_kurzbz,
+			'updateamum' => $now,
+			'updatevon' => $uid
+		]);
+
+		if (isError($contentResult))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($contentResult), self::ERROR_TYPE_DB);
+		}
+
+		$newsResult = $this->NewsModel->update($newsId, [
+			'studiengang_kz' => $data['studiengang_kz'],
+			'semester' => $data['semester'],
+			'datum' => $data['datum'],
+			'datum_bis' => $data['datum_bis'],
+			'updateamum' => $now,
+			'updatevon' => $uid
+		]);
+
+		if (isError($newsResult))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
+		}
+
+		$existingTranslationsResult = $this->ContentspracheModel->loadWhere([
+			'content_id' => $existingNews->content_id
+		]);
+
+		if (isError($existingTranslationsResult))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($existingTranslationsResult), self::ERROR_TYPE_DB);
+		}
+
+		$existingTranslations = [];
+
+		foreach ((array)getData($existingTranslationsResult) as $existingTranslation)
+		{
+			$language = $existingTranslation->sprache;
+
+			if (
+				!isset($existingTranslations[$language])
+				|| (int)$existingTranslation->version > (int)$existingTranslations[$language]->version
+			)
+			{
+				$existingTranslations[$language] = $existingTranslation;
+			}
+		}
+
+		$submittedLanguages = array_column($data['translations'], 'sprache');
+		$this->db->where('content_id', $existingNews->content_id);
+		$this->db->where_not_in('sprache', $submittedLanguages);
+
+		if ($this->db->delete('campus.tbl_contentsprache') === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		foreach ($data['translations'] as $translation)
+		{
+			$translation['content'] = $this->formatContentURLsToRelative($translation['content']);
+			$translationData = [
+				'sichtbar' => $translation['sichtbar'],
+				'content' => $translation['content'],
+				'titel' => $translation['betreff'],
+				'updateamum' => $now,
+				'updatevon' => $uid
+			];
+
+			$existingTranslation = $existingTranslations[$translation['sprache']] ?? null;
+
+			if ($existingTranslation)
+			{
+				$translationResult = $this->ContentspracheModel->update(
+					$existingTranslation->contentsprache_id,
+					$translationData
+				);
+			}
+			else
+			{
+				$translationResult = $this->ContentspracheModel->insert([
+					'sprache' => $translation['sprache'],
+					'content_id' => $existingNews->content_id,
+					'version' => 1,
+					'insertamum' => $now,
+					'insertvon' => $uid
+				] + $translationData);
+			}
+
+			$this->_getInsertedIdOrRollback($translationResult);
+		}
+
+		if ($this->db->trans_status() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		if ($this->db->trans_commit() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess($newsId);
+	}
+
+	/**
+	 * Deletes one news entry and its linked content.
+	 *
+	 * @return void
+	 */
+	public function deleteNewsItem($newsId)
+	{
+		if (!is_numeric($newsId) || (int)$newsId < 1)
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'A valid news ID is required'
+			]);
+		}
+
+		$newsId = (int)$newsId;
+		$newsResult = $this->NewsModel->load($newsId);
+
+		if (isError($newsResult))
+		{
+			$this->terminateWithError(getError($newsResult), self::ERROR_TYPE_DB);
+		}
+
+		if (!hasData($newsResult))
+		{
+			$this->terminateWithValidationErrors([
+				'newsId' => 'The requested news entry does not exist'
+			]);
+		}
+
+		$news = current(getData($newsResult));
+
+	
+		$this->_ensureUserIsEntitledForDegreeProgram($news->studiengang_kz);
+
+		if ($this->db->trans_begin() === false)
+		{
+			$this->terminateWithError($this->db->error(), self::ERROR_TYPE_DB);
+		}
+
+		$newsDeleteResult = $this->NewsModel->delete($newsId);
+
+		if (isError($newsDeleteResult))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($newsDeleteResult), self::ERROR_TYPE_DB);
+		}
+
+		$this->db->where('content_id', $news->content_id);
+
+		if ($this->db->delete('campus.tbl_contentsprache') === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		$contentDeleteResult = $this->ContentModel->delete($news->content_id);
+
+		if (isError($contentDeleteResult))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($contentDeleteResult), self::ERROR_TYPE_DB);
+		}
+
+		if ($this->db->trans_status() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		if ($this->db->trans_commit() === false)
+		{
+			$error = $this->db->error();
+			$this->db->trans_rollback();
+			$this->terminateWithError($error, self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess($newsId);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Loads the requested Studiengang or reports a validation error.
+	 *
+	 * @param integer $studiengangKz
+	 * @return stdClass
+	 */
+	private function _getStudiengang($studiengangKz)
+	{
+		$result = $this->StudiengangModel->load($studiengangKz);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		if (!hasData($result))
+		{
+			$this->terminateWithValidationErrors([
+				'studiengang_kz' => 'The requested Studiengang does not exist'
+			]);
+		}
+
+		$studiengaenge = getData($result);
+
+		return current($studiengaenge);
+	}
+
+	/**
+	 * Ensures that all supplied languages exist in tbl_sprache.
+	 *
+	 * @param array $translations
+	 * @return void
+	 */
+	private function _validateLanguages($translations)
+	{
+		$languages = [];
+
+		foreach ($translations as $translation)
+		{
+			$languages[] = $translation['sprache'];
+		}
+
+		$result = $this->SpracheModel->loadMultiple($languages);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$existingLanguages = [];
+
+		foreach ((array)getData($result) as $language)
+		{
+			$existingLanguages[$language->sprache] = true;
+		}
+
+		$errors = [];
+
+		foreach ($translations as $index => $translation)
+		{
+			if (!isset($existingLanguages[$translation['sprache']]))
+			{
+				$errors['translations.' . $index . '.sprache'] = 'The requested language does not exist';
+			}
+		}
+
+		if (count($errors) > 0)
+		{
+			$this->terminateWithValidationErrors($errors);
+		}
+	}
+
+	private function _ensureUserIsEntitledForDegreeProgram($degreeProgramShortCode)
+	{
+		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news:w");
+		if (!is_array($entitledDegreePrograms))
+		{
+			$this->terminateWithError('Failed to retrieve entitled degree programs for the user', self::ERROR_TYPE_GENERAL);
+		}
+		
+		if (!in_array($degreeProgramShortCode, $entitledDegreePrograms)) {
+			$this->terminateWithError("User is not entitled for the specified degree program");
+		}
+	}
+	/**
+	 * Returns an inserted identifier or rolls the transaction back on error.
+	 *
+	 * @param stdClass $result
+	 * @return mixed
+	 */
+	private function _getInsertedIdOrRollback($result)
+	{
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		return getData($result);
+	}
+
+	/**
+	 * Builds the XML format consumed by existing news readers.
+	 *
+	 * @param array $translation
+	 * @return string
+	 */
+	private function _buildNewsXml($translation)
+	{
+		$document = new DOMDocument('1.0', 'UTF-8');
+		$news = $document->createElement('news');
+		$document->appendChild($news);
+
+		$this->_appendCdataElement($document, $news, 'verfasser', $translation['verfasser']);
+		$this->_appendCdataElement($document, $news, 'betreff', $translation['betreff']);
+		$this->_appendCdataElement($document, $news, 'text', $translation['text']);
+
+		return $document->saveXML($news);
+	}
+
+	/**
+	 * Appends a CDATA element and safely preserves CDATA terminators.
+	 *
+	 * @param DOMDocument $document
+	 * @param DOMElement $parent
+	 * @param string $name
+	 * @param string $value
+	 * @return void
+	 */
+	private function _appendCdataElement($document, $parent, $name, $value)
+	{
+		$element = $document->createElement($name);
+		$parts = explode(']]>', $value);
+		$lastIndex = count($parts) - 1;
+
+		foreach ($parts as $index => $part)
+		{
+			if ($index > 0)
+			{
+				$part = '>' . $part;
+			}
+
+			if ($index < $lastIndex)
+			{
+				$part .= ']]';
+			}
+
+			$element->appendChild($document->createCDATASection($part));
+		}
+
+		$parent->appendChild($element);
+	}
+    
+	private function _sendNewsItemTranslationRequiredMail($newsItem)
+	{
+		$translatorsResult = $this->BenutzerfunktionModel->getBenutzerFunktionen("translate", $newsItem->studiengang_kz);
+		$translators = $this->getDataOrTerminateWithError($translatorsResult);
+
+		$newsItemContentResult = $this->ContentspracheModel->loadWhere([
+			'content_id' => $newsItem->content_id,
+			'sprache' => 'German'
+		]);
+		$newsItemContentEntry = getData($newsItemContentResult)[0] ?? null;
+		if ($newsItemContentEntry) {
+			$newsItem->sichtbar = $newsItemContentEntry->sichtbar ?? false;
+			$newsItem->content = $newsItemContentEntry->content;
+		}
+		$content = getData(
+			$this->cmslib->createNewsContent(
+				$this->cmslib->createNewsWrapper($newsItem, true),
+				false,
+				""
+			)
+		);
+
+		foreach ($translators as $translator) {
+			sendSanchoMail(
+				"Sancho_Mail_News_Translation_Req",
+				[
+					"newsItemUrl" => APP_ROOT . "cis.php/CisVue/Cms/newsAdministration?newsId=" . $newsItem->news_id,
+					"newsItemAuthor" => $newsItem->verfasser,
+					"newsItemSubject" => $newsItem->betreff,
+					"newsItemContent" => $content
+				],
+				$translator->uid . "@" . DOMAIN,
+				"Übersetzung erforderlich / Translation required"
+			);
+		}
+	}
+
+	private function formatContentURLsToRelative($content)
+	{
+		$content = preg_replace(
+			'#https?://[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
+			'$1',
+			$content
+		);
+
+		$content = preg_replace(
+			'#(?:\.\./)+[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
+			'$1',
+			$content
+		);
+
+		$content = preg_replace(
+			'#/[^"\'>\s]*/(dms\.php(?:\?[^"\'>\s]*)?)#i',
+			'$1',
+			$content
+		);
+
+		return $content;
+	}
+}

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

@@ -25,7 +25,19 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Ort extends FHCAPI_Controller
 {
-	
+	// advanced filters of getRooms: tbl_ort column => filter type, the same list as in Raumsuche.js.
+	// text: contains, case-insensitive; select: equals; range: <column>_min, <column>_max; flag: true; exists: not null
+	const ADVANCED_FILTERS = [
+		'ort_kurzbz' => 'text',
+		'bezeichnung' => 'text',
+		'planbezeichnung' => 'text',
+		'stockwerk' => 'range',
+		'gebteil' => 'select',
+		'm2' => 'range',
+		'lehre' => 'flag',
+		'content_id' => 'exists'
+	];
+
 	/**
 	 * Object initialization
 	 */
@@ -36,7 +48,10 @@ class Ort extends FHCAPI_Controller
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
 			'getRooms' => self::PERM_LOGGED,
-			'getTypes' => self::PERM_LOGGED
+			'getTypes' => self::PERM_LOGGED,
+			'getRoomInfo' => self::PERM_LOGGED,
+			'getStandorte' => self::PERM_LOGGED,
+			'getAdvancedFilterOptions' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
@@ -56,6 +71,17 @@ class Ort extends FHCAPI_Controller
 		$this->form_validation->set_rules('datum','Datum','required');
 		$this->form_validation->set_rules('von','Uhrzeit Von','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
 		$this->form_validation->set_rules('bis','Uhrzeit Bis','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		$this->form_validation->set_rules('standort_id','Standort','regex_match[/^([0-9]+|none)$/]');
+		foreach (self::ADVANCED_FILTERS as $column => $type) {
+			if ($type == 'range') {
+				$this->form_validation->set_rules($column.'_min', $column, 'numeric');
+				$this->form_validation->set_rules($column.'_max', $column, 'numeric');
+			} elseif ($type == 'flag' || $type == 'exists') {
+				$this->form_validation->set_rules($column, $column, 'in_list[true]');
+			} else {
+				$this->form_validation->set_rules($column, $column, 'max_length[255]');
+			}
+		}
 		if($this->form_validation->run() == FALSE) {
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
@@ -65,6 +91,7 @@ class Ort extends FHCAPI_Controller
 		$bis = $this->input->get('bis', TRUE);
 		$typ = $this->input->get('typ', TRUE);
 		$personenanzahl = $this->input->get('personenanzahl', TRUE);
+		$standort_id = $this->input->get('standort_id', TRUE);
 		
 		
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
@@ -74,22 +101,36 @@ class Ort extends FHCAPI_Controller
 		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
 		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
 		
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+
 		$params = array();
-		$qry = "SELECT DISTINCT tbl_ort.*
+		$qry = "SELECT DISTINCT tbl_ort.*, tbl_standort.bezeichnung AS standort
 			FROM public.tbl_ort JOIN public.tbl_ortraumtyp USING(ort_kurzbz)
-			WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%'";
+			LEFT JOIN public.tbl_standort USING(standort_id)
+			WHERE aktiv AND reservieren";
 		if($typ) {
 			$params[] = $typ;
-			$qry.= "AND raumtyp_kurzbz = ?";
+			$qry.= " AND raumtyp_kurzbz = ?";
 		}
 		
+		if($standort_id === 'none') { // rooms without a Standort
+			$qry.= " AND standort_id IS NULL";
+		} elseif($standort_id) {
+			$params[] = $standort_id;
+			$qry.= " AND standort_id = ?";
+		} else {
+			$qry.= " AND standort_id IS NOT NULL";
+		}
+
+		$qry.= $this->advancedFilterSql($params);
+
 		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
 			$qry.= ' AND raumtyp_kurzbz IN ?';
 			$params[] = $this->config->item('roomtypes_student');
 			$this->addMeta('config', $this->config->item('roomtypes_student'));
 		}
 		
-		$qry.= "AND (max_person>= ? OR max_person is null)";
+		$qry.= " AND (max_person>= ? OR max_person is null)";
 		$params[] = $personenanzahl;
 
 		$qry.="	AND ort_kurzbz NOT IN 
@@ -127,6 +168,41 @@ class Ort extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result));
 	}
 	
+	/**
+	 * Standorte of the rooms that pass the base filter of getRooms
+	 */
+	public function getStandorte()
+	{
+		$qry = "SELECT DISTINCT standort_id, tbl_standort.bezeichnung
+			FROM public.tbl_ort JOIN public.tbl_standort USING(standort_id)
+			WHERE aktiv AND reservieren
+			ORDER BY tbl_standort.bezeichnung";
+
+		$result = $this->OrtModel->execReadOnlyQuery($qry);
+
+		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+	}
+
+	/**
+	 * Values of the select filters: column => distinct values of the rooms that pass the base filter of getRooms
+	 */
+	public function getAdvancedFilterOptions()
+	{
+		$options = [];
+		foreach (self::ADVANCED_FILTERS as $column => $type) {
+			if ($type != 'select')
+				continue;
+
+			$result = $this->OrtModel->execReadOnlyQuery("SELECT DISTINCT ".$column." AS value
+				FROM public.tbl_ort
+				WHERE aktiv AND reservieren AND ".$column." <> ''
+				ORDER BY ".$column);
+			$options[$column] = array_column($this->getDataOrTerminateWithError($result), 'value');
+		}
+
+		$this->terminateWithSuccess($options);
+	}
+
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
@@ -174,5 +250,60 @@ class Ort extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($content);
 	}
+
+	public function getRoomInfo()
+	{
+		$ortKurzbz = $this->input->get("ortKurzbz");
+
+		$roomResult = $this->OrtModel->getRoomInfo($ortKurzbz);
+		$roomData = $this->getDataOrTerminateWithError($roomResult);
+		$room = count($roomData) ? $roomData[0] : null;
+		
+		$this->terminateWithSuccess($room);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * SQL conditions of the advanced filters in the GET parameters, adds their values to $params
+	 */
+	private function advancedFilterSql(&$params)
+	{
+		// no xss_clean: the values are bound, and it could change a select value so that it no longer equals the column
+		$sql = '';
+		foreach (self::ADVANCED_FILTERS as $column => $type) {
+			if ($type == 'range') {
+				$min = $this->input->get($column.'_min');
+				$max = $this->input->get($column.'_max');
+				if ($min !== null && $min !== '') {
+					$sql.= " AND tbl_ort.".$column." >= ?::numeric";
+					$params[] = $min;
+				}
+				if ($max !== null && $max !== '') {
+					$sql.= " AND tbl_ort.".$column." <= ?::numeric";
+					$params[] = $max;
+				}
+				continue;
+			}
+
+			$value = $this->input->get($column);
+			if ($value === null || $value === '')
+				continue;
+
+			if ($type == 'flag') {
+				$sql.= " AND tbl_ort.".$column;
+			} elseif ($type == 'exists') {
+				$sql.= " AND tbl_ort.".$column." IS NOT NULL";
+			} elseif ($type == 'select') {
+				$sql.= " AND tbl_ort.".$column." = ?";
+				$params[] = $value;
+			} else {
+				$sql.= " AND strpos(lower(tbl_ort.".$column."), lower(?)) > 0";
+				$params[] = $value;
+			}
+		}
+		return $sql;
+	}
 }
 

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2024 fhcomplete.org
+ * Copyright (C) 2026 fhcomplete.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Permission extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getPermissions' => self::PERM_LOGGED,
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * retrieves permissions for auth user
+	 * @access public
+	 */
+	public function getPermissions()
+	{
+		$permissionsParam = $this->input->post("permissions");
+		if (!$permissionsParam || !is_array($permissionsParam)) {
+			$this->terminateWithError("Invalid parameter!");
+		}
+
+		$permissions = [];
+		foreach ($permissionsParam as $permission) {
+			$permissions[$permission] = $this->permissionlib->isBerechtigt($permission);
+		}
+
+		$this->terminateWithSuccess($permissions);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+}
+

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,26 +66,6 @@ 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/Reservierung.php

@@ -0,0 +1,67 @@
+<?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 Reservierung extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getMyReservation' => 'basis/cis:r',
+			'deleteReservation' => 'lehre/reservierung:rw'
+		]);
+
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+	}
+
+	/**
+	 * Retrieves all reservations from lehre.vw_reservation of the logged in user
+	 */
+	public function getMyReservation()
+	{
+		$result = $this->ReservierungModel->getMyReservation();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * deletes a reservation by ID
+	 */
+	public function deleteReservation()
+	{
+		$reservierung_id = $this->input->post('reservierung_id');
+
+
+		if ($reservierung_id === NULL || trim((string)$reservierung_id) === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		
+		$result = $this->ReservierungModel->deleteReservation($reservierung_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
+

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

@@ -27,7 +27,7 @@ class Studgang extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getStudiengangInfo'=> self::PERM_LOGGED,
-
+			'getDegreePrograms'=> self::PERM_LOGGED,
 		]);
 
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -43,15 +43,46 @@ class Studgang extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	public function getStudiengangInfo(){
-		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
-		$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-		if($isMitarbeiter) {
-			$this->terminateWithSuccess(null);
+	public function getDegreePrograms() {
+		$entitledDegreePrograms = $this->permissionlib->getSTG_isEntitledFor("basis/news");
+		if (!$entitledDegreePrograms) {
+			$this->terminateWithError("User is not entitled for any degree program");
 		}
-		
+
+		$activeDegreePrograms = $this->StudiengangModel->getDegreePrograms();
+		$activeDegreePrograms= $this->getDataOrTerminateWithError($activeDegreePrograms);
+
+		$activeDegreePrograms = array_values(array_filter($activeDegreePrograms, function($degreeProgram) use ($entitledDegreePrograms) {
+			return in_array($degreeProgram->studiengang_kz, $entitledDegreePrograms);
+		}));
+
+		$this->terminateWithSuccess($activeDegreePrograms);
+	}
+
+	public function getStudiengangInfo(){
+		$studiengang_kz = $this->input->get('studiengang_kz', true);
+		$semester = $this->input->get('semester', true);
+
+		// without a Studiengang the info of the logged in Student is returned
+		if (!is_numeric($studiengang_kz))
+		{
+			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
+			if($isMitarbeiter) {
+				$this->terminateWithSuccess(null);
+			}
+
+			$studiengang_kz = null;
+			$semester = null;
+		}
+		else
+		{
+			$studiengang_kz = (int)$studiengang_kz;
+			$semester = is_numeric($semester) ? (int)$semester : null;
+		}
+
 		// fetches the Studiengang Information which is used next to the news
-		$studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews();
+		$studiengangInfo = $this->StudiengangModel->getStudiengangInfoForNews($studiengang_kz, $semester);
 		$studiengangInfo= $this->getDataOrTerminateWithError($studiengangInfo);
 		$this->terminateWithSuccess($studiengangInfo);
 	}

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

@@ -0,0 +1,67 @@
+<?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/StudstatusAntraege.php

@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StudstatusAntraege extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getTodos' => self::PERM_LOGGED
+		]);
+
+		//load models
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * gets all todos of antraegen of the user with stg leitungsfunction
+	 * or list of open antraege for user with assistance function
+	 * @access public
+	 * @return array || []
+	 */
+	public function getTodos()
+	{
+		$uid = getAuthUID();
+
+		//at first get studiengang with leitungsfunktion
+		$result = $this->BenutzerfunktionModel->getSTGLByUID($uid);
+
+		if(hasData($result))
+		{
+			$funktionen = getData($result);
+
+			$studiengaenge = [];
+
+			foreach ($funktionen as $funktion) {
+				$studiengaenge[] = $funktion->studiengang_kz;
+			}
+
+			$dataAntrage = [];
+
+			$result = $this->StudierendenantragModel->getOpenAntraegeForStgl($studiengaenge);
+
+			if (isError($result)) {
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$dataAntrage[] = getData($result) ?: [];
+			$statusRole = 1;
+
+			$this->terminateWithSuccess([count($dataAntrage) > 0 ? $dataAntrage[0] : $dataAntrage, $statusRole]);
+
+		}
+
+		//TODO delete after check if needed or not
+		//get studiengaenge of assistance (regarding benutzerfunktion)
+		//$result = $this->BenutzerfunktionModel->getSTGAssByUID($uid);
+		/*		if(hasData($result)) {
+			$statusRole = 2;
+			$funktionen = getData($result);
+
+			$studiengaenge = [];
+
+			foreach ($funktionen as $funktion) {
+				$studiengaenge[] = $funktion->studiengang_kz;
+			}
+
+			$ci->addMeta('stgAss', $studiengaenge);
+			$dataAntrage = [];
+
+			foreach ($studiengaenge as $studiengang)
+			{
+				$result = $this->StudierendenantragModel->getOpenAntraegeForAss($studiengang);
+
+				if (isError($result)) {
+					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				if(hasData($result)) {
+					$dataAntrage[] = getData($result);
+					$statusRole = 2;
+				}
+			}
+		}
+		else
+		{
+			$statusRole = 0;
+			$dataAntrage = [];
+			//$this->terminateWithSuccess([[], $statusRole]);
+		}*/
+
+		//get studiengaenge of assistance (regarding rights)
+		$stgAss = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+		if(!is_array($stgAss))
+		{
+			$statusRole = 0;
+			$this->terminateWithSuccess([[], $statusRole]);
+		}
+		else {
+			$statusRole = 2;
+			$studiengaenge = [];
+
+			foreach ($stgAss as $stg) {
+				$studiengaenge[] = (int) $stg;
+			}
+
+			$dataAntrage = [];
+			$result = $this->StudierendenantragModel->getOpenAntraegeForAss($studiengaenge);
+
+			if (isError($result)) {
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			if(hasData($result)) {
+				$dataAntrage[] = getData($result);
+				$statusRole = 2;
+			}
+
+			$this->terminateWithSuccess([count($dataAntrage) > 0 ? $dataAntrage[0] : $dataAntrage, $statusRole]);
+
+		}
+	}
+}

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

@@ -0,0 +1,469 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Zeitsperren extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getZeitsperrenUser' => ['cis/eigene_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'getTypenZeitsperren' => self::PERM_LOGGED,
+			'getTypenErreichbarkeit' => self::PERM_LOGGED,
+			'getStunden' => self::PERM_LOGGED,
+			'loadZeitsperre' => ['cis/eigene_zeitsperren:r', 'admin:r', 'assistenz:r'],
+			'add' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
+			'update' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
+			'delete' => ['cis/eigene_zeitsperren:rw', 'admin:rw', 'assistenz:rw'],
+		]);
+
+		// 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()
+	{
+		$excludedTypes = array('ZVerfueg');
+		$result = $this->ZeitsperretypModel->getTypenZeitsperren($excludedTypes);
+		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);
+
+		if($zeitsperretyp_kurzbz == 'ZA')
+		{
+			$this->sendSanchoMailToVorgesetzten(
+				'Sancho_Content_Zeitausgleich',
+				array(
+					'beschreibung' =>$zeitsperretyp_kurzbz,
+					'vonDatum' => (new DateTime($vondatum))->format('d.m.Y'),
+					'bisDatum' => (new DateTime($bisdatum))->format('d.m.Y'),
+					'Saldo'=> ''
+				), 
+				$this->p->t('zeitsperren', 'zeitausgleichNeu'),
+				$mitarbeiter_uid
+			);
+		}
+
+		$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 = (array) $this->getDataOrTerminateWithError($result);
+
+			$data = array_filter($data, function($zeitsperre) use ($zeitsperre_id) {
+				return $zeitsperre->zeitsperre_id != $zeitsperre_id;
+			});
+
+			if(count($data) > 0)
+			{
+				$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);
+
+			if($zeitsperretyp_kurzbz == 'ZA')
+			{
+				$this->sendSanchoMailToVorgesetzten(
+					'Sancho_Content_ZA_Aendern',
+					array(
+						'beschreibung' =>$zeitsperretyp_kurzbz,
+						'vonDatum' => (new DateTime($vondatum))->format('d.m.Y'),
+						'bisDatum' => (new DateTime($bisdatum))->format('d.m.Y'),
+						'Saldo'=> ''
+					), 
+					$this->p->t('zeitsperren', 'zeitausgleichGeaendert'),
+					$mitarbeiter_uid
+				);
+			}
+
+			$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);
+		$zeitsperre = (is_array($data) && count($data) > 0) ? current($data) : null;
+		$uid = (!is_null($zeitsperre)) ? $zeitsperre->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);
+		}
+
+		if($zeitsperre->zeitsperretyp_kurzbz == 'ZA')
+		{
+			$res = $this->sendSanchoMailToVorgesetzten(
+				'Sancho_Mail_ZA_loeschen',
+				array(
+					'beschreibung' =>$zeitsperre->zeitsperretyp_kurzbz,
+					'vonDatum' => (new DateTime($zeitsperre->vondatum))->format('d.m.Y'),
+					'bisDatum' => (new DateTime($zeitsperre->bisdatum))->format('d.m.Y')
+				),
+				$this->p->t('zeitsperren', 'zeitausgleichGeloescht'),
+				$zeitsperre->mitarbeiter_uid
+			);
+		}
+
+		$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;
+	}
+
+	protected function sendSanchoMailToVorgesetzten($sancho_vorlage_kurzbz,
+		$sancho_vorlage_data, $subject, $mauid)
+	{
+		$this->load->helper('hlp_sancho_helper');
+
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$fullname = getData($this->PersonModel->getFullName($mauid));
+		$vorgesetzte = (array) getData($this->MitarbeiterModel->getVorgesetzte($mauid));
+
+		$to = array();
+		$vorgesetzte_namen = array();
+		$mailsent = false;
+		$msg = $this->p->t('zeitsperren', 'konnteKeinFreigabemailVersendetWerden');
+
+		if(count($vorgesetzte) > 0)
+		{
+			foreach($vorgesetzte as $vg)
+			{
+				$to[] = $vg->vorgesetzter .'@' . DOMAIN;
+				$vorgesetzter_fullname = getData($this->PersonModel->getFullName($vg->vorgesetzter));
+				$vorgesetzte_namen[] = $vorgesetzter_fullname;
+			}
+
+			$sancho_vorlage_data['vorgesetzter'] = implode(', ', $vorgesetzte_namen);
+			$sancho_vorlage_data['nameMitarbeiter'] = $fullname;
+
+			$mailsent = sendSanchoMail(
+				$sancho_vorlage_kurzbz,
+				$sancho_vorlage_data,
+				implode(',', $to),
+				$subject
+			);
+
+			if($mailsent)
+			{
+				$msg = $this->p->t('zeitsperren', 'VorgesetzteInformiert', 
+					array('vorgesetzte' => $sancho_vorlage_data['vorgesetzter']));
+			}
+			else
+			{
+				$msg = $this->p->t('zeitsperren', 'fehlerBeimSendenAufgetreten', 
+					array('vorgesetzte' => $sancho_vorlage_data['vorgesetzter']));
+			}
+		}
+
+		$res = (object) array(
+			'mailsent' => $mailsent,
+			'msg' => $msg
+		);
+		$this->addMeta('mailstatus', $res);
+	}
+}

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

@@ -0,0 +1,276 @@
+<?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,
+			'getGroupOptions' => 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) : []));
+	}
+
+	public function getGroupOptions()
+	{
+		$studiengangKz = $this->input->get('studiengangKz');
+
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->LehrverbandModel->addSelect('semester, verband, gruppe');
+		$this->LehrverbandModel->db->where('aktiv', true);
+		$this->LehrverbandModel->db->where('studiengang_kz', $studiengangKz);
+		$lehrverbandResult = $this->LehrverbandModel->load();
+
+		if (isError($lehrverbandResult))
+			$this->terminateWithError($lehrverbandResult);
+
+		$lehrverbanden = hasData($lehrverbandResult) ? getData($lehrverbandResult) : [];
+
+		$grouppedValues = [];
+		foreach ($lehrverbanden as $lehrverband) {
+			if (isset($grouppedValues[$lehrverband->semester]) && $lehrverband->verband !== ' ') {
+				$grouppedValues[$lehrverband->semester][] = $lehrverband;
+			} else if (!isset($grouppedValues[$lehrverband->semester]) && $lehrverband->verband !== ' ') {
+				$grouppedValues[$lehrverband->semester] = [$lehrverband];
+			} else if (!isset($grouppedValues[$lehrverband->semester])) {
+				$grouppedValues[$lehrverband->semester] = [];
+			}
+		}
+		$grouppedValues = array_map(
+			function ($semester) {
+				$verbandGruppen = [];
+				foreach ($semester as $lehrverband) {
+					if (isset($verbandGruppen[$lehrverband->verband]) && $lehrverband->gruppe !== ' ') {
+						$verbandGruppen[$lehrverband->verband][] = $lehrverband->gruppe;
+					} else if (!isset($verbandGruppen[$lehrverband->verband]) && $lehrverband->gruppe !== ' ') {
+						$verbandGruppen[$lehrverband->verband] = [$lehrverband->gruppe];
+					} else if (!isset($verbandGruppen[$lehrverband->verband])) {
+						$verbandGruppen[$lehrverband->verband] = [];
+					}
+				}
+				return $verbandGruppen;
+			},
+			$grouppedValues
+		);
+
+		$this->terminateWithSuccess($grouppedValues);
+	}
+
+}

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

@@ -0,0 +1,218 @@
+<?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/funktionen/Funktionen.php

@@ -12,9 +12,9 @@ class Funktionen extends FHCAPI_Controller
 		parent::__construct(array(
 				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
 				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getOrgHeads' =>  ['admin:r', 'assistenz:r'],
-				'getOrgetsForCompany' => ['admin:r', 'assistenz:r'],
-				'getAllOrgUnits' => ['admin:r', 'assistenz:r'],
+				'getOrgHeads' =>  self::PERM_LOGGED,
+				'getOrgetsForCompany' => self::PERM_LOGGED,
+				'getAllOrgUnits' => self::PERM_LOGGED,
 				'loadFunction' => ['admin:r', 'assistenz:r'],
 				'insertFunction' => ['admin:rw', 'assistenz:rw'],
 				'updateFunction' => ['admin:rw', 'assistenz:rw'],

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

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Betreuungen extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getBetreuungen' => self::PERM_LOGGED,
+		]);
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getBetreuungen()
+	{
+		$semester = $this->input->get("semester");
+		if (!$semester) $this->terminateWithError("Missing parameters!");
+
+		$personId = getAuthPersonId();
+
+		$betreuungenQuery = "SELECT
+			tbl_lehrveranstaltung.bezeichnung,
+			tbl_projektarbeit.titel,
+			(SELECT nachname || ' ' || (CASE WHEN wahlname IS NOT NULL THEN wahlname ELSE vorname END)
+				FROM public.tbl_benutzer
+				JOIN public.tbl_person USING(person_id)
+				WHERE uid=student_uid)
+				as name,
+			(SELECT uid
+				FROM public.tbl_benutzer
+				WHERE uid=student_uid)
+				as uid,
+			tbl_lehrveranstaltung.studiengang_kz,
+			tbl_lehrveranstaltung.semester,
+			tbl_studiengang.kurzbzlang as studiengang,
+			tbl_studiengang.email,
+			tbl_betreuerart.beschreibung AS beutreuerart_beschreibung,
+			tbl_projektbetreuer.stunden
+			FROM
+				lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
+			WHERE
+				tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_projektarbeit.lehrveranstaltung_id AND
+				tbl_projektarbeit.studiensemester_kurzbz = '$semester' AND
+				tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id AND
+				tbl_lehrveranstaltung.studiengang_kz = tbl_studiengang.studiengang_kz AND
+				tbl_projektbetreuer.betreuerart_kurzbz = tbl_betreuerart.betreuerart_kurzbz AND
+				tbl_projektbetreuer.person_id = '$personId'";
+		$this->addMeta("query", $betreuungenQuery);
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->execReadOnlyQuery($betreuungenQuery);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+}

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

@@ -184,17 +184,54 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+		$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();
 
 		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);
+		$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_array = array();
 

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

@@ -19,7 +19,8 @@ class Lehreinheit extends FHCAPI_Controller
 			'getLehrfach' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
-			'getLehrform' => ['admin:r', 'assistenz:r']
+			'getLehrform' => ['admin:r', 'assistenz:r'],
+			'getLehreinheitenBySemester' => self::PERM_LOGGED,
 		]);
 
 		$this->_ci = &get_instance();
@@ -438,6 +439,27 @@ class Lehreinheit extends FHCAPI_Controller
 		$this->terminateWithSuccess($this->p->t('global', 'gespeichert'));
 	}
 
+	public function getLehreinheitenBySemester()
+	{
+		$semester = $this->input->get('semester');
+		$lehreinheiten = $this->LehreinheitModel->getLehrenheitenBySemester(getAuthUID(), $semester);
+		$lehreinheiten = $this->getDataOrTerminateWithError($lehreinheiten);
+
+		foreach ($lehreinheiten as $lehreinheit) {
+			$groups = $this->LehreinheitModel->getGroupsByLehreinheit($lehreinheit->lehreinheit_id);
+			$groups = $this->getDataOrTerminateWithError($groups);
+			$stgKurzbz = $lehreinheit->stg_kurzbz;
+			$lehreinheit->groups = array_map(
+				function ($group) use ($stgKurzbz) {
+					return $group->gruppe_kurzbz ?? $stgKurzbz . "-" . $group->semester . $group->verband . $group->gruppe;
+				},
+				$groups
+			);
+		}
+
+		$this->terminateWithSuccess($lehreinheiten);
+	}
+
 
 	private function checkPermission($lehreinheit_id)
 	{

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

@@ -41,6 +41,9 @@ class Grades extends FHCAPI_Controller
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PruefungsverlaufLib', null, 'VerlaufLib');
+
+		$this->load->config('noten');
 
 		// Load Phrases
 		$this->loadPhrases([
@@ -355,23 +358,24 @@ class Grades extends FHCAPI_Controller
 			$data['lehrveranstaltung_id'] = $lehrveranstaltung_id;
 			$data['student_uid'] = $student_uid;
 			$data['studiensemester_kurzbz'] = $studiensemester_kurzbz;
-			
-			$this->ZeugnisnoteModel->insert($data);
 
-			if (defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN')
-				&& FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN) {
-				$result = $this->addTestsForGrade(
-					$studiensemester_kurzbz,
-					$student_uid,
-					$lehrveranstaltung_id,
-					$teacherGrade->note,
-					$teacherGrade->punkte
-				);
-				$this->getDataOrTerminateWithError($result);
-			}
+			$this->ZeugnisnoteModel->insert($data);
+		}
+
+		// Der erste Antritt wird bereits bei der Übernahme als eigene Prüfung angelegt, damit der
+		// Prüfungsverlauf von Anfang an vollständig ist und das Benotungstool ihn nicht erst beim
+		// Anlegen einer Wiederholung nachtragen muss. Läuft bewusst in BEIDEN Zweigen (auch beim
+		// Überschreiben einer bestehenden Zeugnisnote) und ist idempotent.
+		if ($this->config->item('CIS_GESAMTNOTE_ERSTANTRITT_BEI_UEBERNAHME')) {
+			$result = $this->addErstantrittForGrade(
+				$studiensemester_kurzbz,
+				$student_uid,
+				$lehrveranstaltung_id,
+				$teacherGrade
+			);
+			$this->getDataOrTerminateWithError($result);
 		}
 
-		
 		$this->terminateWithSuccess(true);
 	}
 
@@ -491,20 +495,32 @@ class Grades extends FHCAPI_Controller
 	}
 
 	/**
-	 * Helper function that adds tests for a student
-	 * (Entries in lehre.tbl_pruefung)
+	 * Legt bei der Notenübernahme den ersten Prüfungsantritt als eigenen Datensatz an
+	 * (Eintrag in lehre.tbl_pruefung).
 	 *
-	 * @param string				$studiensemester_kurzbz
-	 * @param string				$student_uid
-	 * @param integer				$lehrveranstaltung_id
-	 * @param integer				$note
-	 * @param numeric				$punkte
+	 * Idempotent: existiert für den Studenten in dieser LV bereits ein Termin, passiert nichts -
+	 * die Übernahme darf beliebig oft laufen, ohne den Verlauf zu verfälschen.
+	 *
+	 * Datiert auf das Freigabedatum der LV-Note: das ist der Zeitpunkt, zu dem die
+	 * Leistungsfeststellung verbindlich wurde. Das Benotungsdatum ändert sich bei jeder Korrektur,
+	 * der Übernahmezeitpunkt ist reine Verwaltungsarbeit - beide taugen nicht als Termindatum.
+	 *
+	 * @param string   $studiensemester_kurzbz
+	 * @param string   $student_uid
+	 * @param integer  $lehrveranstaltung_id
+	 * @param stdClass $teacherGrade  die übernommene LV-Gesamtnote
 	 *
 	 * @return stdClass
 	 */
-	protected function addTestsForGrade($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $note, $punkte)
+	protected function addErstantrittForGrade($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id, $teacherGrade)
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/LePruefung_model', 'LePruefungModel');
+
+		// bereits ein Termin vorhanden -> der Verlauf beginnt schon, nichts nachzutragen
+		$vorhanden = $this->VerlaufLib->getPruefungen($student_uid, $lehrveranstaltung_id, $studiensemester_kurzbz);
+		if (count($vorhanden) > 0)
+			return success(null);
 
 		// Get Lehreinheit
 		$result = $this->LehrveranstaltungModel->getLeByStudent($student_uid, $studiensemester_kurzbz, $lehrveranstaltung_id);
@@ -515,19 +531,24 @@ class Grades extends FHCAPI_Controller
 			return error($this->p->t("stv", "grades_error_lehreinheit_id"));
 		$le = current(getData($result));
 
+		$datum = $teacherGrade->freigabedatum ?: ($teacherGrade->benotungsdatum ?: date('Y-m-d'));
+		$now = date('Y-m-d H:i:s');
+
 		// Prepare
-		$this->load->model('education/LePruefung_model', 'LePruefungModel');
 		$data = [
 			"student_uid" => $student_uid,
 			"lehreinheit_id" => $le->lehreinheit_id,
-			"datum" => date('Y-m-d'),
-			"pruefungstyp_kurzbz" => "Termin1",
-			"note" => $note
+			"mitarbeiter_uid" => $teacherGrade->mitarbeiter_uid,
+			"datum" => $datum,
+			"pruefungstyp_kurzbz" => $this->VerlaufLib->legacyTypFuerAntritt(1),
+			"note" => $teacherGrade->note,
+			"insertamum" => $now,
+			"insertvon" => getAuthUID()
 		];
 
 		if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
-			$data["punkte"] = $punkte;
-		
+			$data["punkte"] = $teacherGrade->punkte;
+
 		// Get Anwesenheit
 		$this->load->model('education/Anwesenheit_model', 'AnwesenheitModel');
 		$result = $this->AnwesenheitModel->loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid, $lehrveranstaltung_id);
@@ -535,7 +556,8 @@ class Grades extends FHCAPI_Controller
 			return $result;
 		$anwesenheit = getData($result);
 
-		if ($anwesenheit && (float)current($anwesenheit)->prozent < FAS_ANWESENHEIT_ROT) {
+		if (defined('FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN') && FAS_PRUEFUNG_BEI_NOTENEINGABE_ANLEGEN
+			&& $anwesenheit && (float)current($anwesenheit)->prozent < FAS_ANWESENHEIT_ROT) {
 			// Get Anwesenheitsbefreiung
 			$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 			$result = $this->BenutzerfunktionModel->getBenutzerFunktionByUidInStdsem($student_uid, $studiensemester_kurzbz, 'awbefreit');
@@ -545,7 +567,10 @@ class Grades extends FHCAPI_Controller
 
 			$anwesenheitsbefreit = hasData($result);
 
-			// Wenn nicht Anwesenheitsbefreit und Anwesenheit unter einem bestimmten Prozentsatz fällt dann wird ein Pruefungsantritt abgezogen
+			// Bei zu geringer Anwesenheit ohne Befreiung wird ein zusätzlicher Termin
+			// 'Nicht beurteilt' vor dem eigentlichen Antritt festgehalten. ACHTUNG: diese Note
+			// zählt nicht mehr als Antritt (NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN) - der frühere
+			// "Antritt abziehen"-Effekt entfällt damit, der Eintrag ist reine Dokumentation.
 			if (!$anwesenheitsbefreit) {
 				$data2 = $data;
 				$data2["note"] = 7;
@@ -556,8 +581,6 @@ class Grades extends FHCAPI_Controller
 
 				if (isError($result))
 					return $result;
-
-				$data["pruefungstyp_kurzbz"] = "Termin2";
 			}
 		}
 

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

@@ -574,6 +574,19 @@ class Kontakt extends FHCAPI_Controller
 		$person_id = $this->input->post('person_id');
 		$standort_id = $this->input->post('standort_id');
 
+		//check person_id: allow editing only of persons who are no mitarbeiter
+		if($person_id)
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$this->BenutzerModel->addJoin('public.tbl_mitarbeiter ma', 'ON (ma.mitarbeiter_uid = public.tbl_benutzer.uid)');
+
+			$result = $this->BenutzerModel->loadWhere([
+				'person_id' => $person_id
+			]);
+			if(hasData($result))
+				return $this->terminateWithError($this->p->t('ui', 'editingMitarbeiterPVonly'), self::ERROR_TYPE_GENERAL);
+		}
+
 		$result = $this->KontaktModel->update(
 			[
 				'kontakt_id' => $kontakt_id

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

@@ -1,168 +0,0 @@
-<?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:rw', 'lehre/lvplan:rw'],
-			'getHeader' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'set' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'updateCollision' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-		]);
-
-		// 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 = [];
-
-		$var_array = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-			'room_planning',
-		);
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), $var_array);
-
-		$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'
-		];
-
-		$config['ignore_resources_collisions'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_resources_collisions'),
-			"value" => ($data['ignore_resources_collisions'] ?? 'false') === 'true'
-		];
-
-		$config['roomless_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'roomless_planning'),
-			"value" => ($data['roomless_planning'] ?? 'false') === 'true'
-		];
-
-		$config['room_planning'] = [
-			"type"  => "select",
-			"label" => $this->p->t('ui', 'room_planning'),
-			"value" => $data['room_planning'] ?? "dialog_room_planning",
-			"options" => [
-				'dialog_room_planning' => $this->p->t('ui', 'dialog_room_planning'),
-				'priority_room_planning' => $this->p->t('ui', 'priority_room_planning'),
-			],
-		];
-
-		$this->terminateWithSuccess($config);
-	}
-	public function getHeader()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
-		$this->_ci->KalenderStatusModel->addOrder('sort');
-		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
-		$visible_status = $this->_ci->KalenderStatusModel->load();
-
-		$visible_status = getData($visible_status);
-
-		$config['visible_status']['all'] = 'Alle';
-
-		foreach ($visible_status as $status)
-		{
-			$config['visible_status'][$status->status_kurzbz] = $status->status;
-		}
-
-		$this->terminateWithSuccess($config);
-	}
-
-	public function set()
-	{
-		$this->_ci->load->library('form_validation');
-
-		$configs = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-		);
-
-		$this->form_validation->set_rules(
-			'room_planning',
-			$this->p->t('ui', 'room_planning'),
-			'required|in_list[dialog_room_planning,priority_room_planning]'
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-
-		foreach ($configs as $config)
-		{
-			$this->_ci->VariableModel->setVariable(
-				getAuthUID(),
-				$config,
-				$this->input->post($config) === true ? 'true' : 'false'
-			);
-		}
-
-		$this->VariableModel->setVariable(
-			getAuthUID(),
-			'room_planning',
-			$this->input->post('room_planning')
-		);
-
-		$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

@@ -1,276 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_COURSE_FILTER = ['uid', 'stg'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getCourses' => 'lehre/lvplan:rw',
-		]);
-
-		$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 getCourses()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$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->post('studiensemester_kurzbz', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_COURSE_FILTER);
-
-		$this->_getBasePlan($studiensemester_kurzbz);
-
-		$this->_ci->LehreinheitModel->db->group_start();
-		if (isset($filter->stg))
-			$this->_addStgWhere($filter->stg);
-
-		if (isset($filter->uid))
-		{
-			$uid_array = (array) $filter->uid;
-			$this->_ci->LehreinheitModel->db->or_where_in('tbl_benutzer.uid', $uid_array);
-		}
-
-		$this->_ci->LehreinheitModel->db->group_end();
-
-		$this->_ci->LehreinheitModel->addOrder('lehreinheit_id');
-		$result = $this->_ci->LehreinheitModel->load();
-		$result = hasData($result) ? getData($result) : array();
-		$this->terminateWithSuccess($this->_mapEvents($result));
-	}
-
-	private function _getBasePlan($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();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehrform.verplanen', true);
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
-		$this->_ci->LehreinheitModel->db->group_end();
-
-	}
-
-	private function _addStgWhere($studiengaenge)
-	{
-		$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['stg_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();
-	}
-
-	private function _mapEvents($result)
-	{
-		$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);
-		}
-		return array_values($grouped);
-	}
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($values) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = false;
-		$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;
-	}
-
-
-}

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

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Favorites extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => 'lehre/lvplan:rw',
-			'set' => 'lehre/lvplan:rw'
-		]);
-
-		// 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

@@ -1,37 +0,0 @@
-<?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' => 'lehre/lvplan:rw',
-		]);
-
-		$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

@@ -1,618 +0,0 @@
-<?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', 'orte'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => 'lehre/lvplan:rw',
-			'getCalendarHours' => 'lehre/lvplan:rw',
-			'getPlan' => 'lehre/lvplan:rw',
-			'getPlanByOrt' => 'lehre/lvplan:rw',
-			'getRaumvorschlag' => 'lehre/lvplan:rw',
-			'getRaeume' => 'lehre/lvplan:rw',
-			'getRaumvorschlagSlots' => 'lehre/lvplan:rw',
-			'getLehreinheiten' => 'lehre/lvplan:rw',
-			'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' => 'lehre/lvplan:rw',
-			'getZeitsperren' => 'lehre/lvplan:rw',
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'deleteOrtEntry' => 'lehre/lvplan:rw',
-			'deleteFromKalenderEvent' => 'lehre/lvplan:rw',
-			'addKalenderEvent' => 'lehre/lvplan:rw',
-			'calculateMultiWeekPlan' => 'lehre/lvplan:rw',
-			'confirmMultiWeekPlan' => 'lehre/lvplan:rw',
-			'addToKalenderEvent' => 'lehre/lvplan:rw',
-			'sync' => 'lehre/lvplan:rw',
-			'getModalContent' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Zeitwunsch_model', 'ZeitwunschModel');
-		$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 getModalContent()
-	{
-		$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);
-
-		$anzahl = $this->_ci->kalenderlib->getStudentenAnzahl(
-			$kalender_id
-		);
-
-		if (isError($anzahl))
-			$this->terminateWithError(getError($anzahl));
-
-		$anzahlSchwund = $this->_ci->kalenderlib->getStudentenAnzahl(
-			$kalender_id,
-			true
-		);
-
-		if (isError($anzahlSchwund))
-			$this->terminateWithError(getError($anzahl));
-
-		$entryResult = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
-
-		$kalender_entry = $entryResult[0];
-
-		$mitarbeiter_uids = array_values(array_unique((array_column($kalender_entry->lektor, 'mitarbeiter_uid'))));
-		$zeitwunschMap = [];
-		if (!isEmptyArray($mitarbeiter_uids))
-		{
-			$this->_ci->ZeitwunschModel->addSelect('tbl_zeitwunsch.mitarbeiter_uid');
-			$this->_ci->ZeitwunschModel->addSelect('MAX(GREATEST(tbl_zeitwunsch_gueltigkeit.insertamum, tbl_zeitwunsch_gueltigkeit.updateamum)) AS letzte_aenderung', false);
-			$this->_ci->ZeitwunschModel->addJoin('campus.tbl_zeitwunsch_gueltigkeit', 'zeitwunsch_gueltigkeit_id');
-			$this->_ci->ZeitwunschModel->db->where_in('tbl_zeitwunsch.mitarbeiter_uid', $mitarbeiter_uids);
-			$this->_ci->ZeitwunschModel->addGroupBy('tbl_zeitwunsch.mitarbeiter_uid');
-
-			$zeitwunschMapResult = $this->_ci->ZeitwunschModel->load();
-
-			if (isError($zeitwunschMapResult))
-				$this->terminateWithError(getError($zeitwunschMapResult));
-
-			if (hasData($zeitwunschMapResult))
-			{
-				foreach (getData($zeitwunschMapResult) as $row)
-				{
-					$zeitwunschMap[$row->mitarbeiter_uid] = $row->letzte_aenderung;
-				}
-			}
-		}
-
-		$mailResult = $this->_ci->kalenderlib->getMailVerteiler($kalender_id);
-
-		if (isError($mailResult))
-			$this->terminateWithError(getError($mailResult));
-
-		$return = ['anzahl' => getData($anzahl),
-			'anzahlSchwund' => getData($anzahlSchwund),
-			'zeitwunschMap' => $zeitwunschMap,
-			'mails' => getData($mailResult)
-		];
-
-		$this->terminateWithSuccess($return);
-	}
-	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);
-
-		$isCollisionCheckEnabled = filter_var(
-			$this->_ci->input->post('collisionCheck', TRUE) ?? false,
-			FILTER_VALIDATE_BOOLEAN
-		);
-
-		$maxDailyEventLimit = $this->_ci->input->post('maxDailyEventLimit', TRUE) ?? false;
-
-		$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,
-			$isCollisionCheckEnabled,
-			$maxDailyEventLimit
-		);
-
-		$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);
-
-		$isCollisionCheckEnabled = filter_var(
-			$this->_ci->input->get('collisionCheck', TRUE) ?? false,
-			FILTER_VALIDATE_BOOLEAN
-		);
-		$maxDailyEventLimit = $this->_ci->input->get('maxDailyEventLimit', TRUE) ?? false;
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
-			$start_date,
-			$end_date,
-			$isCollisionCheckEnabled,
-			$maxDailyEventLimit
-		);
-
-		$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);
-
-		$isCollisionCheckEnabled = filter_var(
-			$this->_ci->input->get('collisionCheck', TRUE) ?? false,
-			FILTER_VALIDATE_BOOLEAN
-		);
-		$maxDailyEventLimit = $this->_ci->input->get('maxDailyEventLimit', TRUE) ?? false;
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
-			$start_date,
-			$end_date,
-			$isCollisionCheckEnabled,
-			$maxDailyEventLimit
-		);
-
-		$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->orte ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null, $updateFields->location ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result),  $result->code);
-
-		
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteOrtEntry()
-	{
-		$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->updateOrt($kalender_id, []);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result),  $result->code);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	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 getRaeume()
-	{
-		$this->_ci->OrtModel->addSelect('ort_kurzbz, raumtyp_kurzbz, max_person');
-		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
-		$this->_ci->OrtModel->db->where('aktiv', true);
-		$this->_ci->OrtModel->db->where('lehre', true);
-		$this->_ci->OrtModel->addOrder('raumtyp_kurzbz');
-		$this->_ci->OrtModel->addOrder('ort_kurzbz');
-		$this->_ci->OrtModel->addOrder('max_person');
-		$orte = $this->_ci->OrtModel->load();
-		$this->terminateWithSuccess(hasData($orte) ? getData($orte) : []);
-	}
-
-	public function getRaumvorschlagSlots()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$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->get('lehreinheit_id', TRUE);
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$this->terminateWithSuccess(getData($this->_ci->raumvorschlaglib->getVorschlaegeSlots($lehreinheit_id, $start_date, $end_date)));
-	}
-
-	public function getLehreinheiten()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-		$result = $this->_ci->kalenderlib->getLehreinheiten($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	public function getHistory()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteEntry()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(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);
-		$first_run = $this->_ci->input->post('first_run', TRUE) ?? true;
-		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz, $first_run);
-
-		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));
-	}
-
-	public function deleteFromKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_ids[]',"lehreinheit_ids","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);
-		$lehreinheit_ids = $this->_ci->input->post('lehreinheit_ids', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteFromKalenderEvent($kalender_id, $lehreinheit_ids);
-
-		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

@@ -1,304 +0,0 @@
-<?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, 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');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_studiensemester', 'tbl_kalender_syncstatus.studiensemester_kurzbz = tbl_studiensemester.studiensemester_kurzbz');
-		$this->_ci->KalenderStatusModel->addOrder('public.tbl_studiensemester.start', 'DESC');
-
-
-		if ($studiensemester_kurzbz === 'all')
-			$data = $this->_ci->KalendersyncstatusModel->load();
-		else
-			$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('tbl_kalender_syncstatus.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/OperationalResourceToCalenderAPI.php

@@ -1,84 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class OperationalResourceToCalenderAPI extends FHCAPI_Controller
-{
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getAssignedResourcesByCalender' => ['admin:r', 'assistenz:r', 'lehre/lvplan:rw'],
-			'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w', 'lehre/lvplan:rw'],
-			'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r', 'lehre/lvplan:rw'],
-		]);
-
-		$this->load->model('ressource/BetriebsmittelKalender_model', 'BetriebsmittelKalenderModel');
-		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
-		$this->load->model('ressource/Kalender_model', 'KalenderModel');
-
-		$this->load->library('CollisionChecker');
-		$this->load->library('KalenderLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function getSchedulableResourcesByCalendar($calenderID)
-	{ 
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (isError($result)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
- 
-		$calender = $this->getDataOrTerminateWithError($result)[0];
-		if (!isset($calender)) $this->terminateWithError("Calendar with id '$calenderID' not found");
-
-		$result = $this->BetriebsmittelModel->getSchedulableEntriesByDatetimeInterval($calender->von, $calender->bis);
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function getAssignedResourcesByCalender($calenderID)
-	{
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
- 
-		$calenderGroupID = $this->getDataOrTerminateWithError($result)[0]->eindeutige_kalender_gruppen_id;
-		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
-
-
-		$this->BetriebsmittelKalenderModel->addSelect(['tbl_betriebsmittel_kalender.*', 'tbl_betriebsmittel.beschreibung', 'tbl_betriebsmittel.verplanen']);
-		$this->BetriebsmittelKalenderModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
-		$result = $this->BetriebsmittelKalenderModel->loadWhere([
-			'eindeutige_kalender_gruppen_id' => $calenderGroupID,
-			'tbl_betriebsmittel.verplanen' => true,
-		]);
-
-		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
-	}
-
-	public function storeResourcesToCalendarRelationship()
-	{
-		$calenderID = $this->input->post('kalender_id');
-		$assignedResources = $this->input->post('assignedResources');
-
-		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'", 'general');
-		if (!isset($assignedResources)) $this->terminateWithError("Missing required parameter 'assignedResources'", 'general');
-
-		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
-		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
-
-		$calendar = $this->getDataOrTerminateWithError($result)[0];
-		
-		$calenderGroupID = $calendar->eindeutige_kalender_gruppen_id;
-		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
-
-		$result = $this->kalenderlib->addOperationalResourcesToKalenderEvent($calendar, $assignedResources);
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(['message' => 'Resources assigned successfully']);
-	}
-}

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

@@ -1,286 +0,0 @@
-<?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:r',
-			'getInformation' => 'lehre/lvplan:r',
-			'getLektor' => 'lehre/lvplan:r',
-			'searchGroup' => 'lehre/lvplan:r',
-			'updateTeilnehmer' => 'lehre/reservierung: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->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-		$gruppen_rollen = $this->_ci->KalenderEventRolleModel->loadWhere(array('rolle_kurzbz !=' => 'organisator'));
-
-		$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['gruppen_rollen'] = hasData($gruppen_rollen) ? getData($gruppen_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);
-		});
-
-
-		usort($gefilterte_gruppen, function ($a, $b)
-		{
-			return [(int) $a->semester, $a->gruppe_kurzbz] <=> [(int) $b->semester, $b->gruppe_kurzbz];
-		});
-
-		$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_rules('titel', "titel", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('beschreibung', "beschreibung", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('start_date', "start_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('end_date', "end_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-
-		if ($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$orte = $this->_ci->input->post('orte', TRUE);
-
-		if (empty($orte) || (empty($orte['ort_kurzbz']) && empty($orte['location'])))
-		{
-			$this->terminateWithValidationErrors(['ort_kurzbz' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Raum'])]);
-		}
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', 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, $orte, $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());
-	}
-
-	public function updateTeilnehmer()
-	{
-		$this->_ci->form_validation->set_rules('kalender_id', 'kalender_id', 'required|numeric', [
-			'required' => $this->p->t('ui', 'error_fieldRequired'),
-		]);
-
-		if ($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), self::ERROR_TYPE_GENERAL);
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
-		$gruppen = $this->_ci->input->post('gruppen', TRUE);
-
-		$teilnehmer = is_array($teilnehmer) ? $teilnehmer : [];
-		$gruppen = is_array($gruppen) ? $gruppen : [];
-
-		$hat_organisator = false;
-
-		foreach ($teilnehmer as $teil)
-		{
-			if (!empty($teil['uid']) && isset($teil['rolle']) && $teil['rolle'] === 'organisator')
-			{
-				$hat_organisator = true;
-				break;
-			}
-		}
-
-		if (!$hat_organisator)
-			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-
-		$result = $this->_ci->kalenderlib->updateReservierungTeilnehmer($kalender_id, $teilnehmer, $gruppen);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-}

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

@@ -1,104 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'getTagsByCalendar' => self::BERECHTIGUNG_KURZBZ,
-			'addTag' => self::BERECHTIGUNG_KURZBZ,
-			'updateTag' => self::BERECHTIGUNG_KURZBZ,
-			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ
-		]);
-
-	$this->config->load('tempus');
-	$this->load->model('ressource/KalenderNotiz_model', 'KalenderNotizModel');
-	}
-
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('tempus_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('tempus_tags'));
-	}
-
-	public function getTagsByCalendar($eindeutige_kalender_gruppen_id)
-	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
-
-		$this->KalenderNotizModel->addSelect(
-			'tbl_kalender_notiz.notiz_id as id,
-			typ_kurzbz,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as beschreibung,
-			text as notiz,
-			style,
-			tbl_notiz.erledigt as done,
-			tag,
-			prioritaet,
-			eindeutige_kalender_gruppen_id
-			'
-		);
-
-		$this->KalenderNotizModel->addJoin('public.tbl_notiz', 'tbl_kalender_notiz.notiz_id = public.tbl_notiz.notiz_id');
-		$this->KalenderNotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
-
-		$this->KalenderNotizModel->addOrder('prioritaet');
-
-		$notiztypen = $this->KalenderNotizModel->loadWhere(array('aktiv' => true, 'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
-		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
-	}
-
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		$postData = $this->getPostJson();
-
-		$return = array();
-		foreach ($postData->values as $value)
-		{
-			$insertResult = parent::addTag(false, $this->config->item('tempus_tags'));
-
-			$insertZuordnung = $this->KalenderNotizModel->insert(array(
-				'eindeutige_kalender_gruppen_id' => $value,
-				'notiz_id' => $insertResult,
-			));
-
-			if (isError($insertZuordnung))
-				$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-			$return[] = ['eindeutige_kalender_gruppen_id' => $value, 'id' => $insertResult];
-		}
-		$this->terminateWithSuccess($return);
-	}
-
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('tempus_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('tempus_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('tempus_tags'));
-	}
-
-	public function _getLanguageIndex()
-	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->SpracheModel->addSelect('index');
-		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
-
-		return hasData($result) ? getData($result)[0]->index : 1;
-	}
-}

application/controllers/components/Cis/Mylv.php

@@ -13,6 +13,7 @@ class Mylv extends Auth_Controller
 	 */
 	public function __construct()
 	{
+		
 		parent::__construct([
 			'Student' => self::PERM_LOGGED,
 			'Studiensemester' => self::PERM_LOGGED,
@@ -44,13 +45,27 @@ 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');
 
-		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
+		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
+		if($isMitarbeiter) {
+			$result = $this->StudiensemesterModel->getWhereMitarbeiterHasLvs(getAuthUID());
 
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($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');
+		}
 	}
 
 	/**
@@ -58,13 +73,27 @@ 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');
 
-		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
+		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
+		if($isMitarbeiter) {
+			$result = $this->LehrveranstaltungModel->getLvsByMitarbeiterInSemester(getAuthUID(), $studiensemester_kurzbz);
 
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($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');
+		}
 	}
 
 	/**

application/controllers/jobs/TempusJob.php

@@ -1,27 +0,0 @@
-<?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,8 +215,11 @@ 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

@@ -1,886 +0,0 @@
-<?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 refreshTablesAndFullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
-	{
-		if (defined('CI_ENVIRONMENT') && CI_ENVIRONMENT === 'production')
-		{
-			echo "This script is not allowed to run in production environment.\n";
-			return;
-		}
-
-		echo "Refreshing calendar related tables...\n";
-		$this->resetBeforeNewStundenplanReservierungImport();
-		echo "Calendar related tables refreshed successfully.\n\n";
-
-		echo "Starting full migration of Stundenplan and Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->fullMigrateOfStundenplanReservierung($von, $bis, $studiengang_kz, $ort_kurzbz);
-		echo "Full migration of Stundenplan and Reservierung completed successfully.\n";
-	}
-
-	public function fullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
-	{
-		echo "Starting migration of Stundenplan from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->migrateStundenplan($von, $bis, $studiengang_kz);
-		echo "Stundenplan migration completed successfully.\n\n";
-
-		echo "Starting migration of Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
-		$this->migrateReservierung($von, $bis, $ort_kurzbz);
-		echo "Reservierung migration completed successfully.\n\n";
-
-		echo "Starting migration of Stundenplan Betriebsmittel entries...\n";
-		$this->migrateStundenplanBetriebsmittelEntries();
-		echo "Stundenplan Betriebsmittel entries migration completed successfully.\n\n";
-
-		echo "Starting to add title values as tags to calendar entries...\n";
-		$this->addTitleValuesAsTagsToKalenderEntries();
-		echo "Adding title values as tags to calendar entries completed successfully.\n\n";
-	}
-
-	public function migrateStundenplan($von, $bis = null, $studiengang_kz = null)
-	{
-		if (is_null($von))
-			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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncModel->db->or_where_in('stundenplandev_id', $where_ids);
-				}
-				$this->SyncModel->db->group_end();
-
-				$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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncReservierungModel->db->or_where_in('reservierung_id', $where_ids);
-				}
-				$this->SyncReservierungModel->db->group_end();
-
-				$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);
-					}
-				}
-			}
-		}
-	}
-
-	public function migrateStundenplanBetriebsmittelEntries() {
-		$this->setKalendarEntriesGroupIDs();
-		$this->setKalendarEntriesGroupIDsForChildren();
-
-		$dbModel = new DB_Model();
-
-		$deleteOldImportedTempusEntriesQuery = "DELETE from lehre.tbl_betriebsmittel_kalender WHERE quelle != 'tempus_neu' OR quelle IS NULL;";
-		$createHelperTypeQuery = "DO $$
-			BEGIN
-				IF NOT EXISTS (
-					SELECT 1
-					FROM pg_type
-					WHERE typname = 'betriebsmittel_info'
-				) THEN
-					CREATE TYPE betriebsmittel_info AS (
-						betriebsmittel_id bigint,
-						insertamum timestamp,
-						insertvon text
-					);
-				END IF;
-			END $$;";
-		
-		$query = $deleteOldImportedTempusEntriesQuery . 
-				 $createHelperTypeQuery .
-		"WITH test AS (
-			SELECT 
-				tk.eindeutige_kalender_gruppen_id AS eindeutige_kalender_gruppen_id,
-				array_agg(tk.kalender_id),
-				array_agg(
-					ROW(tsb.betriebsmittel_id, tsb.insertamum, tsb.insertvon)::betriebsmittel_info
-				) AS betriebsmittel_data
-			FROM sync.tbl_stundenplandev_kalender AS sk
-			JOIN lehre.tbl_kalender tk ON tk.kalender_id = sk.kalender_id
-			JOIN lehre.tbl_stundenplan_betriebsmittel tsb ON tsb.stundenplandev_id = sk.stundenplandev_id 
-			GROUP BY tk.eindeutige_kalender_gruppen_id 
-			)
-			INSERT INTO lehre.tbl_betriebsmittel_kalender (
-				eindeutige_kalender_gruppen_id, 
-				betriebsmittel_id,
-				insertamum,
-				insertvon
-				)
-			SELECT
-				t.eindeutige_kalender_gruppen_id,
-				bm.betriebsmittel_id,
-				bm.insertamum,
-				bm.insertvon
-			FROM test t
-			CROSS JOIN LATERAL unnest(t.betriebsmittel_data) AS bm
-			ON CONFLICT (eindeutige_kalender_gruppen_id, betriebsmittel_id) DO NOTHING;
-			;";
-
-		$dbModel->db->query($query);
-	}
-
-	public function addTitleValuesAsTagsToKalenderEntries() {
-		$dbModel = new DB_Model();
-
-		
-		$query = "SELECT 
-				k.eindeutige_kalender_gruppen_id,
-				ARRAY_AGG(DISTINCT(spd.titel) ORDER BY spd.titel) AS titel,
-				MAX(spd.updateamum) AS updateamum
-			FROM lehre.tbl_stundenplandev spd
-			JOIN sync.tbl_stundenplandev_kalender spdk ON spd.stundenplandev_id = spdk.stundenplandev_id
-			JOIN lehre.tbl_kalender k ON k.kalender_id = spdk.kalender_id
-			WHERE k.typ = 'lehreinheit' AND k.eindeutige_kalender_gruppen_id IS NOT NULL AND spd.titel IS NOT NULL
-			GROUP BY k.eindeutige_kalender_gruppen_id";
-
-		$result = $dbModel->execReadOnlyQuery($query);
-
-		if (isError($result)) {
-			error("Error while fetching title values for adding as tags: " . getError($result));
-			return;
-		}
-		if (!hasData($result)) {
-			error("No title values found for adding as tags.");
-			return;
-		}
-
-		$data = getData($result);
-
-		foreach($data as $block) {
-			$eindeutige_kalender_gruppen_id = $block->eindeutige_kalender_gruppen_id;
-			$notizText = implode(' - ', array_filter($block->titel, function($titel) {
-				return !empty(trim($titel));
-			}));
-
-			if (!empty($notizText)) {
-				$this->addTag($eindeutige_kalender_gruppen_id, $notizText, $block->updateamum);
-			}
-		}
-	}
-
-	private function resetBeforeNewStundenplanReservierungImport()
-	{
-		if (defined('CI_ENVIRONMENT') && CI_ENVIRONMENT === 'production')
-		{
-			echo "This script is not allowed to run in production environment.\n";
-			return;
-		}
-
-		$db = new DB_Model();
-
-		$db->db->trans_start();
-
-		$db->db->query('DELETE FROM sync.tbl_stundenplandev_kalender');
-		$db->db->query('DELETE FROM sync.tbl_reservierung_kalender');
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_event_teilnehmer
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_event
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_lehreinheit
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ = 'lehreinheit' OR typ = 'reservierung'
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_ort
-			WHERE kalender_id IN (
-				SELECT kalender_id
-				FROM lehre.tbl_kalender
-				WHERE typ IN ('lehreinheit', 'reservierung')
-			)");
-
-		$db->db->query("DELETE FROM public.tbl_notiz
-			WHERE notiz_id IN (
-				SELECT notiz_id
-				FROM lehre.tbl_kalender_notiz
-				WHERE eindeutige_kalender_gruppen_id IN (
-					SELECT eindeutige_kalender_gruppen_id
-					FROM lehre.tbl_kalender
-				)
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender_notiz
-			WHERE eindeutige_kalender_gruppen_id IN (
-				SELECT eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-			)");
-		
-		$db->db->query("DELETE FROM lehre.tbl_betriebsmittel_kalender
-			WHERE eindeutige_kalender_gruppen_id IN (
-				SELECT eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-			)");
-
-		$db->db->query("DELETE FROM lehre.tbl_kalender
-			WHERE typ IN ('lehreinheit', 'reservierung')");
-
-		$db->db->trans_complete();
-
-		if ($db->db->trans_status() === false)
-			return error('Reset before new import failed');
-
-		return success('Migration data reset successfully');
-	}
-
-	private function setKalendarEntriesGroupIDs() {
-		$dbModel = new DB_Model();
-
-		$query = "UPDATE lehre.tbl_kalender
-			SET eindeutige_kalender_gruppen_id = gen_random_uuid()
-			WHERE vorgaenger_kalender_id IS NULL
-			AND eindeutige_kalender_gruppen_id IS NULL;";
-
-		$dbModel->db->query($query);
-
-	}
-
-	private function setKalendarEntriesGroupIDsForChildren() {
-		$dbModel = new DB_Model();
-
-		$query = "WITH RECURSIVE tree AS 
-			(
-				SELECT
-					kalender_id,
-					vorgaenger_kalender_id,
-					kalender_id AS root_id,
-					eindeutige_kalender_gruppen_id as root_eindeutige_kalender_gruppen_id
-				FROM lehre.tbl_kalender
-				WHERE vorgaenger_kalender_id IS NULL
-
-				UNION ALL
-
-				SELECT
-					i.kalender_id,
-					i.vorgaenger_kalender_id,
-					t.root_id,
-					t.root_eindeutige_kalender_gruppen_id 
-				FROM lehre.tbl_kalender i
-				JOIN tree t
-				ON i.vorgaenger_kalender_id = t.kalender_id
-				where i.eindeutige_kalender_gruppen_id is NULL
-			
-			)
-			UPDATE lehre.tbl_kalender k
-			SET eindeutige_kalender_gruppen_id = t.root_eindeutige_kalender_gruppen_id
-			FROM tree t
-			WHERE k.kalender_id = t.kalender_id
-			AND k.eindeutige_kalender_gruppen_id IS NULL;";
-
-		$dbModel->db->query($query);
-	}
-	
-	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')
-				)
-			);
-		}
-	}
-
-	private function addTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem): bool
-	{
-		$notizType = 'hinweis';
-		$insertvonMockUser = 'oldToNewTempusMigration';
-		
-		if (is_null($eindeutige_kalender_gruppen_id) || empty($eindeutige_kalender_gruppen_id)) {
-			var_dump("Error: eindeutige_kalender_gruppen_id is null or empty.");
-			return false;
-		}
-
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
-		$this->load->model('ressource/KalenderNotiz_model', 'KalenderNotizModel');
-
-		$checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $notizType));
-
-		if (isError($checkTyp))
-		{
-			error("Error occurred while checking Notiztyp: " . $checkTyp->message);
-			return false;
-		}
-
-		if (!hasData($checkTyp))
-		{
-			error("Notiztyp 'hinweis' does not exist. Please create it before adding tags.");
-			return false;
-		}
-		 
-
-		$this->KalenderNotizModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_kalender_notiz.notiz_id', 'LEFT');
-		$this->KalenderNotizModel->db->where('tbl_notiz.typ', $notizType);
-		$this->KalenderNotizModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
-		$oldKalenderNotiz = $this->KalenderNotizModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
-		if (isError($oldKalenderNotiz))
-		{
-			error("Error occurred while checking KalenderNotiz: " . $oldKalenderNotiz->message);
-			return false;
-		}
-		if (hasData($oldKalenderNotiz))
-		{
-			return $this->updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem);
-		}
-
-		
-		$insertResult = $this->NotizModel->insert(array(
-			'titel' => 'TAG',
-			'text' => $notizText,
-			'verfasser_uid' => null,
-			'erledigt' => false,
-			'insertamum' => date('Y-m-d H:i:s'),
-			'insertvon' => $insertvonMockUser,
-			'typ' => $notizType
-		));
-
-		if (isError($insertResult))
-		{
-			error("Error occurred while inserting Notiz: " . $insertResult->message);
-			return false;
-		}
-
-		$insertKalenderNotiz = $this->KalenderNotizModel->insert(array(
-			'notiz_id' => $insertResult->retval,
-			'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id
-		));
-
-		if (isError($insertKalenderNotiz)) 
-		{
-			error("Error occurred while inserting KalenderNotiz: " . $insertKalenderNotiz->message);
-			return false;
-		}
-
-		return true;
-	}
-
-	private function updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem)
-	{
-		$notizType = 'hinweis';
-		$insertvonMockUser = 'oldToNewTempusMigration';
-		
-		$this->KalenderNotizModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_kalender_notiz.notiz_id', 'LEFT');
-		$this->KalenderNotizModel->db->where('tbl_notiz.typ', $notizType);
-		$this->KalenderNotizModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
-		$kalenderNotizRes = $this->KalenderNotizModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
-		if (isError($kalenderNotizRes))
-		{
-			error("Error occurred while loading KalenderNotiz: " . $kalenderNotizRes->message);
-			return false;
-		}
-
-
-		$tag = $this->NotizModel->loadWhere(array('notiz_id' => $kalenderNotizRes->retval[0]->notiz_id));
-		if (isError($tag))
-		{
-			error("Error occurred while loading Notiz: " . $tag->message);
-			return false;
-		}
-
-		if (!hasData($tag))
-		{
-			error("Error occurred while loading KalenderNotiz: " . $tag->message);
-			return false;
-		}
-
-		$adjustedLastUpdatedInOldSystem = date('Y-m-d H:i:s', strtotime($lastUpdatedInOldSystem) + 5);
-		if ($tag->retval[0]->updateamum >= $adjustedLastUpdatedInOldSystem)
-		{
-			return true;
-		}
-
-		$updateData = $this->NotizModel->update(array('notiz_id' => $tag->retval[0]->notiz_id),
-			array('text' => $notizText,
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => $insertvonMockUser,
-				'bearbeiter_uid' => null,
-			)
-		);
-		if (isError($updateData))
-		{
-			error("Error occurred while updating Notiz: " . $updateData->message);
-			return false;
-		}
-
-		return true;
-	}
-}

application/core/ICollisionCheck.php

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

application/core/Tag_Controller.php

@@ -34,7 +34,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		
+
 		$this->loadPhrases([
 			'ui'
 		]);
@@ -44,6 +44,7 @@ class Tag_Controller extends FHCAPI_Controller
 	{
 		$language = $this->_getLanguageIndex();
 		$index_bezeichnung_mehrsprachig = $language - 1;
+
 		$id = $this->input->get('id');
 
 		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
@@ -142,7 +143,7 @@ class Tag_Controller extends FHCAPI_Controller
 			if (!in_array($postData->tag_typ_kurzbz, $tags))
 				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
 		}
-		
+
 		if ($withZuordnung)
 		{
 			$return = array();
@@ -151,7 +152,7 @@ class Tag_Controller extends FHCAPI_Controller
 				$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
 
 			$values = array_unique($postData->values);
-			
+
 			foreach ($values as $value)
 			{
 				$insertResult = $this->addNotiz($postData);

application/helpers/hlp_common_helper.php

@@ -570,13 +570,3 @@ function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $ord
 		];
 
 }
-
-function generateUUID()
-{
-	$data = openssl_random_pseudo_bytes(16);
-
-	$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
-	$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
-
-	return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
-}

application/helpers/hlp_header_helper.php

@@ -82,6 +82,21 @@ function generateCSSsInclude($CSSs)
 	}
 }
 
+/**
+ * Generates tags for the style sheets you want to include, the parameter could by a string or an array of strings
+ */
+function generatePrintCSS($path)
+{
+	$cssLink = '<link rel="stylesheet" media="print" href="%s" />';
+
+	$ci =& get_instance();
+	$cachetoken = '?'.$ci->config->item('fhcomplete_build_version');
+
+	if (isset($path)) {
+		echo sprintf($cssLink, base_url($path).$cachetoken) . PHP_EOL;
+	}
+}
+
 /**
  * Generates global JS-Object to pass parms to other javascripts
  */

application/libraries/CmsLib.php

@@ -4,6 +4,7 @@ if (!defined('BASEPATH'))
 	exit('No direct script access allowed');
 
 use \DateTime as DateTime;
+use \DateInterval as DateInterval;
 use \DOMDocument as DOMDocument;
 use \XSLTProcessor as XSLTProcessor;
 
@@ -141,63 +142,6 @@ class CmsLib
 		]);
 	}
 
-	/**
-	 * @param stdClass		$stg_obj
-	 * 
-	 * @return stdClass
-	 */
-	protected function getNewsExtras($stg_obj, $semester)
-	{
-		$this->ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		$stg_ltg = $this->ci->StudiengangModel->getLeitungDetailed($stg_obj->studiengang_kz);
-		if (isError($stg_ltg))
-			return $stg_ltg;
-		$stg_ltg = getData($stg_ltg) ?: [];
-
-		$gf_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
-		if (isError($gf_ltg))
-			return $gf_ltg;
-		$gf_ltg = getData($gf_ltg) ?: [];
-
-		$stv_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
-		if (isError($stv_ltg))
-			return $stv_ltg;
-		$stv_ltg = getData($stv_ltg) ?: [];
-
-		$ass = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
-		if (isError($ass))
-			return $ass;
-		$ass = getData($ass) ?: [];
-
-		$hochschulvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
-		if (isError($hochschulvertr))
-			return $hochschulvertr;
-		$hochschulvertr = getData($hochschulvertr) ?: [];
-
-		$stdv = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
-		if (isError($stdv))
-			return $stdv;
-		$stdv = getData($stdv) ?: [];
-
-		$jahrgangsvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
-		if (isError($jahrgangsvertr))
-			return $jahrgangsvertr;
-		$jahrgangsvertr = getData($jahrgangsvertr) ?: [];
-
-		return success($this->ci->load->view('Cis/Cms/News/Xml/NewsExtras', [
-			'studiengang' => $stg_obj,
-			'semester' => $semester,
-			'stg_ltg' => $stg_ltg,
-			'gf_ltg' => $gf_ltg,
-			'stv_ltg' => $stv_ltg,
-			'ass' => $ass,
-			'hochschulvertr' => $hochschulvertr,
-			'stdv' => $stdv,
-			'jahrgangsvertr' => $jahrgangsvertr
-		], true));
-	}
-
 	/**
 	 * @param string			$studiengang_kz
 	 * @param string			$semester
@@ -233,64 +177,102 @@ class CmsLib
 	 * 
 	 * @return void
 	 */
-	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10, $sprache)
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10, $sprache, $filterForDegreePrograms = false, $allowedDegreePrograms = [], $active = true)
+
 	{
 		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
-		$all = $edit;
-
-		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
 
 		$this->ci->load->model('content/News_model', 'NewsModel');
-		$news = $this->ci->NewsModel->getNewsWithContent($sprache, $studiengang_kz, $semester, null, $sichtbar, 0, $page, $page_size, $all, $mischen);
-
-		if (isError($news))
-			return $news;
-
-		$news = getData($news);
+	
 		
+		$news = $this->ci->NewsModel->getNewsWithContent($sprache, $studiengang_kz, $semester, null, $sichtbar, $page, $page_size, $active, $mischen, $filterForDegreePrograms, $allowedDegreePrograms);
+		$news = getData($news) ?? [];
+		$newsWrappers = [];
+
 		foreach ($news as $newsobj) {
 			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
 				continue;
-			$date = new DateTime($newsobj->datum);
-			$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
-			$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
-			$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
-			$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
+
+			$newsWrappers[] = $this->createNewsWrapper($newsobj, $edit);
 		}
 
-		/* if ($studiengang_kz != 0) {
-			$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
-			if (isError($stg_obj))
-				return $stg_obj;
-			$stg_obj = current(getData($stg_obj) ?: []);
+		$content = $this->createNewsContent($newsWrappers, $infoscreen, $titel);
+		if (isError($content))
+			return $content;
 
-			if ($stg_obj) {
-				if (!$edit && !$infoscreen) {
-					$extras = $this->getNewsExtras($stg_obj, $semester);
-					if (isError($extras))
-						return $extras;
-					$xml .= getData($extras);
-				}
-				$xml .= '<studiengang_bezeichnung><![CDATA[' . $stg_obj->bezeichnung . ']]></studiengang_bezeichnung>';
-			}
-		} */
+		return success([
+			"content" => getData($content),
+			"row_count" => $news[0]->row_count ?? 0
+		]);
+	}
+
+	/**
+	 * Creates a newswrapper XML element from a news item.
+	 *
+	 * @param stdClass	$newsobj
+	 * @param boolean	$edit
+	 *
+	 * @return DOMElement
+	 */
+	public function createNewsWrapper($newsobj, $edit)
+	{
+		$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
+		$isPublished = $edit ? '<is_published><![CDATA[' . ($newsobj->sichtbar ? 'true' : 'false') . ']]></is_published>' : '';
+
+		$date = new DateTime($newsobj->datum);
+		$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
+		$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
+
+		$hasVisibleToDate = isset($newsobj->datum_bis) && $newsobj->datum_bis !== '';
+		$datumTo = $hasVisibleToDate
+			? new DateTime($newsobj->datum_bis)
+			: (clone $date)->add(new DateInterval('P' . MAXNEWSALTER . 'D'));
+		if ($hasVisibleToDate)
+			$datumTo->setTime(23, 59, 59);
+
+		$now = new DateTime();
+		$isActive = '<is_active><![CDATA[' . ($datumTo >= $now ? 'true' : 'false') . ']]></is_active>';
+
+		$newsWrapper = new DOMDocument(); 
+		$newsWrapper->loadXML('<newswrapper>' . $newsobj->content . $datum . $id . $isPublished . $isActive . '</newswrapper>');
+
+		return $newsWrapper->documentElement;
+	}
+
+	/**
+	 * Creates rendered news content from one or more newswrapper XML elements.
+	 *
+	 * @param DOMElement|array	$newsWrappers
+	 * @param boolean				$infoscreen
+	 * @param string				$titel
+	 *
+	 * @return stdClass
+	 */
+	public function createNewsContent($newsWrappers, $infoscreen, $titel)
+	{
+		if (!is_array($newsWrappers))
+			$newsWrappers = [$newsWrappers];
+
+		$XML = new DOMDocument('1.0', 'UTF-8');
+		$contentElement = $XML->createElement('content');
+		$XML->appendChild($contentElement);
+
+		foreach ($newsWrappers as $newsWrapper)
+			$contentElement->appendChild($XML->importNode($newsWrapper, true));
 
 		if ($titel != '') {
-			$xml .= '<news_titel>' . $titel . '</news_titel>';
+			$titleElement = $XML->createElement('news_titel');
+			$titleElement->appendChild($XML->createTextNode($titel));
+			$contentElement->appendChild($titleElement);
 		}
 
-		$xml .= '</content>';
-
 		//XSLT Vorlage laden
 		$template = $this->ci->TemplateModel->load($infoscreen ? 'news_infoscreen' : 'news');
 		if (isError($template))
 			return $template;
 		$template = current(getData($template));
 
-		$XML = new DOMDocument();
-		$XML->loadXML($xml);
-
 		$xsltemplate = new DOMDocument();
 		$xsltemplate->loadXML($template->xslt_xhtml_c4);
 

application/libraries/CollisionChecker.php

@@ -1,67 +0,0 @@
-<?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->_ci->load->library('collision/checks/ResourcesCollisionCheck');
-		$this->register($this->_ci->roomcollisioncheck);
-		$this->register($this->_ci->lecturecollisioncheck);
-		$this->register($this->_ci->verbandcollisioncheck);
-		$this->register($this->_ci->studentcollisioncheck);
-		$this->register($this->_ci->resourcescollisioncheck);
-		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

@@ -1,171 +0,0 @@
-<?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('', '[email protected]', 'Lektor Tempus Update', $lektor_entries);
-		if (!empty($student_entries))
-			$this->_ci->maillib->send('', '[email protected]', '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

@@ -1,429 +0,0 @@
-<?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');
-		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->_ci->load->library('KalenderLib');
-	}
-
-	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('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-			$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('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$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()
-	{
-		$mail_infos_gesamt = [];
-		$synced_gesamt = 0;
-
-		$todelete_ids_result = $this->_getManuallySetStatus(array('to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		if (isError($todelete_ids_result))
-			return $todelete_ids_result;
-
-		$todelete_result = $this->_syncKalenderIds(getData($todelete_ids_result), null);
-
-		if (isError($todelete_result))
-			return $todelete_result;
-
-		$todelete_data = getData($todelete_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $todelete_data['mail_infos']);
-		$synced_gesamt += $todelete_data['synced'];
-
-		$preview_ids_result = $this->_getManuallySetStatus(array('sync_preview'));
-
-		if (isError($preview_ids_result))
-			return $preview_ids_result;
-
-		$preview_result = $this->_syncKalenderIds(getData($preview_ids_result), 'preview');
-
-		if (isError($preview_result))
-			return $preview_result;
-
-		$preview_data = getData($preview_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $preview_data['mail_infos']);
-		$synced_gesamt += $preview_data['synced'];
-
-		$live_ids_result = $this->_getManuallySetStatus(array('sync_live'));
-
-		if (isError($live_ids_result))
-			return $live_ids_result;
-
-		$live_result = $this->_syncKalenderIds(getData($live_ids_result), 'live');
-
-		if (isError($live_result))
-			return $live_result;
-
-		$live_data = getData($live_result);
-		$mail_infos_gesamt = array_merge($mail_infos_gesamt, $live_data['mail_infos']);
-		$synced_gesamt += $live_data['synced'];
-
-		if (!empty($mail_infos_gesamt))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($mail_infos_gesamt);
-		}
-
-		return success(['synced' => $synced_gesamt]);
-	}
-
-	private function _getManuallySetStatus($status_kurzbz_list)
-	{
-		if (empty($status_kurzbz_list))
-			return success([]);
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->db->where_in('status_kurzbz', $status_kurzbz_list);
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success([]);
-
-		return success(array_column(getData($result), 'kalender_id'));
-	}
-
-	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);
-
-		if (!hasData($studiengang_result))
-		{
-			$organisationseinheiten = $this->_ci->OrganisationseinheitModel->getChilds($oe_kurzbz);
-			$oe_kurzbz = hasData($organisationseinheiten) ? array_column(getData($organisationseinheiten), 'oe_kurzbz') : [];
-		}
-
-		$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');
-
-		if (!is_null($studiengang_kz))
-		{
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang_kz);
-		}
-		else
-		{
-			$this->_ci->KalenderModel->db->where_in('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)
-	{
-		$return_array = array();
-		if (!$vorgaenger_kalender_id) return success($return_array);
-
-		$current_id = $vorgaenger_kalender_id;
-
-		while ($current_id)
-		{
-			$vorgaenger = $this->_ci->KalenderModel->load(array('kalender_id' => $current_id));
-			if (!hasData($vorgaenger)) return success($return_array);
-
-			$vorgaenger = getData($vorgaenger)[0];
-
-			if ($stop_at_live && $vorgaenger->status_kurzbz === 'live')
-				return success($return_array);
-
-			if (in_array($vorgaenger->status_kurzbz, array('preview', 'live')))
-			{
-				$this->_ci->KalenderModel->update(
-					array('kalender_id' => $current_id),
-					array('status_kurzbz' => 'archived', 'status_kurzbz_max' => $vorgaenger->status_kurzbz)
-				);
-
-				$return_array[] = $vorgaenger;
-			}
-
-			$current_id = $vorgaenger->vorgaenger_kalender_id;
-		}
-		return success($return_array);
-	}
-
-	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 (in_array($entry->status_kurzbz, array('to_delete', 'to_delete_live', 'to_delete_preview')))
-			{
-				$notify = array();
-				if ($entry->status_kurzbz === 'to_delete_live')
-				{
-					$status_max = 'live';
-					$notify = array('lektor', 'student');
-				}
-				else if ($entry->status_kurzbz === 'to_delete_preview')
-				{
-					$status_max = 'preview';
-					$notify = array('lektor');
-				}
-				else if ($entry->status_kurzbz === 'to_delete')
-				{
-					$status_max = 'planning';
-				}
-
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted', 'status_kurzbz_max' => $status_max));
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => $notify);
-
-				$vorgaenger_array = $this->_archiveVorgaenger($entry->vorgaenger_kalender_id);
-
-
-
-				if (hasData($vorgaenger_array))
-				{
-					foreach(getData($vorgaenger_array) as $vorgaenger)
-					{
-						$archive_notify = array();
-
-						if ($vorgaenger->status_kurzbz === 'preview')
-							$archive_notify = array('lektor');
-						else if ($vorgaenger->status_kurzbz === 'live')
-						{
-							$archive_notify = array('student', 'lektor');
-
-							$history = $this->_ci->kalenderlib->getHistory($vorgaenger->kalender_id, false, false);
-							if (hasData($history))
-							{
-								$history = getData($history);
-
-								foreach ($history as $entry)
-								{
-									if ($entry->status_kurzbz === 'deleted' && $entry->status_kurzbz_max === 'preview')
-									{
-										$archive_notify = array('student');
-										break;
-									}
-								}
-							}
-						}
-
-						$mail_infos[] = array('entry' => $vorgaenger, 'new_status' => 'deleted', 'notify' => $archive_notify);
-					}
-				}
-
-				$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/PruefungsverlaufLib.php

@@ -0,0 +1,410 @@
+<?php
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * The exam history of one student in one course: the order of the attempts, the attempt count
+ * and the limits. This class is the only source of the examination rules. The controller and the
+ * client only read the result.
+ */
+class PruefungsverlaufLib
+{
+	/** The first attempt: the original assessment, which is the transcript grade itself. */
+	const ROLLE_ERSTANTRITT = 'erstantritt';
+
+	/** Each attempt after the first one. */
+	const ROLLE_PRUEFUNG = 'pruefung';
+
+	/** The last attempt. The examination rules require a commission for it. */
+	const ROLLE_KOMMISSIONELL = 'kommissionell';
+
+	/** Maps an attempt number to the old exam type. Kept for backward compatibility. */
+	private static $_legacyTypen = [1 => 'Termin1', 2 => 'Termin2', 3 => 'Termin3'];
+
+	private $_ci;
+	private $_noteCache = [];
+	private $_specialNotes = null;
+	private $_typen = null;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('education/LePruefung_model', 'LePruefungModel');
+		$this->_ci->load->model('education/Note_model', 'NoteModel');
+		$this->_ci->load->model('education/Pruefungstyp_model', 'PruefungstypModel');
+		$this->_ci->load->config('noten');
+	}
+
+	/**
+	 * @param mixed $lvNote       counts as the implicit first attempt while no exam counts
+	 * @param mixed $zeugnisNote  a credited grade makes all exams impossible
+	 * @return stdClass
+	 */
+	public function getVerlauf($student_uid, $lv_id, $sem_kurzbz, $lvNote = null, $zeugnisNote = null)
+	{
+		return $this->buildVerlauf($this->getPruefungen($student_uid, $lv_id, $sem_kurzbz), $lvNote, $zeugnisNote);
+	}
+
+	/** All exams of one student in one course, in chronological order. @return array */
+	public function getPruefungen($student_uid, $lv_id, $sem_kurzbz)
+	{
+		$result = $this->_ci->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, null, $lv_id, $sem_kurzbz);
+		if (isError($result) || !hasData($result)) return [];
+
+		return $this->sortPruefungen(getData($result));
+	}
+
+	/** Sort keys: datum, then tbl_pruefungstyp.sort (old rows without a date), then pruefung_id. */
+	public function sortPruefungen($pruefungen)
+	{
+		$pruefungen = array_values($pruefungen);
+		$typen = $this->getTypen();
+
+		usort($pruefungen, function ($a, $b) use ($typen) {
+			$da = substr((string) $a->datum, 0, 10);
+			$db = substr((string) $b->datum, 0, 10);
+
+			if ($da !== $db) {
+				if ($da === '') return -1;
+				if ($db === '') return 1;
+				return ($da < $db) ? -1 : 1;
+			}
+
+			$sa = isset($typen[$a->pruefungstyp_kurzbz]) ? (int) $typen[$a->pruefungstyp_kurzbz]->sort : 0;
+			$sb = isset($typen[$b->pruefungstyp_kurzbz]) ? (int) $typen[$b->pruefungstyp_kurzbz]->sort : 0;
+			if ($sa !== $sb) return ($sa < $sb) ? -1 : 1;
+
+			return ((int) $a->pruefung_id < (int) $b->pruefung_id) ? -1 : 1;
+		});
+
+		return $pruefungen;
+	}
+
+	/**
+	 * Builds the history from a list of exams. Each exam gets: position, zaehlt, antritt_nr (null
+	 * if the exam does not count) and terminal.
+	 *
+	 * @return stdClass
+	 */
+	public function buildVerlauf($pruefungen, $lvNote = null, $zeugnisNote = null)
+	{
+		$pruefungen = $this->sortPruefungen($pruefungen);
+
+		$antrittCount = 0;
+		$terminal = false;
+		$eintraege = [];
+
+		foreach ($pruefungen as $i => $p) {
+			$zaehlt = $this->zaehltAlsAntritt($p->note, $p->pruefungstyp_kurzbz);
+			if ($zaehlt) $antrittCount++;
+
+			// A kommissionelle exam closes the chain, also if its grade uses no attempt. A student
+			// with a kommissionelle Prüfung gets no further exam from this tool.
+			$kommissionell = $this->istKommissionell($p->pruefungstyp_kurzbz);
+			if ($kommissionell) $terminal = true;
+
+			$eintrag = clone $p;
+			$eintrag->position = $i + 1;
+			$eintrag->zaehlt = $zaehlt;
+			$eintrag->antritt_nr = $zaehlt ? $antrittCount : null;
+			$eintrag->kommissionell = $kommissionell;
+			$eintraege[] = $eintrag;
+		}
+
+		// if no exam counts, the course grade itself is the first attempt
+		$implizit = ($antrittCount === 0 && $lvNote !== null && $this->zaehltAlsAntritt($lvNote));
+		if ($implizit) $antrittCount = 1;
+
+		$maxAntritte = $this->getMaxAntritte();
+
+		// credited: the row stays visible, but you cannot enter anything
+		$angerechnet = $this->istAnrechnungsnote($zeugnisNote);
+
+		$verlauf = new stdClass();
+		$verlauf->pruefungen = $eintraege;
+		$verlauf->antrittCount = $antrittCount;
+		$verlauf->maxAntritte = $maxAntritte;
+		$verlauf->terminal = $terminal;
+		$verlauf->angerechnet = $angerechnet;
+		$verlauf->impliziterErstantritt = $implizit;
+		$verlauf->canAdd = !$terminal && !$angerechnet && $antrittCount < $maxAntritte;
+
+		// after the first exam each new entry is a repeat attempt
+		$verlauf->erstantrittMoeglich = !$angerechnet && (count($eintraege) === 0);
+
+		// The last attempt of the chain is kommissionell (§17 Abs 1). The role therefore follows
+		// from the position, and the user interface offers no type to select.
+		if (count($eintraege) === 0 && !$implizit) {
+			$verlauf->naechsteRolle = self::ROLLE_ERSTANTRITT;
+		} elseif (($antrittCount + 1) >= $maxAntritte) {
+			$verlauf->naechsteRolle = self::ROLLE_KOMMISSIONELL;
+		} else {
+			$verlauf->naechsteRolle = self::ROLLE_PRUEFUNG;
+		}
+
+		return $verlauf;
+	}
+
+	/** 'angerechnet' or 'intern angerechnet'. The TRANSCRIPT grade decides. @return bool */
+	public function istAnrechnungsnote($note)
+	{
+		if ($note === null || $note === '') return false;
+		return in_array($note, $this->getSpecialNotes()['anrechnung']);
+	}
+
+	/**
+	 * All attempts that count, the kommissionelle attempt included. The explicit configuration
+	 * wins. Without it the number comes from the old flags: the original assessment, one attempt
+	 * for each active repeat, and the kommissionelle attempt.
+	 *
+	 * @return int
+	 */
+	public function getMaxAntritte()
+	{
+		$max = $this->_ci->config->item('CIS_GESAMTNOTE_MAX_ANTRITTE');
+		if (is_numeric($max) && (int) $max > 0) return (int) $max;
+
+		$max = 1;
+		if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2) $max++;
+		if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3) $max++;
+		if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF) $max++;
+		return $max;
+	}
+
+	/**
+	 * The NOTE decides, therefore the same type can occur more than one time. The type decides in
+	 * one case only: a type in PRUEFUNG_TYPEN_OHNE_ANTRITT never uses an attempt.
+	 *
+	 * @return bool
+	 */
+	public function zaehltAlsAntritt($note, $typ = null)
+	{
+		if ($typ !== null && in_array($typ, $this->getTypenOhneAntritt())) return false;
+		if ($note === null || $note === '') return false;
+		if (in_array($note, $this->getSpecialNotes()['ohneAntritt'])) return false;
+
+		// a credited grade is not an assessment, therefore it uses no attempt
+		if ($this->istAnrechnungsnote($note)) return false;
+
+		$noteRow = $this->getNote($note);
+		return $noteRow ? (bool) $noteRow->lehre : false;
+	}
+
+	/** Tells you if an exam takes place before a commission. @return bool */
+	public function istKommissionell($typ)
+	{
+		$typen = $this->_ci->config->item('PRUEFUNG_KOMMISSIONELL_TYPEN');
+		if (!is_array($typen)) $typen = ['kommPruef', 'zusKommPruef'];
+		return in_array($typ, $typen);
+	}
+
+	/** The exam types that never use an attempt. @return array */
+	public function getTypenOhneAntritt()
+	{
+		$typen = $this->_ci->config->item('PRUEFUNG_TYPEN_OHNE_ANTRITT');
+		return is_array($typen) ? $typen : ['zusKommPruef'];
+	}
+
+	/**
+	 * The type for an attempt number. The student administration still reads this column, so the
+	 * value must be correct. The last attempt gets the kommissionelle type, the attempts before it
+	 * get the old Termin types.
+	 *
+	 * @return string
+	 */
+	public function legacyTypFuerAntritt($antrittNr)
+	{
+		$antrittNr = max(1, (int) $antrittNr);
+		$typen = $this->getTypen();
+
+		$maxAntritte = $this->getMaxAntritte();
+		$kommissionell = $this->_ci->config->item('PRUEFUNG_TYP_KOMMISSIONELL');
+		if (!is_string($kommissionell) || $kommissionell === '') $kommissionell = 'kommPruef';
+
+		if ($maxAntritte > 1 && $antrittNr >= $maxAntritte && isset($typen[$kommissionell])) {
+			return $kommissionell;
+		}
+
+		for ($n = $antrittNr; $n >= 1; $n--) {
+			if (isset(self::$_legacyTypen[$n]) && isset($typen[self::$_legacyTypen[$n]])) {
+				return self::$_legacyTypen[$n];
+			}
+		}
+
+		return self::$_legacyTypen[1];
+	}
+
+	/**
+	 * The old type for a new repeat attempt. It is never lower than Termin2, also if the first
+	 * exam does not use an attempt.
+	 *
+	 * @return string
+	 */
+	public function legacyTypFuerWiederholung($verlauf)
+	{
+		return $this->legacyTypFuerAntritt(max(2, $verlauf->antrittCount + 1));
+	}
+
+	/** @return array{entschuldigt: mixed, ohneAntritt: array, anrechnung: array, limitMap: array} */
+	public function getSpecialNotes()
+	{
+		if ($this->_specialNotes !== null) return $this->_specialNotes;
+
+		$cfgEntschuldigt = $this->_ci->config->item('NOTE_ENTSCHULDIGT');
+		$cfgOhneAntritt = $this->_ci->config->item('NOTEN_OHNE_ANTRITT');
+		$cfgLimitMap = $this->_ci->config->item('NOTEN_OCCURANCE_LIMIT_MAP');
+		$bezeichnungen = $this->_ci->config->item('NOTEN_OHNE_ANTRITT_BEZEICHNUNGEN');
+		if (!is_array($cfgOhneAntritt)) $cfgOhneAntritt = [];
+		if (!is_array($cfgLimitMap)) $cfgLimitMap = [];
+		if (!is_array($bezeichnungen)) $bezeichnungen = [];
+
+		$resEnt = $this->_ci->NoteModel->getEntschuldigtNote();
+		$entschuldigt = (!isError($resEnt) && hasData($resEnt)) ? getData($resEnt)[0]->note : $cfgEntschuldigt;
+
+		// The name wins against the configured key. Do NOT merge the two sets: the same key has a
+		// different meaning in each installation (17 is 'entschuldigt' here, but 'nicht zugelassen'
+		// in the standard data).
+		$ohneAntritt = [];
+		foreach ($bezeichnungen as $bezeichnung) {
+			$note = $this->getNoteByBezeichnung($bezeichnung);
+			if ($note !== null && !in_array($note, $ohneAntritt)) $ohneAntritt[] = $note;
+		}
+		if (count($ohneAntritt) === 0) $ohneAntritt = $cfgOhneAntritt;
+		if ($entschuldigt !== null && !in_array($entschuldigt, $ohneAntritt)) $ohneAntritt[] = $entschuldigt;
+
+		// move the configured limit for 'entschuldigt' to the key that was found
+		$limitMap = [];
+		foreach ($cfgLimitMap as $k => $v) {
+			$limitMap[($k == $cfgEntschuldigt) ? $entschuldigt : $k] = $v;
+		}
+
+		$this->_specialNotes = [
+			'entschuldigt' => $entschuldigt,
+			'ohneAntritt' => array_values($ohneAntritt),
+			'anrechnung' => $this->resolveNoten('NOTEN_ANRECHNUNG_BEZEICHNUNGEN', 'NOTEN_ANRECHNUNG'),
+			'limitMap' => $limitMap
+		];
+		return $this->_specialNotes;
+	}
+
+	/**
+	 * The occurrence limit from NOTEN_OCCURANCE_LIMIT_MAP. $excludePruefungId skips the record
+	 * that the user edits at this moment.
+	 *
+	 * @return bool
+	 */
+	public function ueberschreitetNotenLimit($pruefungen, $note, $excludePruefungId = null)
+	{
+		$limitMap = $this->getSpecialNotes()['limitMap'];
+
+		$limit = null;
+		foreach ($limitMap as $limitNote => $limitVal) {
+			if ($limitNote == $note) { $limit = $limitVal; break; }
+		}
+		if ($limit === null) return false;
+
+		$count = 0;
+		foreach ($pruefungen as $p) {
+			if ($excludePruefungId !== null && $p->pruefung_id == $excludePruefungId) continue;
+			if ($p->note == $note) $count++;
+		}
+
+		return ($count + 1) > $limit;
+	}
+
+	/** An exam with a later date locks the grade. You can still correct the date. @return bool */
+	public function hatSpaeterenTermin($verlauf, $pruefung_id)
+	{
+		$current = null;
+		foreach ($verlauf->pruefungen as $p) {
+			if ($p->pruefung_id == $pruefung_id) { $current = $p; break; }
+		}
+		if ($current === null) return false;
+
+		foreach ($verlauf->pruefungen as $p) {
+			if ($p->pruefung_id == $current->pruefung_id) continue;
+			if ($p->position > $current->position) return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * tbl_pruefungstyp as a map. It sorts old rows, and it limits the legacy type to the types
+	 * that exist. A type that does not exist breaks the foreign key. Termin3 is absent from the
+	 * standard data.
+	 *
+	 * @return array
+	 */
+	private function getTypen()
+	{
+		if ($this->_typen !== null) return $this->_typen;
+
+		$this->_typen = [];
+		$result = $this->_ci->PruefungstypModel->load();
+		if (!isError($result) && hasData($result)) {
+			foreach (getData($result) as $typ) {
+				$this->_typen[$typ->pruefungstyp_kurzbz] = $typ;
+			}
+		}
+
+		return $this->_typen;
+	}
+
+	/** Finds the grades by their name. The configured keys are the fallback only. @return array */
+	private function resolveNoten($bezeichnungKey, $pkKey)
+	{
+		$bezeichnungen = $this->_ci->config->item($bezeichnungKey);
+		if (!is_array($bezeichnungen)) $bezeichnungen = [];
+
+		$noten = [];
+		foreach ($bezeichnungen as $bezeichnung) {
+			$note = $this->getNoteByBezeichnung($bezeichnung);
+			if ($note !== null && !in_array($note, $noten)) $noten[] = $note;
+		}
+
+		if (count($noten) === 0) {
+			$fallback = $this->_ci->config->item($pkKey);
+			if (is_array($fallback)) $noten = $fallback;
+		}
+
+		return array_values($noten);
+	}
+
+	/**
+	 * @return stdClass|null
+	 */
+	private function getNote($note)
+	{
+		if (array_key_exists($note, $this->_noteCache)) return $this->_noteCache[$note];
+
+		$result = $this->_ci->NoteModel->load($note);
+		$this->_noteCache[$note] = (!isError($result) && hasData($result)) ? getData($result)[0] : null;
+		return $this->_noteCache[$note];
+	}
+
+	/**
+	 * @return mixed|null
+	 */
+	private function getNoteByBezeichnung($bezeichnung)
+	{
+		$result = $this->_ci->NoteModel->loadWhere(['bezeichnung' => $bezeichnung]);
+		return (!isError($result) && hasData($result)) ? getData($result)[0]->note : null;
+	}
+}

application/libraries/RaumvorschlagLib.php

@@ -1,563 +0,0 @@
-<?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('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-
-		$this->_ci->load->library('CollisionChecker');
-		$this->_ci->load->library('KalenderLib');
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-	}
-
-
-	public function getVorschlaege($kalender_id)
-	{
-		$event = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
-		$event = $event[0];
-		return $this->_getVorschlaegeForEvent($event);
-	}
-
-	public function getVorschlaegeByLehreinheit($lehreinheit_id, $von, $bis)
-	{
-		$teilnehmer = $this->_getLehreinheitTeilnehmer($lehreinheit_id);
-
-		$event = (object) [
-			'kalender_id' => null,
-			'lehreinheit_id' => [$lehreinheit_id],
-			'isostart' => (new DateTime($von))->format('c'),
-			'isoend' => (new DateTime($bis))->format('c'),
-			'datum' => (new DateTime($von))->format('Y-m-d'),
-			'lektor' => $teilnehmer->lektor_data,
-			'gruppe' => $teilnehmer->gruppen_data,
-		];
-
-		return $this->_getVorschlaegeForEvent($event);
-	}
-
-	public function getVorschlaegeSlots($lehreinheit_id, $start_date, $end_date)
-	{
-		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
-		if (!hasData($lehreinheit_result))
-			return error('Lehreinheit nicht gefunden');
-		$lehreinheit = getData($lehreinheit_result)[0];
-
-		$block = $lehreinheit->stundenblockung;
-		if ($block <= 0)
-			return error('Stundenblockung ist ungültig');
-
-		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
-		$stunden_result = $this->_ci->StundeModel->load();
-		$stunden = hasData($stunden_result) ? array_values(getData($stunden_result)) : [];
-
-		if (empty($stunden))
-			return error('Kein Stunden-Raster gefunden');
-
-		$teilnehmer = $this->_getLehreinheitTeilnehmer($lehreinheit_id);
-		$grp = $this->_splitGruppen($teilnehmer->gruppen_data);
-		$lektor_uids = array_column($teilnehmer->lektor_data, 'mitarbeiter_uid');
-
-		$verplante_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$start_date,
-			$end_date,
-			$lektor_uids,
-			$grp->gruppen_kurzbz,
-			$grp->lehrverband_gruppen
-		);
-
-		$start_day = strtotime($start_date);
-		$end_day = strtotime($end_date);
-
-		$moegliche_slots = array();
-
-		$verplante_zeitsperren = $this->_getZeitsperen($start_date, $end_date, $lektor_uids);
-		while ($start_day <= $end_day)
-		{
-			$tag = date('Y-m-d', $start_day);
-
-			$verplante_tages_events = array_values(array_filter($verplante_events, function($event) use ($tag)
-			{
-				return $event->datum === $tag;
-			}));
-
-			foreach ($stunden as $index => $start_stunde)
-			{
-				if (!isset($stunden[$index + $block - 1]))
-					continue;
-
-				$end_stunde = $stunden[$index + $block - 1];
-
-				$slot_start = $tag . ' ' . $start_stunde->beginn;
-				$slot_end = $tag . ' ' . $end_stunde->ende;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_zeitsperren, $lektor_uids, 'lektor'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $lektor_uids, 'lektor'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $grp->gruppen_kurzbz, 'gruppe'))
-					continue;
-
-				if (!$this->_isFrei($slot_start, $slot_end, $verplante_tages_events, $grp->lehrverband_gruppen_bezeichnung, 'lehrverband'))
-					continue;
-
-				$moegliche_slots[] = [
-					'isostart' => (new DateTime($slot_start))->format('c'),
-					'isoend' => (new DateTime($slot_end))->format('c'),
-					'marker_isoend' => (new DateTime($tag . ' ' . $start_stunde->ende))->format('c'),
-				];
-			}
-
-			$start_day = strtotime('+1 day', $start_day);
-		}
-
-
-		$slots = [];
-		foreach ($moegliche_slots as $slot)
-		{
-			$event_obj = (object) [
-				'kalender_id' => null,
-				'lehreinheit_id' => [$lehreinheit_id],
-				'isostart' => $slot['isostart'],
-				'isoend' => $slot['isoend'],
-			];
-
-			$raumkandidaten = $this->_getRaumkandidaten($event_obj);
-
-			if (empty($raumkandidaten))
-				continue;
-
-			$ratings = $this->_getRatings($verplante_events, $slot, $raumkandidaten, $lektor_uids, $grp->gruppen_kurzbz, $grp->lehrverband_gruppen_bezeichnung);
-			$best = $ratings[0];
-			$anzahl_weitere = count($ratings) - 1;
-
-			$slots[] = [
-				'isostart' => $slot['isostart'],
-				'isoend' => $slot['isoend'],
-				'marker_isoend' => $slot['marker_isoend'],
-				'rating' => $this->_scoreToRating($best['score']),
-				'label' => $anzahl_weitere > 0 ? $best['ort_kurzbz'] . ' (' . $best['score'] . ') + ' . $anzahl_weitere . ' weitere' : $best['ort_kurzbz'] . ' (' . $best['score'] . ')',
-				'raeume' => $ratings,
-			];
-		}
-		return success($slots);
-	}
-
-	private function _getZeitsperen($start_date, $end_date, $uids)
-	{
-
-		if (empty($uids)) return [];
-
-		if (($this->_ci->variablelib->getVar('ignore_kollision') === 'true') || ($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 <', $end_date);
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $start_date);
-
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-		$result = $this->_ci->ZeitsperreModel->load();
-
-		if (!hasData($result)) return [];
-
-		$events = [];
-		foreach (getData($result) as $row)
-		{
-			$von = new DateTime($row->vondatum . ' ' . ($row->von_beginn ?? '00:00'));
-			$bis = new DateTime($row->bisdatum . ' ' . ($row->bis_ende ?? '23:59'));
-
-			$events[] = (object)[
-				'isostart' => $von->format('c'),
-				'isoend' => $bis->format('c'),
-				'lektor' => [['mitarbeiter_uid' => $row->mitarbeiter_uid]]
-			];
-		}
-		return $events;
-	}
-
-	private function _getLehreinheitTeilnehmer($lehreinheit_id)
-	{
-		$lektoren_result = $this->_ci->LehreinheitMitarbeiterModel->loadWhere(['lehreinheit_id' => $lehreinheit_id]);
-		$lektor_data = [];
-		if (hasData($lektoren_result))
-		{
-			$lektor_data = getData($lektoren_result);
-		}
-
-		$gruppen_result = $this->_ci->LehreinheitgruppeModel->getByLehreinheit($lehreinheit_id);
-		$gruppen_data = [];
-		if (hasData($gruppen_result))
-		{
-			$gruppen_rows = getData($gruppen_result);
-
-			foreach ($gruppen_rows as $gruppe)
-			{
-				$gruppen_data[] = (array) $gruppe;
-			}
-		}
-
-
-		return (object)[
-			'lektor_data' => $lektor_data,
-			'gruppen_data' => $gruppen_data,
-		];
-
-	}
-
-	private function _splitGruppen($gruppen_data)
-	{
-		$gruppen_kurzbz = array_values(array_filter(array_column($gruppen_data, 'gruppe_kurzbz')));
-		$lehrverband_gruppen = array_values(array_filter($gruppen_data, function($gruppe)
-		{
-			return empty($gruppe['gruppe_kurzbz']);
-		}));
-		$lehrverband_gruppen_bezeichnung = array_column($lehrverband_gruppen, 'bezeichnung');
-
-		return (object)[
-			'gruppen_kurzbz' => $gruppen_kurzbz,
-			'lehrverband_gruppen' => $lehrverband_gruppen,
-			'lehrverband_gruppen_bezeichnung' => $lehrverband_gruppen_bezeichnung
-		];
-
-	}
-	//TODO (david) umbauen auf CollisionChecks
-	private function _isFrei($slot_start, $slot_end, $events, $check_array, $type)
-	{
-		if (empty($check_array)) return true;
-
-		$slot_start_ts = strtotime($slot_start);
-		$slot_end_ts = strtotime($slot_end);
-
-		foreach ($events as $event)
-		{
-			$event_start_ts = strtotime($event->isostart);
-			$event_end_ts = strtotime($event->isoend);
-
-			if ($event_end_ts <= $slot_start_ts || $event_start_ts >= $slot_end_ts)
-				continue;
-
-			$event_uids = $this->_getIds($event, $type);
-
-			if (!empty(array_intersect($event_uids, $check_array)))
-				return false;
-		}
-
-		return true;
-	}
-
-	private function _scoreToRating($score)
-	{
-		if ($score >= 90)
-			return 'good';
-		if ($score >= 60)
-			return 'mid';
-		return 'bad';
-	}
-	private function _getVorschlaegeForEvent($event)
-	{
-		$raumkandidaten = $this->_getRaumkandidaten($event);
-		if (empty($raumkandidaten)) return [];
-
-		$lektor_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		$grp = $this->_splitGruppen($event->gruppe);
-
-		$tages_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$event->datum,
-			$event->datum,
-			$lektor_uids,
-			$grp->gruppen_kurzbz,
-			$grp->lehrverband_gruppen
-		);
-
-		return $this->_getRatings($tages_events, $event, $raumkandidaten, $lektor_uids, $grp->gruppen_kurzbz, $grp->lehrverband_gruppen_bezeichnung);
-	}
-	private function _getRatings($events, $event, $raumkandidaten, $lektor_uids, $gruppen_kurzbz, $lehrverband_gruppen_bezeichnung)
-	{
-		$event = (object)$event;
-		$lektor_davor = $this->_getEventDavor($events, $event->isostart, $lektor_uids, 'lektor');
-		$gruppen_davor = $this->_getEventDavor($events, $event->isostart, $gruppen_kurzbz, 'gruppe');
-		$lehrverband_davor = $this->_getEventDavor($events, $event->isostart, $lehrverband_gruppen_bezeichnung, 'lehrverband');
-
-		$lektor_davor_ort = $lektor_davor ? $this->_getOrtDetails($lektor_davor->ort_kurzbz) : null;
-		$gruppen_davor_ort = $gruppen_davor ? $this->_getOrtDetails($gruppen_davor->ort_kurzbz) : null;
-		$lehrverband_davor_ort = $lehrverband_davor ? $this->_getOrtDetails($lehrverband_davor->ort_kurzbz) : null;
-
-		$unique = [];
-
-		foreach ($raumkandidaten as $raum)
-		{
-			$unique[$raum->ort_kurzbz] = $raum;
-		}
-
-		$kandidaten = array_values($unique);
-
-
-		$ratings = [];
-		foreach ($kandidaten as $raum)
-		{
-			$rating = ['ort_kurzbz' => $raum->ort_kurzbz, 'score' => 100, 'details' => [],
-				'raumtyp_kurzbz' => $raum->raumtyp_kurzbz, 'max_person' => $raum->max_person];
-			$this->_rateLektor($rating, $raum, $lektor_davor_ort);
-			$this->_rateGruppen($rating, $raum, $gruppen_davor_ort);
-			$this->_rateGruppen($rating, $raum, $lehrverband_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;
-
-			$event_uids = $this->_getIds($event, $type);
-
-			if (empty(array_intersect($event_uids, $uids)))
-				continue;
-
-			if ($kandidat === null || $event->isoend > $kandidat->isoend)
-				$kandidat = $event;
-		}
-
-		return $kandidat;
-	}
-
-	private function _getIds($event, $type)
-	{
-		$event_uids = array();
-
-		if ($type === 'lektor')
-			$event_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		else if ($type === 'gruppe')
-			$event_uids = array_column($event->gruppe, 'gruppe_kurzbz');
-		else if ($type === 'lehrverband')
-			$event_uids = array_column($event->gruppe, 'bezeichnung');
-
-		return $event_uids;
-	}
-
-	private function _getRaumkandidaten($event)
-	{
-		$raumtyp = null;
-		$raumtypalternativ = null;
-
-		if (!empty($event->lehreinheit_id))
-		{
-			$lehreinheit = $this->_ci->LehreinheitModel->load($event->lehreinheit_id[0]);
-			if (hasData($lehreinheit))
-			{
-				$lehreinheit = getData($lehreinheit)[0];
-				$raumtyp = $lehreinheit->raumtyp ?? null;
-				$raumtypalternativ = $lehreinheit->raumtypalternativ ?? null;
-			}
-		}
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender_ort.ort_kurzbz');
-		$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);
-		if (!is_null($event->kalender_id))
-		{
-			$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $event->kalender_id);
-		}
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['deleted', 'to_delete', 'to_delete_live', 'to_delete_preview', 'archived']);
-		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz IS NOT NULL', null, false);
-		$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
-		);
-
-		$belegte = $this->_ci->KalenderModel->load();
-
-		$belegte_orte = hasData($belegte) ? array_column(getData($belegte), 'ort_kurzbz') : [];
-
-		if (empty($raumtyp))
-		{
-			$raeume = $this->_getFreieRaeume(null, $belegte_orte);
-			return hasData($raeume) ? getData($raeume) : [];
-		}
-
-		$vorschlaege = [];
-
-		$raeume = $this->_getFreieRaeume($raumtyp, $belegte_orte);
-		if (hasData($raeume))
-			$vorschlaege = getData($raeume);
-
-		if (count($vorschlaege) < 5 && !empty($raumtypalternativ))
-		{
-			$bereits_gefunden = array_merge($belegte_orte, array_column($vorschlaege, 'ort_kurzbz'));
-			$alternativ = $this->_getFreieRaeume($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, max_person, raumtyp_kurzbz');
-		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
-
-		if (!empty($raumtyp))
-			$this->_ci->OrtModel->db->where('raumtyp_kurzbz', $raumtyp);
-		else
-			$this->_ci->OrtModel->db->where('reservieren', true);
-
-		$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

@@ -116,6 +116,7 @@ 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;
@@ -391,6 +392,39 @@ 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;
+
 		}
 	}
 
@@ -486,6 +520,212 @@ 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

@@ -1,312 +0,0 @@
-<?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->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
-		$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)) return [];
-		if (empty($data->kalender_id) && empty($data->lehreinheit_id) && empty($data->uids)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		if (!empty($data->kalender_id))
-			$uids = $this->_getUids($data->kalender_id);
-		else if (!empty($data->lehreinheit_id))
-			$uids = $this->_getUidsFromLehreinheit($data->lehreinheit_id);
-		else
-			$uids = $data->uids;
-
-		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('tbl_kalender.kalender_id, current_lehreinheit_ma.mitarbeiter_uid, other_kalender.von, other_kalender.kalender_id as other_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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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][] = [
-					'message' => $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid,
-					'kalender_id' => $row->other_kalender_id,
-					'datum' => $row->von,
-				];
-			}
-		}
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id, current_lehreinheit_ma.mitarbeiter_uid, other_kalender.von, other_kalender.kalender_id as other_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', 'to_delete_live', 'to_delete_preview']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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][] = [
-					'message' => $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->mitarbeiter_uid,
-					'kalender_id' => $row->other_kalender_id,
-					'datum' => $row->von,
-				];
-			}
-		}
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id, z.mitarbeiter_uid, tbl_kalender.von');
-		$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->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-		$result = $this->_ci->KalenderModel->load();
-
-
-		if (!isError($result) && hasData($result))
-		{
-			foreach (getData($result) as $row)
-			{
-				$grouped[$row->kalender_id][] = [
-					'message' => $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid,
-				];
-			}
-		}
-
-		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 _getUidsFromLehreinheit($lehreinheit_id)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$uids = array_column(getData($result), 'mitarbeiter_uid');
-		$uids = array_diff(array_filter($uids), $kollisionsfreie_user);
-
-		return array_values(array_unique($uids));
-	}
-
-	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);
-		if (!empty($data->kalender_id))
-			$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', 'to_delete_live', 'to_delete_preview'));
-		$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);
-		if (!empty($data->kalender_id))
-			$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', 'to_delete_live', 'to_delete_preview'));
-		$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/ResourcesCollisionCheck.php

@@ -1,94 +0,0 @@
-<?php
-
-class ResourcesCollisionCheck 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 'resources';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->betriebsmittel_ids, $data->von, $data->bis)) return [];
-
-		if (empty($data->betriebsmittel_ids)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-		if ($this->_ci->variablelib->getVar('ignore_resources_collisions') === 'true') return [];
-
-		$this->_ci->KalenderModel->addSelect('kalender_id, von, bis, bm.beschreibung AS betriebsmittel_beschreibung');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender bk', 'bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
-		$this->_ci->KalenderModel->addJoin('wawi.tbl_betriebsmittel bm', 'bm.betriebsmittel_id = bk.betriebsmittel_id');
-
-		if (!empty($data->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', 'to_delete_live', 'to_delete_preview']);
-		$this->_ci->KalenderModel->db->where_in('bk.betriebsmittel_id', $data->betriebsmittel_ids);
-
-
-		$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' => 'resource_collision',
-				'message' => $this->_ci->phraseslib->t('ui', 'resource_collision') . ': ' . $row->betriebsmittel_beschreibung . ' (' . 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_betriebsmittel_kalender current_bk', 'current_bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender other_bk', 'other_bk.betriebsmittel_id = current_bk.betriebsmittel_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.eindeutige_kalender_gruppen_id = other_bk.eindeutige_kalender_gruppen_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', 'to_delete_live', 'to_delete_preview']);
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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/RoomCollisionCheck.php

@@ -1,94 +0,0 @@
-<?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) || 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');
-
-		if (!empty($data->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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$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('tbl_kalender.kalender_id, current_ort.ort_kurzbz, other_kalender.von, other_kalender.kalender_id as other_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', array('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview'));
-
-		$this->_ci->KalenderModel->db->group_start();
-		$where_ids_chunks = array_chunk($kalender_ids,25);
-		foreach($where_ids_chunks as $where_ids)
-		{
-			$this->_ci->KalenderModel->db->or_where_in('tbl_kalender.kalender_id', $where_ids);
-		}
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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][] = [
-				'message' => $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz,
-				'kalender_id' => $row->other_kalender_id,
-				'datum' => $row->von,
-			];
-		}
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -1,290 +0,0 @@
-<?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)) return [];
-		if (!isset($data->kalender_id) && !isset($data->lehreinheit_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();
-
-		if (isset($data->kalender_id))
-		{
-			$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)
-	";
-
-			$qry_1_param = $data->kalender_id;
-		}
-		else
-		{
-			$qry1 = "
-				SELECT DISTINCT tbl_benutzergruppe.uid
-				FROM lehre.tbl_lehreinheit
-				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_lehreinheit.lehreinheit_id = ?
-					AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-
-				UNION ALL
-
-				SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
-				FROM lehre.tbl_lehreinheit
-				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_lehreinheit.lehreinheit_id = ?
-					AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-        ";
-
-			$qry_1_param = $data->lehreinheit_id;
-		}
-
-		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
-			[$qry_1_param],
-			$kollisionsfreie_user,
-			[$qry_1_param],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result1) || !hasData($result1)) return [];
-
-		$curUids = array_flip(array_column(getData($result1), 'uid'));
-
-		$exclude_kalender = isset($data->kalender_id) ? "AND tbl_kalender.kalender_id != ?" : "";
-		$exclude_kalender_param = isset($data->kalender_id) ? [$data->kalender_id] : [];
-
-		$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 > ?
-				$exclude_kalender
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-				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 > ?
-				$exclude_kalender
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-				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], $exclude_kalender_param, $kollisionsfreie_user,
-			[$data->bis, $data->von], $exclude_kalender_param, $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, other_kalender.von, other_kalender.kalender_id as other_kalender_id
-			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', 'to_delete_live', 'to_delete_preview')
-				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, other_kalender.von, other_kalender.kalender_id as other_kalender_id
-			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', 'to_delete_live', 'to_delete_preview')
-				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][] = [
-				'message' => $this->_ci->phraseslib->t('ui', 'student_kollision') . ': ' . $row->uid,
-				'kalender_id' => $row->other_kalender_id,
-				'datum' => $row->von,
-			];
-		}
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -1,426 +0,0 @@
-<?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)) return [];
-		if (!isset($data->kalender_id) && !isset($data->lehreinheit_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 (!isset($data->kalender_id)) $kollision_reservierung = false;
-
-		if (!$kollision_student && !$kollision_reservierung) return [];
-
-		$dbModel = new DB_Model();
-		$collisions = [];
-
-		$group_matching_qry = "
-			(
-				(
-					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
-					)
-				)
-			)
-		";
-
-		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'
-				";
-			}
-
-			$other_lehreinheitgruppe_subquery = "
-				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 ."
-        ";
-
-			if (isset($data->kalender_id))
-			{
-				$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 (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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 (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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', 'to_delete_live', 'to_delete_preview')
-					AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-					AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-					AND ". $group_matching_qry ."
-					AND other_kalender.kalender_id NOT IN (
-						SELECT vorgaenger_kalender_id
-						FROM lehre.tbl_kalender
-						WHERE vorgaenger_kalender_id IS NOT NULL
-					)
-            ";
-
-				$params = [$data->bis, $data->von, $data->kalender_id];
-			}
-			else
-			{
-				$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_lehreinheitgruppe current_lehreinheitguppe
-					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.von < ?
-						AND other_kalender.bis > ?
-	
-					JOIN (
-						". $other_lehreinheitgruppe_subquery ."
-					) 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_lehreinheitguppe.lehreinheit_id = ?
-					AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-					AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-					AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-					AND ". $group_matching_qry ."
-					AND other_kalender.kalender_id NOT IN (
-						SELECT vorgaenger_kalender_id
-						FROM lehre.tbl_kalender
-						WHERE vorgaenger_kalender_id IS NOT NULL
-					)
-				";
-
-				$params = [$data->bis, $data->von, $data->lehreinheit_id];
-			}
-
-			$result = $dbModel->execReadOnlyQuery($sql_gruppen, $params);
-
-			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', 'to_delete_live', 'to_delete_preview')
-				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,
-				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,
-					other_kalender.von, other_kalender.kalender_id as other_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
-	
-			LEFT JOIN public.tbl_studiengang stg
-				ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-			WHERE current_kalender.kalender_id IN ({$placeholders})
-			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete', 'to_delete_live', 'to_delete_preview')
-			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][] = [
-				'message' => $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname,
-				'kalender_id' => $row->other_kalender_id,
-				'datum' => $row->von,
-			];
-		}
-
-		return $grouped;
-	}
-
-}

application/libraries/treemenu/TempusLib.php

@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Tempus Menu library
- */
-class TempusLib
-{
-	protected $_ci = null;
-
-	public $config = [];
-
-	public function __construct()
-	{
-		// Get code igniter instance
-		$this->_ci =& get_instance();
-
-		// Load Tree-config
-		$this->_ci->load->config('treemenu/custom/tempus');
-		$this->config = $this->_ci->config->item('root');
-
-		// Load Libraries
-		$this->_ci->load->library('treemenu/base/StgLib');
-
-		// Load Model
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function stg($path_template)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return [];
-
-		return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
-	}
-
-	public function semester($path_template, $has_children, $stg)
-	{
-
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$has_children)
-			$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz);
-	}
-
-	public function verband($path_template, $stg, $semester)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
-		$this->_ci->StudiengangModel->addGroupBy('v.studiengang_kz, v.semester');
-
-
-		return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester);
-	}
-
-	public function group($path_template, $stg, $semester, $verband)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		if ($verband === null) {
-			$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
-			$this->_ci->GruppeModel->addSelect('semester');
-
-			return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester);
-		}
-
-
-		return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband);
-	}
-
-	public function orgform($path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$stg->mischform)
-			return [];
-		
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		$this->_ci->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-		$this->_ci->StudienordnungModel->addSelect("p.orgform_kurzbz");
-
-		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
-	}
-
-	protected function getPermittedStudiengangKzs()
-	{
-		$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/lvplan') ?: []);
-		return $permittedStgs;
-	}
-
-	protected function getStgFromUrl($stg)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return null;
-
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
-		$stg = $this->_ci->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => $stg
-		]);
-
-		if (!hasData($stg))
-			return null;
-
-		return current(getData($stg));
-	}
-}

application/models/codex/Mobilitaet_model.php

@@ -11,4 +11,73 @@ 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/content/News_model.php

@@ -20,14 +20,16 @@ class News_model extends DB_Model
 	public function getAll($limit = null)
 	{
 		$this->addJoin("campus.tbl_content","content_id");
+
 		return $this->execReadOnlyQuery('
 			SELECT *, TO_CHAR(campus.tbl_news.datum, ?) as datumformatted
 			FROM campus.tbl_news
 			JOIN campus.tbl_content content ON content.content_id = campus.tbl_news.content_id
-			WHERE
+			WHERE 
 			--text IS NOT NULL AND 	
-			datum <= NOW() AND (datum_bis IS NULL OR datum_bis >= now()::date)
-			ORDER BY datum DESC
+			datum <= NOW() AND (datum_bis >= NOW()::date OR datum_bis IS NULL) AND
+			(NOW()-datum) < interval \'' . MAXNEWSALTER . ' days\'
+			ORDER BY datum DESC, campus.tbl_news.updateamum DESC
 			LIMIT ' . $this->escape($limit)
 		, ['DD/MM/YYYY']);
 	}
@@ -48,31 +50,28 @@ class News_model extends DB_Model
 	 * @param integer | null    $semester
 	 * @param string            $fachbereich_kurzbz
 	 * @param boolean           $sichtbar
-	 * @param integer           $maxalter
 	 * @param integer           $page
 	 * @param integer           $page_size
-	 * @param boolean           $all
+	 * @param boolean           $active
 	 * @param boolean           $mischen
 	 * 
 	 * TODO(chris): this is not a good function -> the params are all over the place
 	 * 
 	 */
-	protected function prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	protected function prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $page = 1, $page_size = 10, $active = true, $mischen = true, $filterForDegreePrograms = false, $allowedDegreePrograms = [])
 	{
 
+		$this->addSelect(["*", "COUNT(*) OVER() AS row_count"]);
 		$this->addOrder('datum', 'DESC');
+		$this->addOrder('tbl_news.updateamum', 'DESC');
 
 		$studiengang_kz = trim($studiengang_kz);
 		$fachbereich_kurzbz = trim($fachbereich_kurzbz);
 
 		$where = [];
-		if (trim($maxalter) != '0') {
-			$where[] = "(now()-datum) < interval " . $this->db->escape($maxalter) . " days";
-
-		}
-		if (!$all) {
-			$where[] = "datum <= now()";
-			$where[] = "(datum_bis >= now()::date OR datum_bis IS NULL)";
+		
+		if ($active) {
+			$where[] = "(datum <= NOW()::date AND (datum_bis >= NOW()::date OR (datum_bis IS NULL AND (NOW()-datum) < interval '" . MAXNEWSALTER . " days')))";
 		}
 		if ($fachbereich_kurzbz != '*') {
 			if ($fachbereich_kurzbz == '') {
@@ -82,27 +81,54 @@ class News_model extends DB_Model
 
 			}
 		}
-		if ($studiengang_kz == '0') {
-			$where[] = "studiengang_kz = " . $this->db->escape($studiengang_kz);
 
-			if ($semester === NULL)
-				$where[] = "semester IS NULL";
-			elseif ($semester === 0)
-				$where[] = "semester = 0";
-		} elseif ($studiengang_kz != '') {
-			$add = $mischen === true ? " OR (studiengang_kz = 0 AND semester IS NULL)" : "";
-			$where[] = "((studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = " . $this->db->escape($semester) . ") OR (studiengang_kz = " . $this->db->escape($studiengang_kz) . " AND semester = 0) OR (studiengang_kz = 0 AND semester = " . $this->db->escape($semester) . ")" . $add . ")";
+		$sgAndSemesterCondition = [];
 
+		if ($studiengang_kz !== '') {
+			$sgAndSemesterCondition[] = 'studiengang_kz = ' . $this->db->escape($studiengang_kz);
 		}
+		if ($semester !== null && $semester !== 0) {
+			$sgAndSemesterCondition[] = 'semester = ' . $this->db->escape($semester);
+		}
+
+		$targetedSgAndSemesterCondition = [];
+
+		if (!empty($sgAndSemesterCondition)) {
+			$targetedSgAndSemesterCondition[] = '(' . implode(' AND ', $sgAndSemesterCondition) . ')';
+		}
+		if ($mischen === true) {
+			$targetedSgAndSemesterCondition[] = '(studiengang_kz = 0 AND (semester = 0 OR semester IS NULL))';
+
+			if ($semester !== null && $semester !== 0) {
+				$targetedSgAndSemesterCondition[] = '(studiengang_kz = 0 AND semester = ' . $this->db->escape($semester) . ')';
+			}
+		}
+
+		$finalSgAndSemesterCondition = implode(' OR ', $targetedSgAndSemesterCondition);
+
+		if ($finalSgAndSemesterCondition !== '') {
+			$where[] = "(" . $finalSgAndSemesterCondition . ")";
+		}
+
 		$this->addJoin('campus.tbl_contentsprache cs', 'content_id');
 
-		$where[] = "cs.sichtbar = " . ($sichtbar ? "true" : "false");
+		if (is_bool($sichtbar) || $sichtbar === 'true' || $sichtbar === 'false') {
+			$isSichtbar = filter_var($sichtbar, FILTER_VALIDATE_BOOLEAN);
+			$where[] = "cs.sichtbar = " . ($isSichtbar ? "true" : "false");
+		}
 
 		$where[] = "cs.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END)";
 
 
 		$where[] = "cs.version = (SELECT MAX(version) FROM campus.tbl_contentsprache cs3 WHERE cs3.content_id=" . $this->dbTable . ".content_id AND cs3.sprache = (CASE WHEN EXISTS(SELECT 1 FROM campus.tbl_contentsprache cs2 WHERE cs2.content_id=" . $this->dbTable . ".content_id AND sprache=" . $this->db->escape($sprache) . ") THEN " . $this->db->escape($sprache) . " ELSE " . $this->db->escape(DEFAULT_LANGUAGE) . " END))";
 
+		if ($filterForDegreePrograms) {
+			if (empty($allowedDegreePrograms)) {
+				$where[] = "1=0";
+			} else {
+				$where[] = "studiengang_kz IN (" . implode(',', array_map([$this->db, 'escape'], $allowedDegreePrograms)) . ")";
+			}
+		}
 
 		$where = implode(" AND ", $where);
 
@@ -110,25 +136,16 @@ class News_model extends DB_Model
 
 	}
 
-	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
+	public function getNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $page = 1, $page_size = 10, $active = true, $mischen = true, $filterForDegreePrograms = false, $allowedDegreePrograms = [])
 	{
-		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
-
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $page, $page_size, $active, $mischen, $filterForDegreePrograms, $allowedDegreePrograms);
 		// getting the number of rows of the query and adding pagination to the query result
 		$num_rows = $this->getNumRows(true);
 		$this->addPagination($page, $page_size, $num_rows);
 
 		// preparing the query again because every call to get_compiled_select or cour_all_results will add the from clause to the query
-		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
+		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $page, $page_size, $active, $mischen, $filterForDegreePrograms, $allowedDegreePrograms);
 
 		return $this->load();
 	}
-
-	public function countNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz = null, $sichtbar = true, $maxalter = 0, $page = 1, $page_size = 10, $all = false, $mischen = true)
-	{
-		$this->prepareNewsWithContent($sprache, $studiengang_kz, $semester, $fachbereich_kurzbz, $sichtbar, $maxalter, $page, $page_size, $all, $mischen);
-		return $this->getNumRows();
-	}
-
-
 }

application/models/crm/Prestudent_model.php

@@ -88,6 +88,30 @@ class Prestudent_model extends DB_Model
 		return $this->execQuery($query, $parametersArray);
 	}
 
+	/**
+	 * Gets the Studiengang and current Ausbildungssemester for every
+	 * Prestudent belonging to the same person as the student.
+	 *
+	 * @param string $student_uid
+	 * @return stdClass
+	 */
+	public function getStudiengaengAndAusbildungssemesterByStudentUid($student_uid)
+	{
+		$query = 'SELECT p.studiengang_kz,
+						 (
+							SELECT ps.ausbildungssemester
+							  FROM public.tbl_prestudentstatus ps
+							 WHERE ps.prestudent_id = p.prestudent_id
+						  ORDER BY ps.datum DESC, ps.insertamum DESC, ps.ext_id DESC
+							 LIMIT 1
+						 ) AS ausbildungssemester
+					FROM public.tbl_student s
+					JOIN public.tbl_prestudent p USING (prestudent_id)
+				   WHERE s.student_uid = ?';
+
+		return $this->execQuery($query, array($student_uid));
+	}
+
 	/**
 	 * updateAufnahmegruppe
 	 */

application/models/education/Abschlusspruefung_model.php

@@ -100,12 +100,14 @@ 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,4 +52,53 @@ 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

@@ -840,4 +840,69 @@ 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]);
+	}
+
+	public function getLehrenheitenBySemester($uid, $semester)
+	{
+		$query = "SELECT
+			tbl_lehreinheit.lehreinheit_id,
+			lehrfach.kurzbz as lehrfach,
+			tbl_lehreinheit.lehrform_kurzbz as lehrform,
+			tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+			(SELECT kurzbz FROM public.tbl_mitarbeiter
+			WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor,
+			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kurzbz,
+			tbl_lehrveranstaltung.semester as lv_semester,
+			tbl_lehreinheit.raumtyp,
+			tbl_lehreinheit.raumtypalternativ,
+			tbl_lehreinheit.stundenblockung,
+			tbl_lehreinheit.wochenrythmus,
+			tbl_lehreinheitmitarbeiter.semesterstunden as semesterstunden,
+			tbl_lehreinheit.start_kw,
+			lvangebot.anmeldefenster_start,
+			lvangebot.anmeldefenster_ende,
+			tbl_lehrveranstaltung.lehrveranstaltung_id
+		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)
+			LEFT JOIN lehre.tbl_lvangebot as lvangebot ON(tbl_lehrveranstaltung.lehrveranstaltung_id=lvangebot.lehrveranstaltung_id)
+		WHERE
+			tbl_lehreinheit.studiensemester_kurzbz = '$semester'
+			AND mitarbeiter_uid = '$uid'
+		ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
+
+		return $this->execReadOnlyQuery($query);
+	}
+
+	public function getGroupsByLehreinheit($lehreinheitId)
+	{
+		$query = "SELECT *
+		FROM lehre.tbl_lehreinheitgruppe
+		WHERE lehreinheit_id='$lehreinheitId'";
+
+		return $this->execReadOnlyQuery($query);
+	}
 }

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
+			tbl_student.prestudent_id, campus.vw_student_lehrveranstaltung.lehreinheit_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -1379,4 +1379,114 @@ 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]);
+	}
+
+	/**
+	 * All Lehrveranstaltungen of a Studiengang offered in a Studiensemester.
+	 */
+	public function getLvForStudiengangInSemester($sem_kurzbz, $studiengang_kz) {
+		$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,
+				tbl_lehrveranstaltung.orgform_kurzbz as orgform
+			FROM
+				lehre.tbl_lehrveranstaltung JOIN public.tbl_studiengang USING(studiengang_kz)
+			WHERE
+				tbl_lehrveranstaltung.studiengang_kz = ?
+			  AND tbl_lehrveranstaltung.aktiv = TRUE
+			  AND EXISTS (
+					SELECT 1 FROM lehre.tbl_lehreinheit le
+					WHERE le.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+					  AND le.studiensemester_kurzbz = ?
+			  )
+			ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
+
+		return $this->execReadOnlyQuery($qry, array($studiengang_kz, $sem_kurzbz));
+	}
+
+	/**
+	 * Number of Lehreinheit assignments the given mitarbeiter has for a Lehrveranstaltung (i.e. whether
+	 * they teach it), optionally restricted to a Studiensemester. Returns a single row with a `teaches`
+	 * count - check `teaches > 0`. Used to scope teacher access in the Benotungstool to their own LVs.
+	 */
+	public function getLektorIsTeachingLva($lva_id, $ma_uid, $studiensemester_kurzbz = null)
+	{
+		$params = array($lva_id, $ma_uid);
+		$query = "SELECT COUNT(*) AS teaches
+				FROM lehre.tbl_lehreinheitmitarbeiter
+					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+				WHERE lehrveranstaltung_id = ? AND mitarbeiter_uid = ?";
+		if ($studiensemester_kurzbz !== null && $studiensemester_kurzbz !== '') {
+			$query .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		return $this->execReadOnlyQuery($query, $params);
+	}
 }

application/models/education/Lvgesamtnote_model.php

@@ -14,7 +14,7 @@ class Lvgesamtnote_model extends DB_Model
 	}
 
 	/**
-	 * Laedt die Noten
+	 * Laedt die Noten - lvgesamtnote (Vorschlag) JOIN tbl.note (zeugnisnote)
 	 *
 	 * @param integer				$lehrveranstaltung_id
 	 * @param string				$student_uid
@@ -50,4 +50,19 @@ 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,12 +11,33 @@ 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

@@ -13,7 +13,7 @@ class Notenschluesselaufteilung_model extends DB_Model
 	}
 
 	/**
-	 * Liefert die Note zu Punkten einer Lehrveranstaltung
+	 * Gives the grade for the points of a course.
 	 *
 	 * @param number					$points
 	 * @param integer					$lehrveranstaltung_id
@@ -23,9 +23,18 @@ class Notenschluesselaufteilung_model extends DB_Model
 	 */
 	public function getNote($points, $lehrveranstaltung_id, $studiensemester_kurzbz)
 	{
+		// Without a valid points value you cannot derive a grade. Without this guard the query
+		// builder makes a bad statement from "punkte <=" => null ('punkte' < 'IS' 'NULL'). The
+		// request then fails with HTTP 500 instead of an answer that says "no grade".
+		if (!is_numeric($points))
+			return success(null);
+
 		$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

@@ -60,6 +60,172 @@ 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_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_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,8 +23,10 @@ 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,
+					pa.*, tbl_projekttyp.bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					tbl_sprache.bezeichnung[".$sprache_index."] AS sprache_bezeichnung,
 					pa.studiensemester_kurzbz, pa.lehrveranstaltung_id,
 					tbl_firma.name AS firma_name,
 					(
@@ -43,6 +45,7 @@ class Projektarbeit_model extends DB_Model
 					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 					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,4 +306,5 @@ class Pruefung_model extends DB_Model
 
 		return $this->loadWhereCommitteeExamsFailed();
 	}
+	
 }

application/models/education/Studentlehrverband_model.php

@@ -14,101 +14,4 @@ class Studentlehrverband_model extends DB_Model
 
 		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
-
-	public function getAnzahl($studiengang_kz, $semester, $verband, $gruppe, $gruppe_kurzbz, $studiensemester_kurzbz, $lehreinheit_id, $mitschwund)
-	{
-
-		if ($semester === '')
-			return null;
-
-		$params = array();
-
-		if (is_null($gruppe_kurzbz))
-		{
-			$qry = "SELECT COUNT(*) as anzahl 
-					FROM public.tbl_studentlehrverband
-					WHERE studiensemester_kurzbz = ?
-						AND studiengang_kz = ?
-						AND semester = ?
-			";
-			$params = array($studiensemester_kurzbz, $studiengang_kz, $semester);
-
-			if (trim($verband) !== '')
-			{
-				$qry .= " AND trim(verband) = trim(?)";
-				$params[] = $verband;
-			}
-
-			if (trim($gruppe) !== '')
-			{
-				$qry .= " AND trim(gruppe) = trim(?)";
-				$params[] = $gruppe;
-			}
-
-			if ($mitschwund)
-			{
-				$qry .= " AND NOT EXISTS (
-							SELECT 1 FROM lehre.tbl_zeugnisnote
-							WHERE student_uid = tbl_studentlehrverband.student_uid
-								AND lehrveranstaltung_id = (
-									SELECT lehrveranstaltung_id
-									FROM lehre.tbl_lehreinheit
-									WHERE lehreinheit_id = ?
-								)
-							AND studiensemester_kurzbz = ?
-							AND note IN (" . $this->_getNichtzugelasseneNoten() . "))";
-				$params[] = $lehreinheit_id;
-				$params[] = $studiensemester_kurzbz;
-
-				$qry .= " AND get_rolle_prestudent(
-							(SELECT prestudent_id FROM public.tbl_student WHERE student_uid = tbl_studentlehrverband.student_uid), null) NOT IN ('Abbrecher', 'Unterbrecher')";
-			}
-		}
-		else
-		{
-			$qry = "SELECT COUNT(*) as anzahl
-					FROM public.tbl_benutzergruppe
-					WHERE studiensemester_kurzbz = ?
-						AND gruppe_kurzbz = ?";
-
-			$params = array($studiensemester_kurzbz, $gruppe_kurzbz);
-
-			if ($mitschwund)
-			{
-				$qry .= " AND NOT EXISTS(
-							SELECT 1 FROM lehre.tbl_zeugnisnote
-							WHERE student_uid = tbl_benutzergruppe.uid
-							AND lehrveranstaltung_id = (
-								SELECT lehrveranstaltung_id FROM lehre.tbl_lehreinheit
-								WHERE lehreinheit_id = ?
-							)
-							AND studiensemester_kurzbz = ?
-							AND note IN (" . $this->_getNichtzugelasseneNoten() . "))";
-
-				$params[] = $lehreinheit_id;
-				$params[] = $studiensemester_kurzbz;
-
-				$qry .= " AND get_rolle_prestudent(
-							(SELECT prestudent_id FROM public.tbl_student WHERE student_uid = tbl_benutzergruppe.uid), null) NOT IN ('Abbrecher', 'Unterbrecher')";
-			}
-		}
-
-		$result = $this->execReadOnlyQuery($qry, $params);
-
-		if (isError($result))
-			return error($result);
-
-		return hasData($result) ? getData($result)[0]->anzahl : 0;
-	}
-
-	private function _getNichtzugelasseneNoten()
-	{
-		if (defined('NICHT_ZUGELASSENE') && NICHT_ZUGELASSENE !== null)
-		{
-			$notenArray = unserialize(NICHT_ZUGELASSENE);
-			return implode(", ", array_map('intval', $notenArray));
-		}
-		return '6';
-	}
-
 }

application/models/education/Studierendenantrag_model.php

@@ -515,4 +515,75 @@ class Studierendenantrag_model extends DB_Model
 		
 		return hasData($this->load());
 	}
+
+	/**
+	 * Loads all todos for a certain studiengangsleiter
+	 *
+	 * @param integer		$stg_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getOpenAntraegeForStgl($stg_kz)
+	{
+		$qry = "
+			 SELECT
+				studierendenantrag_id,
+				prestudent_id,
+				typ,
+				person.nachname,
+				person.vorname,
+				ps.studiengang_kz
+			FROM campus.tbl_studierendenantrag a
+			JOIN public.tbl_prestudent ps USING (prestudent_id)
+			JOIN public.tbl_person person USING (person_id)
+			WHERE studiengang_kz in ?
+			  AND (
+					(typ IN ('Abmeldung', 'AbmeldungStgl', 'Unterbrechung')
+					 AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Erstellt')
+				  OR
+					(typ = 'Wiederholung'
+					 AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Lvszugewiesen')
+				  )
+			ORDER BY typ;
+			";
+
+		$params = array($stg_kz);
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Lists all open antraege for a certain stg
+	 *
+	 * @param Array	$stg_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getOpenAntraegeForAss($stg_kz)
+	{
+		$qry = "
+		 SELECT
+			 UPPER(stg.typ) || UPPER(stg.kurzbz) || ' ' || stg.bezeichnung AS studiengang,
+			 COUNT(*) AS anzahl
+		FROM campus.tbl_studierendenantrag
+		JOIN public.tbl_prestudent p USING (prestudent_id)
+		JOIN public.tbl_studiengang stg ON p.studiengang_kz=stg.studiengang_kz
+		JOIN campus.tbl_studierendenantrag_status as s ON campus.get_status_id_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = studierendenantrag_status_id
+		JOIN campus.tbl_studierendenantrag_statustyp as st USING (studierendenantrag_statustyp_kurzbz)
+		WHERE   (
+		s.studierendenantrag_statustyp_kurzbz NOT IN('Zurueckgezogen', 'Genehmigt', 'Abgelehnt', 'EinspruchAbgelehnt', 'Abgemeldet', 'Pause', 'EmailVersandt')
+		OR    (
+		s.studierendenantrag_statustyp_kurzbz = 'Genehmigt'
+		AND tbl_studierendenantrag.typ = 'AbmeldungStgl'
+		  )
+		 )
+		AND p.studiengang_kz IN ?
+		GROUP BY studiengang
+		ORDER BY studiengang
+			"
+		;
+
+		$params = array($stg_kz);
+		return $this->execQuery($qry, $params);
+	}
+
 }

application/models/organisation/Gruppe_model.php

@@ -11,26 +11,4 @@ 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,29 +41,4 @@ 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/Studiengang_model.php

@@ -653,31 +653,42 @@ class Studiengang_model extends DB_Model
 	}
 
 	/**
+	 * Gets the Studiengang information. Without parameters it uses the Studiengang
+	 * of the logged in Student.
+	 *
+	 * @param int|null $studiengang_kz
+	 * @param int|null $semester used for the Jahrgangsvertretung
 	 * @return stdClass
 	 */
-	public function getStudiengangInfoForNews()
+	public function getStudiengangInfoForNews($studiengang_kz = null, $semester = null)
 	{
 
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
-		
-		$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
-		if (isError($student))
-			return error($student);
-		if (getData($student)) {
-			$student = current(getData($student));
-			$studiengang_kz = $student->studiengang_kz;
-			$semester = $student->semester;
+
+		if (is_null($studiengang_kz))
+		{
+			$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+			if (isError($student))
+				return error($student);
+			if (getData($student)) {
+				$student = current(getData($student));
+				$studiengang_kz = $student->studiengang_kz;
+				$semester = $student->semester;
+			}
 		}
-		
+
+		// users without a Student record get no information instead of an error
+		if (is_null($studiengang_kz))
+			return success(null);
+
 		$stg_obj = $this->load($studiengang_kz);
 		if(isError($stg_obj))
 			return error($stg_obj);
-		if(getData($stg_obj))
-		{
-			$stg_obj = current(getData($stg_obj));
-		}		
+		if(!hasData($stg_obj))
+			return error('Studiengang nicht gefunden');
+		$stg_obj = current(getData($stg_obj));
 
 		$stg_ltg = $this->getLeitungDetailed($stg_obj->studiengang_kz);
 		if (isError($stg_ltg))
@@ -886,6 +897,14 @@ class Studiengang_model extends DB_Model
 		return success($ass);
 	}
 	
+	public function getDegreePrograms() {
+		$query = "SELECT *
+				FROM public.tbl_studiengang
+				ORDER BY public.tbl_studiengang.kurzbzlang";
+
+		return $this->execReadOnlyQuery($query);
+	}
+
 	private function addEmailProperty(&$benutzerfunktionen) {
 		if(count($benutzerfunktionen) && defined('DOMAIN'))
 		{

application/models/organisation/Studienplan_model.php

@@ -59,6 +59,37 @@ 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

@@ -375,6 +375,30 @@ EOSQL;
 		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/person/Benutzerfunktion_model.php

@@ -319,6 +319,40 @@ class Benutzerfunktion_model extends DB_Model
         return $record;
 	}
 
+	/**
+	 * Get active Assistenz(en) of the user by UID.
+	 * @param $uid
+	 */
+	public function getSTGAssByUID($uid)
+	{
+		$query = '
+            SELECT
+                uid,
+                oe_kurzbz,
+                studiengang_kz,
+                typ,
+                tbl_studiengang.bezeichnung
+            FROM
+                public.tbl_benutzerfunktion
+                    JOIN public.tbl_studiengang USING (oe_kurzbz)
+            WHERE
+                funktion_kurzbz = \'ass\'
+              AND (datum_von IS NULL OR datum_von <= now())
+              AND (datum_bis IS NULL OR datum_bis >= now())
+              AND uid = ?
+            ORDER BY
+                oe_kurzbz
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		return $this->execQuery($query, $parameters_array);
+	}
+
 	function updateBenutzerfunktion($funktionJson)
     {
         $funktionJson['updatevon'] = getAuthUID();

application/models/ressource/BetriebsmittelKalender_model.php

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

application/models/ressource/Betriebsmittel_model.php

@@ -31,26 +31,4 @@ class Betriebsmittel_model extends DB_Model
 
 		return $this->execQuery($qry);
 	}
-
-	public function getSchedulableEntriesByDatetimeInterval($from, $to)
-	{
-		$qry = "SELECT
-					*
-				FROM
-					wawi.tbl_betriebsmittel
-				WHERE
-					verplanen=true
-					AND 
-				NOT EXISTS(
-					SELECT 1 FROM lehre.tbl_betriebsmittel_kalender
-					JOIN lehre.tbl_kalender ON tbl_kalender.eindeutige_kalender_gruppen_id = tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id
-					WHERE
-						betriebsmittel_id=tbl_betriebsmittel.betriebsmittel_id
-					AND tbl_kalender.von < ?
-					AND tbl_kalender.bis > ?
-				)";
-
-
-		return $this->execQuery($qry, array($to, $from));
-	}
 }

application/models/ressource/KalenderNotiz_model.php

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

application/models/ressource/Kalender_Event_Rolle_model.php

@@ -1,15 +0,0 @@
-<?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

@@ -1,16 +0,0 @@
-<?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

@@ -1,15 +0,0 @@
-<?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

@@ -1,15 +0,0 @@
-<?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

@@ -1,14 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?php
-class Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender';
-		$this->pk = 'kalender_id';
-	}
-
-	public function generateUniqueGroupId()
-	{
-		while (true) {
-			$uniqueGroupId = generateUUID();
-			$result = $this->loadWhere(['eindeutige_kalender_gruppen_id' => $uniqueGroupId]);
-			if (!hasData($result)) {
-				return $uniqueGroupId;
-			}
-		}
-	}
-}

application/models/ressource/Kalenderstatus_model.php

@@ -1,14 +0,0 @@
-<?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

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