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

# Conflicts:
#	application/models/education/Projektarbeit_model.php
#	public/js/apps/Cis/Cis.js
#	public/js/components/Cis/Compat.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php

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(

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';

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/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/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,367 @@
+<?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);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function update($zeitsperre_id)
+	{
+		//check if loggedin User is owner of the zeitsperre
+		$loggedInUser = getAuthUID();
+		$result = $this->ZeitsperreModel->load($zeitsperre_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$uid = current($data)->mitarbeiter_uid;
+
+		if($uid != $loggedInUser)
+			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
+
+		if(!$zeitsperre_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
+		}
+		//get current params
+		$array_update = [
+			'bezeichnung',
+			'vondatum',
+			'vonstunde',
+			'bisdatum',
+			'bisstunde',
+			//	'vonISO', //Timestamp für Stunde
+			//	'bisISO', //Timestamp für Stunde
+			'erreichbarkeit_kurzbz',
+			'vertretung_uid',
+			'zeitsperretyp_kurzbz',
+			'mitarbeiter_uid',
+		];
+		$post = $this->input->post();
+		$update = [];
+
+		foreach ($array_update as $prop)
+		{
+			if (array_key_exists($prop, $post))
+			{
+				$update[$prop] = $post[$prop];
+			}
+		}
+
+		// Validation
+		$rulesDefined = false;  //necessary, otherwise CI validation will always be triggered, even without rules
+		foreach ($update as $key => $val) {
+			switch ($key) {
+				case 'zeitsperretyp_kurzbz':
+					$this->form_validation->set_rules(
+						$key,
+						'Grund Zeitsperre',
+						'required',
+						['required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'Grund Zeitsperre'])]
+					);
+					$rulesDefined = true;
+					break;
+				case 'vondatum':
+					$this->form_validation->set_rules(
+						$key,
+						'VonDatum',
+						'required|is_valid_date',
+						[
+							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'VonDatum']),
+							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'VonDatum'])
+						]
+					);
+					$rulesDefined = true;
+					break;
+				case 'bisdatum':
+					$rules = 'required|is_valid_date';
+					if (array_key_exists('vondatum', $update)) {
+						$rules .= '|callback_check_von_bis_datum|callback_check_diff_intval';
+					}
+					$this->form_validation->set_rules(
+						$key,
+						'BisDatum',
+						$rules,
+						[
+							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'BisDatum']),
+							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'BisDatum']),
+							'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
+							'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
+						]
+					);
+					$rulesDefined = true;
+					break;
+			}
+		}
+
+		if ($rulesDefined && $this->form_validation->run() == false) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if(array_key_exists('vondatum', $post) || array_key_exists('bisdatum', $post))
+		{
+			$result = $this->ZeitsperreModel->load($zeitsperre_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$data = current($data);
+
+			$mitarbeiter_uid = array_key_exists('mitarbeiter_uid', $post) ? $update['mitarbeiter_uid'] : $data->mitarbeiter_uid;
+			$vondatum = array_key_exists('vondatum', $post) ? $update['vondatum'] : $data->vondatum;
+			$bisdatum = array_key_exists('bisdatum', $post) ? $update['bisdatum'] : $data->bisdatum;
+			$vonstunde = array_key_exists('vonstunde', $post) ? $update['vonstunde'] : $data->vonstunde;
+			$zeitsperretyp_kurzbz = array_key_exists('zeitsperretyp_kurzbz', $post) ? $update['zeitsperretyp_kurzbz'] : $data->zeitsperretyp_kurzbz;
+
+			$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			if(hasData($result))
+			{
+				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
+			}
+
+			//check if existing zeitaufzeichnung
+			if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
+			{
+				$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
+
+				if(hasData($result))
+					$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		if (!empty($update)) {
+			$update['updatevon'] = $loggedInUser;
+			$update['updateamum'] = date('c');
+			$result = $this->ZeitsperreModel->update($zeitsperre_id, $update);
+
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$this->terminateWithSuccess($data);
+		}
+		else
+			$this->terminateWithSuccess("no update");
+	}
+
+	public function delete($zeitsperre_id)
+	{
+
+		if (!is_numeric($zeitsperre_id) || (int)$zeitsperre_id <= 0)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if loggedin User is owner of the zeitsperre
+		$loggedInUser = getAuthUID();
+		$result = $this->ZeitsperreModel->load($zeitsperre_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$uid = current($data)->mitarbeiter_uid;
+
+		if($uid != $loggedInUser)
+			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ZeitsperreModel->delete(
+			array('zeitsperre_id' => $zeitsperre_id)
+		);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function check_von_bis_datum($bisdatum)
+	{
+		$vondatum = $this->input->post('vondatum');
+
+		return $vondatum <= $bisdatum;
+	}
+
+	public function check_diff_intval($bisdatum)
+	{
+		$vondatum = $this->input->post('vondatum');
+
+		// Intervall in days
+		$vonTs = strtotime($vondatum);
+		$bisTs = strtotime($bisdatum);
+
+		$tage = ($bisTs - $vonTs) / 86400;
+
+		// if intervall > 14
+		return $tage <= 14;
+	}
+
+
+}

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

@@ -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/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/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/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/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/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/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/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/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/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/Ort_model.php

@@ -12,6 +12,12 @@ class Ort_model extends DB_Model
 		$this->pk = "ort_kurzbz";
 	}
 	
+	public function getRoomInfo($ortKurzbz)
+	{
+		$this->addSelect("ort_kurzbz, ausstattung");
+		return $this->OrtModel->loadWhere(array("ort_kurzbz" => $ortKurzbz));
+	}
+
 	public function getAll($raumtyp_kurzbz)
 	{
 		$this->addOrder("ort_kurzbz");

application/models/ressource/Reservierung_model.php

@@ -24,7 +24,7 @@ class Reservierung_model extends DB_Model
 		$lvplan_reservierungen_query = "SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/'),COALESCE(CAST(r.gruppe AS varchar),'/')) 
 			END as gruppen_kuerzel
 			FROM campus.vw_reservierung r
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=r.studiengang_kz
@@ -39,7 +39,7 @@ class Reservierung_model extends DB_Model
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'),COALESCE(CAST(res.gruppe AS varchar),'/')) 
 			END as gruppen_kuerzel
 			FROM campus.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
@@ -50,11 +50,12 @@ class Reservierung_model extends DB_Model
 
 		$query_result = $this->execReadOnlyQuery("
 		SELECT 
-		'reservierung' as type, beginn, ende, datum,
+		DISTINCT(insertvon),  
+		'reservierung' as type, beginn, ende, datum, array_agg(DISTINCT reservierung_id) AS reservierung_id,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		
+		array_agg(DISTINCT(uid)) as uids,
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
@@ -62,7 +63,7 @@ class Reservierung_model extends DB_Model
 			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
 		
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
@@ -82,7 +83,7 @@ class Reservierung_model extends DB_Model
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'),COALESCE(CAST(res.gruppe AS varchar),'/')) 
 			END as gruppen_kuerzel
 			FROM campus.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
@@ -94,11 +95,12 @@ class Reservierung_model extends DB_Model
 
 		$query_result = $this->execReadOnlyQuery("
 		SELECT 
-		'reservierung' as type, beginn, ende, datum,
+		DISTINCT(insertvon),  
+		'reservierung' as type, beginn, ende, datum, array_agg(DISTINCT reservierung_id) AS reservierung_id,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		
+		array_agg(DISTINCT(uid)) as uids,
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
@@ -106,7 +108,7 @@ class Reservierung_model extends DB_Model
 			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
 		
 		ORDER BY datum, beginn
 		", [$uid ?? getAuthUID(), $start_date, $end_date]);
@@ -146,4 +148,40 @@ class Reservierung_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, [$uid, $datum, $stunde]);
 	}
 
+	public function deleteReservation($reservierung_id) {
+		$uid = getAuthUID();
+
+		$result = $this->load($reservierung_id);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return error('Reservierung nicht gefunden');
+
+		$row = $result->retval[0];
+
+		if ($row->uid !== $uid && $row->insertvon !== $uid)
+			return error('Keine Berechtigung');
+
+		return $this->delete($reservierung_id);
+	}
+
+	public function getMyReservation() {
+		$uid = getAuthUID();
+		$date = date("Y-m-d",time());
+
+		$qry = "SELECT vw_reservierung.*, 
+					trim(COALESCE(vw_mitarbeiter.titelpre,'')||' '||COALESCE(vw_mitarbeiter.vorname,'')||' '||COALESCE(vw_mitarbeiter.nachname,'')||' '||COALESCE(vw_mitarbeiter.titelpost,'')) as reserviert_fuer,
+					trim(COALESCE(reserviert_von.titelpre,'')||' '||COALESCE(reserviert_von.vorname,'')||' '||COALESCE(reserviert_von.nachname,'')||' '||COALESCE(reserviert_von.titelpost,'')) as reserviert_von
+				FROM campus.vw_reservierung
+				JOIN campus.vw_mitarbeiter ON vw_reservierung.uid=vw_mitarbeiter.uid
+				LEFT JOIN campus.vw_mitarbeiter reserviert_von ON vw_reservierung.insertvon=reserviert_von.uid
+				WHERE datum >= ?
+ 				AND (vw_reservierung.uid= ? OR vw_reservierung.insertvon= ? )
+				ORDER BY  datum, titel, ort_kurzbz, stunde";
+		
+		return $this->execReadOnlyQuery($qry, [$date, $uid, $uid]);
+	}
+	
 }

application/models/ressource/Zeitsperre_model.php

@@ -12,6 +12,8 @@ class Zeitsperre_model extends DB_Model
 		$this->pk = 'zeitsperre_id';
 	}
 
+	const BLOCKIERENDE_ZEITSPERREN = ['Krank','Urlaub','ZA','DienstV','PflegeU','DienstF','CovidSB','CovidKS'];
+
     /**
      * Save or update Zeitsperre.
      *
@@ -62,6 +64,270 @@ class Zeitsperre_model extends DB_Model
         return $this->execQuery($qry);
     }
 
+	/**
+	 * get Zeitsperren of a user
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $bisgrenze @true show only entries of actual business year (1.9.- 31.8.)
+	 *
+	 * @return array
+	 */
+	public function getZeitsperrenUser($uid, $bisgrenze = true)
+	{
+		$qry = "
+  			SELECT
+			    tbl_zeitsperre.*, tbl_zeitsperretyp.*, tbl_erreichbarkeit.farbe  AS erreichbarkeit_farbe,
+  			    tbl_erreichbarkeit.beschreibung AS erreichbarkeit_beschreibung,
+            	CONCAT (ps.vorname, ' ', ps.nachname) as vertretung
+			FROM (campus.tbl_zeitsperre JOIN campus.tbl_zeitsperretyp USING (zeitsperretyp_kurzbz))
+			LEFT JOIN campus.tbl_erreichbarkeit USING (erreichbarkeit_kurzbz)
+			LEFT JOIN public.tbl_benutzer ON campus.tbl_zeitsperre.vertretung_uid = public.tbl_benutzer.uid
+			LEFT JOIN public.tbl_person ps USING (person_id)
+			WHERE mitarbeiter_uid= ?
+			";
+
+		if($bisgrenze)
+		{
+			$qry.=" 
+				AND (
+					(date_part('month',vondatum)>=9 AND date_part('year', vondatum)>='".(date('Y')-1)."')
+					OR
+					(date_part('month',vondatum)<9 AND date_part('year', vondatum)>='".(date('Y'))."')
+				)";
+		}
+
+		$qry.= " ORDER BY vondatum DESC";
+
+		return $this->execQuery($qry, array('mitarbeiter_uid' => $uid));
+	}
+
+	/**
+	 * check a date for existing zeitsperre
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $datum datum to check
+	 * @param $stunde stunde (default = null)
+	 * @param bool $nurblockierend if only hr relevante zeitsperren have to be checked
+	 *
+	 * @return array
+	 */
+	public function getSperreByDate($uid, $datum, $stunde = null, $nurblockierend = false)
+	{
+		$parametersArray = [$datum, $datum];
+
+		$qry = "
+			SELECT
+				*
+			FROM
+				campus.tbl_zeitsperre
+			WHERE
+				vondatum <= ?
+				AND bisdatum>= ?";
+
+		if($nurblockierend)
+		{
+			$qry .= " AND zeitsperretyp_kurzbz IN ('"
+				. implode("','", self::BLOCKIERENDE_ZEITSPERREN)
+				. "')";
+		}
+
+		if(!is_null($stunde))
+		{
+			$parametersArray = array_merge(
+				$parametersArray,
+				[$datum, $stunde, $datum, $datum, $stunde, $datum]
+			);
+
+			$qry.=" AND
+					((vondatum= ? AND vonstunde<= ? OR vonstunde is null OR vondatum<> ?) AND
+					(bisdatum= ? AND bisstunde>= ? OR bisstunde is null OR bisdatum<> ?))";
+		}
+
+		array_push($parametersArray, $uid);
+
+		$qry .= "AND mitarbeiter_uid= ? ";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
+
+	/**
+	 * check a date for existing zeitsperre
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $vondatum datum in Format IS0
+	 * @param $bisdatum datum in Format ISO
+	 *
+	 * @return array
+	 */
+	public function existsZeitaufzeichnung($uid, $vonDay, $bisDay)
+	{
+		try {
+			$from = new DateTime($vonDay);
+			$to   = new DateTime($bisDay);
+		} catch (Exception $e) {
+			throw new Exception("Invalid date format");
+		}
+
+		//remove hour stamps
+		$from->setTime(0, 0, 0);
+		$to->setTime(0, 0, 0)->modify('+1 day');
+
+		$fromSql = $from->format('Y-m-d');
+		$toSql   = $to->format('Y-m-d');
+		$params = [$uid, $fromSql, $toSql];
+
+		$qry = "
+			SELECT *
+			FROM campus.tbl_zeitaufzeichnung
+			WHERE uid = ?
+			AND start >= ?
+			AND ende < ? ";
+
+		$result = $this->execQuery($qry, $params);
+
+		return $result;
+	}
+
+	/**
+	 * getZeitsperren of Mitarbeiter for the next days
+	 * @ days: count of the intervall of the next days
+	 * @return array
+	 */
+	public function getZeitsperrenForNextDays($days, $uid=null)
+	{
+		$von = date('Y-m-d');
+		$bis = date('Y-m-d', strtotime("+{$days} days"));
+
+		$paramsArray = [$von, $bis, $bis, $von];
+
+		if($uid)
+			$paramsArray[] = $uid;
+
+		$qry = "select
+					nachname,
+					vorname,
+					uid,
+					vondatum,
+					bisdatum,
+					vertretung_uid,
+					erreichbarkeit_kurzbz,
+					mv.kurzbz
+				from
+					campus.vw_mitarbeiter
+				join campus.tbl_zeitsperre on
+					(uid = mitarbeiter_uid)
+				left join public.tbl_mitarbeiter mv on campus.tbl_zeitsperre.vertretung_uid = mv.mitarbeiter_uid
+				where
+					((? <= bisdatum
+						and ? >= bisdatum)
+					or (?>= vondatum
+						and ? <= vondatum))";
+
+		if($uid)
+			$qry .= " and uid = ? ";
+
+		$qry .= "
+				order by nachname
+				";
+
+		$result = $this->execQuery($qry, $paramsArray);
+
+		return $result;
+	}
+
+	public function getMitarbeiterWithZeitsperren($von, $bis, $fix=false, $lector=false, $oe=null, $ass=false, $stg=false)
+	{
+		$paramsArray = [$von, $bis, $bis, $von];
+
+		if($oe)
+		{
+			$paramsArray[] = $oe;
+		}
+
+		if($stg)
+		{
+			$paramsArray[] = $stg;
+		}
+
+		$qry = "
+			SELECT
+				m.nachname,
+				m.vorname,
+				m.uid,
+				z.vondatum,
+				z.bisdatum,
+				z.vertretung_uid,
+				z.erreichbarkeit_kurzbz,
+				m.lektor,
+				m.fixangestellt,
+				mv.kurzbz
+			FROM campus.vw_mitarbeiter m
+			join public.tbl_benutzer bn on bn.uid = m.uid";
+
+		if($oe || $ass || $stg)
+		{
+			$qry .= " JOIN public.tbl_benutzerfunktion bf on bf.uid = bn.uid";
+		}
+
+		if($stg)
+		{
+			$qry .= " JOIN public.tbl_studiengang stg using (oe_kurzbz)";
+		}
+
+		$qry.= "
+			LEFT JOIN campus.tbl_zeitsperre z
+				ON m.uid = z.mitarbeiter_uid
+			   AND (
+					(? <= z.bisdatum AND ? >= z.bisdatum)
+					OR
+					(? >= z.vondatum AND ? <= z.vondatum)
+			   )
+			left join public.tbl_mitarbeiter mv on z.vertretung_uid = mv.mitarbeiter_uid
+			where bn.aktiv = true
+				";
+
+
+		if($fix) {
+			$qry.= " AND m.fixangestellt = true";
+		}
+		if($lector) {
+			$qry.= " AND m.lektor = true";
+		}
+
+		if ($oe)
+		{
+			$qry.= " 
+				AND bf.funktion_kurzbz ='oezuordnung'
+				AND bf.oe_kurzbz= ?
+				AND (bf.datum_von is null or bf.datum_von <=now()) 
+				AND (bf.datum_bis is null or bf.datum_bis >= now())
+				";
+		}
+
+		if ($ass)
+		{
+			$qry.= " 
+				AND bf.funktion_kurzbz ='ass'
+				AND (bf.datum_von is null or bf.datum_von <=now()) 
+				AND (bf.datum_bis is null or bf.datum_bis >= now())
+				";
+		}
+
+		if ($stg)
+		{
+			$qry.= " 
+				AND stg.studiengang_kz = ?
+				";
+		}
+
+		$qry .= " order by nachname, vorname, uid";
+
+
+		$result = $this->execQuery($qry, $paramsArray);
+
+		return $result;
+	}
+
 	public function checkIfZeitsperreExists($uid, $datum, $stunde)
 	{
 		$this->db->select("*");
@@ -71,30 +337,29 @@ class Zeitsperre_model extends DB_Model
 
 		$this->db->group_start();
 
-			$this->db->where('vondatum <', $datum);
-			$this->db->or_group_start();
-				$this->db->where('vondatum', $datum);
-				$this->db->group_start();
-					$this->db->where('vonstunde <=', $stunde);
-					$this->db->or_where('vonstunde IS NULL', null, false);
-				$this->db->group_end();
-			$this->db->group_end();
+		$this->db->where('vondatum <', $datum);
+		$this->db->or_group_start();
+		$this->db->where('vondatum', $datum);
+		$this->db->group_start();
+		$this->db->where('vonstunde <=', $stunde);
+		$this->db->or_where('vonstunde IS NULL', null, false);
+		$this->db->group_end();
+		$this->db->group_end();
 		$this->db->group_end();
 
 
 		$this->db->group_start();
-			$this->db->where('bisdatum >', $datum);
-			$this->db->or_group_start();
-				$this->db->where('bisdatum', $datum);
-				$this->db->group_start();
-					$this->db->where('bisstunde >=', $stunde);
-					$this->db->or_where('bisstunde IS NULL', null, false);
-				$this->db->group_end();
+		$this->db->where('bisdatum >', $datum);
+		$this->db->or_group_start();
+		$this->db->where('bisdatum', $datum);
+		$this->db->group_start();
+		$this->db->where('bisstunde >=', $stunde);
+		$this->db->or_where('bisstunde IS NULL', null, false);
+		$this->db->group_end();
 
-			$this->db->group_end();
+		$this->db->group_end();
 		$this->db->group_end();
 
 		return $this->load();
-
 	}
 }

application/models/ressource/Zeitsperretyp_model.php

@@ -11,4 +11,20 @@ class Zeitsperretyp_model extends DB_Model
 		$this->dbTable = 'campus.tbl_zeitsperretyp';
 		$this->pk = 'zeitsperretyp_kurzbz';
 	}
+
+	public function getTypenZeitsperren($excludedTypes = [])
+	{
+		$whereNotClause = "";
+		if (count($excludedTypes)) {
+			$excludedTypes = array_map(
+				function ($type) {
+					return "'$type'";
+				},
+				$excludedTypes
+			);
+			$excludedTypes = implode(", ", $excludedTypes);
+			$whereNotClause = "WHERE NOT zeitsperretyp_kurzbz IN ($excludedTypes)";
+		}
+		return $this->execQuery("SELECT * FROM $this->dbTable $whereNotClause ORDER BY beschreibung ASC");
+	}
 }

application/views/CisRouterView/CisRouterView.php

@@ -10,6 +10,7 @@ $includesArray = array(
 	'primevue3' => true,
 	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
+	'tinymce5' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
@@ -21,9 +22,14 @@ $includesArray = array(
 		'public/css/components/FilterComponent.css',
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
+		'public/css/components/inViewTooltip.css',
 		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
-		'public/css/Cis4/Studium.css'
+		'public/css/Cis4/Studium.css',
+		'public/css/components/vue-datepicker.css',
+		'public/css/Cis4/Benotungstool.css',
+		'public/css/components/Zeitsperrenma.css', //70747
+		'public/css/Cis4/Zeitsperren.css', //77941
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
@@ -37,11 +43,15 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/divider/divider.min.js',
+		'vendor/npm-asset/primevue/password/password.js',
+		'vendor/npm-asset/primevue/multiselect/multiselect.js',
 		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Cis/Cis.js',
+		'vendor/olifolkerd/tabulator5/src/js/modules/ColumnCalcs/ColumnCalcs.js'
 	),
 
 );
@@ -49,6 +59,8 @@ $includesArray = array(
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 <div id="fhccontent" class="h-100" route=<?php echo $route ?>>
-	<router-view></router-view>
+	<router-view
+		:permissions="<?= htmlspecialchars(json_encode($permissions ?? [])); ?>"
+	></router-view>
 </div>
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/Vertragsverwaltung.php

@@ -12,13 +12,13 @@ $includesArray = array(
 	'tinymce5' => true,
 	'phrases' => array(
 		'global',
-		'ui',
+		'ui'
 	),
 	'customCSSs' => [
 		'public/css/components/vue-datepicker.css',
 		'public/css/components/primevue.css',
 		'public/css/Vertragsverwaltung.css',
-		'public/css/components/Detailheader.css'
+		'public/css/components/Detailheader.css',
 	],
 	'customJSs' => [
 		#'vendor/npm-asset/primevue/tree/tree.min.js',

application/views/lehre/lehrauftrag/Dashboard.php

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

application/views/lehre/lehrauftrag/LehrendeUebersicht.php

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

application/views/lehre/lehrauftrag/acceptLehrauftrag.php

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

application/views/lehre/lehrauftrag/approveLehrauftrag.php

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

application/views/lehre/lehrauftrag/orderLehrauftrag.php

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

application/views/lehre/pruefungsprotokoll.php

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

application/views/lehre/pruefungsprotokollUebersicht.php

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

application/views/templates/CISVUE-Footer.php

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

application/views/templates/CISVUE-Header.php

@@ -7,6 +7,11 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'primevue3' => true,
+	'vuedatepicker11' => true,
+	'printCssPath' => 'public/css/Cis4/print.css',
+	'customJSs' => array_merge([
+		'vendor/moment/luxonjs/luxon.min.js'
+	], $customJSs ?? []),
 	'customJSModules' => array_merge([
 		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
@@ -26,15 +31,19 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		document.body.classList.add("in-frame");
 </script>
 
-<header id="cis-header" class="navbar-dark">
-	<cis-menu 
-		root-url="<?= site_url(''); ?>" 
-		logo-url="<?= base_url($this->config->item('theme_logo')); ?>" 
-		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
+<!-- used by cis4 native pages, teleported menu needs data attributes-->
+<header id="cis-header" class="navbar-dark"
+	data-root-url="<?= site_url(''); ?>"
+	data-logo-url="<?= base_url($this->config->item('theme_logo')); ?>"
+	data-avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
+	data-logout-url="<?= site_url('Cis/Auth/logout'); ?>">
+<!-- used by legacy cis pages & content pages which use component props -->
+	<cis-menu
+		root-url="<?= site_url(''); ?>"
+		logo-url="<?= base_url($this->config->item('theme_logo')); ?>"
+		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-		:searchbaroptions="searchbaroptions" 
-		:searchfunction="searchfunction"
 		></cis-menu>
 </header>
 
-<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">
+<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">

application/views/templates/FHC-Header.php

@@ -12,6 +12,8 @@
 	$customJSs = isset($customJSs) ? $customJSs : null;
 	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 	$skipID = isset($skipID) ? $skipID : null;
+	$printCssPath = isset($printCssPath) ? $printCssPath : null;
+	
 ?>
 <!-- Header start -->
 
@@ -138,6 +140,9 @@
 				generateCSSsIncludeIfExtensionCssExists('tags.css');
 			}
 
+			// Print CSS
+			if ($printCssPath) generatePrintCSS($printCssPath);
+
 			$extapphelper = ExtendableAppsHelper::getInstance();
 			$extapphelper->init($customCSSs, $customJSs, $customJSModules);
 

application/views/widgets/navigationMenu.php

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

cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php

@@ -1824,7 +1824,7 @@ $htmlstring .= "
 
 </table>
 ";
-if ($anzahlChanged > 0)
+if (isset($anzahlChanged) && $anzahlChanged > 0)
 	echo '<div id="notenWarning" class="warning">' . $p->t('benotungstool/geaenderteNotenVorhanden') . '</div>';
 
 echo $htmlstring;

cis/private/lehre/notenliste.xls.php

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

cms/newsverwaltung.php

@@ -86,11 +86,11 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	<link rel="stylesheet" href="../skin/styles/jquery.css" type="text/css">
 	<link rel="stylesheet" href="../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css">
 
-	<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
+	<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css">
+<script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
 <script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
 	<script src="../vendor/components/jqueryui/jquery-ui.min.js" type="text/javascript"></script>
 	<script type="text/javascript" src="../include/tiny_mce/tiny_mce.js"></script>

cms/tinymce_dms.php

@@ -88,6 +88,29 @@ if (! $rechte->isberechtigt('basis/dms', null, 's', null))
 		init: function(){
 		},
 		mySubmit : function (id) {
+			var messageTarget = window.opener;
+
+			if (!messageTarget && window.parent !== window)
+				messageTarget = window.parent;
+
+			if (messageTarget && typeof(messageTarget.postMessage) == "function")
+			{
+				messageTarget.postMessage(
+					{
+						type: "fhcomplete:dms:selected",
+						dmsId: id
+					},
+					window.location.protocol + "//" + window.location.host
+				);
+			}
+
+			if (
+				typeof(tinyMCEPopup) == "undefined" ||
+				!tinyMCEPopup.params ||
+				typeof(tinyMCEPopup.getWindowArg) != "function"
+			)
+				return;
+
 			var URL = "dms.php?id="+id;
 				var win = tinyMCEPopup.getWindowArg("window");
 

cypress.config.js

@@ -0,0 +1,47 @@
+const { defineConfig } = require("cypress");
+
+require("dotenv").config({ path: "tests/cypress/.env" });
+
+// The suite being run: its cy.task handlers and its Cypress.env() values.
+const suite = require("./tests/cypress/suites/noten");
+
+module.exports = defineConfig({
+  // Cypress 15 deprecates Cypress.env() inside cy.request options, which the API helpers use.
+  allowCypressEnv: true,
+
+  // The suite lives under tests/cypress, so every default folder has to be pointed there.
+  fixturesFolder: "tests/cypress/fixtures",
+  screenshotsFolder: "tests/cypress/screenshots",
+  videosFolder: "tests/cypress/videos",
+  downloadsFolder: "tests/cypress/downloads",
+
+  e2e: {
+    baseUrl: process.env.BASE_URL,
+    specPattern: "tests/cypress/e2e/**/*.cy.{js,jsx,ts,tsx}",
+    supportFile: "tests/cypress/support/e2e.js",
+    defaultCommandTimeout: 20000,
+    pageLoadTimeout: 20000,
+    retries: { runMode: 0, openMode: 0 },
+
+    setupNodeEvents(on, config) {
+      // No defaults anywhere: an empty .env fails the run instead of hitting someone else's instance.
+      const missing = ["BASE_URL", "USER_NAME", "USER_PASSWORD"].filter((key) => !process.env[key]);
+      if (missing.length) throw new Error(`Missing in tests/cypress/.env: ${missing.join(", ")}`);
+
+      suite.registerTasks(on);
+
+      // otherwise the SSH forward outlives Cypress
+      on("after:run", () => require("./tests/cypress/tasks/sshTunnel").closeTunnel());
+
+      return config;
+    },
+  },
+
+  env: {
+    // HTTP Basic + LDAP user the API calls authenticate as.
+    adminusername: process.env.USER_NAME,
+    adminpassword: process.env.USER_PASSWORD,
+
+    ...suite.env,
+  },
+});

package.json

@@ -0,0 +1,20 @@
+{
+  "scripts": {
+    "cy:open": "cypress open",
+    "cy:run": "cypress run",
+    "cy:noten": "cypress run --spec \"tests/cypress/e2e/specs/**/*.cy.js\"",
+    "cy:noten:api": "cypress run --spec \"tests/cypress/e2e/specs/{unit,api}/**/*.cy.js\"",
+    "cy:noten:ui": "cypress run --browser chrome --spec \"tests/cypress/e2e/specs/ui/**/*.cy.js\"",
+    "cy:noten:ui:watch": "cypress run --browser chrome --headed --no-exit --spec \"tests/cypress/e2e/specs/ui/**/*.cy.js\"",
+    "cy:noten:punkte-on": "cypress run --browser chrome --env NOTEN_PUNKTE_MODUS=on --spec \"tests/cypress/e2e/specs/**/*.cy.js\"",
+    "cy:noten:punkte-off": "cypress run --browser chrome --env NOTEN_PUNKTE_MODUS=off --spec \"tests/cypress/e2e/specs/**/*.cy.js\"",
+    "cy:noten:p0": "cypress run --spec \"tests/cypress/e2e/specs/unit/notenRules.cy.js,tests/cypress/e2e/specs/api/noten/noten.pruefungsantritte.cy.js,tests/cypress/e2e/specs/api/noten/noten.pruefungstermin.cy.js,tests/cypress/e2e/specs/api/noten/noten.ueberschreiben.cy.js\"",
+    "noten:check": "node tests/cypress/tools/dbCheck.js noten"
+  },
+  "dependencies": {
+    "cypress": "^15.11.0",
+    "dotenv": "^17.4.2",
+    "pg": "^8.13.1",
+    "ssh2": "^1.17.0"
+  }
+}

public/css/Cis4/Benotungstool.css

@@ -0,0 +1,146 @@
+/* Sticky identity columns. The four freezable columns (selection/uid/Vorname/Nachname) always carry
+   the .sticky-col class for the opaque background; whether a column is actually pinned is toggled
+   per column via a `sticky-on-<field>` class on #notentable (set in JS from the user's selection).
+   The cumulative left offsets (--sl-<field>) are computed in JS (recomputeStickyOffsets) so that
+   multiple sticky columns stack next to each other instead of overlapping at left:0. */
+#notentable .tabulator-header .tabulator-col.sticky-col,
+#notentable .tabulator-tableholder .tabulator-row .tabulator-cell.sticky-col {
+	background-color: #fff;       /* opaque so scrolled cells don't show through */
+}
+
+/* keep sticky cells opaque on row hover */
+#notentable .tabulator-row:hover .tabulator-cell.sticky-col {
+	background-color: #ccc;
+}
+
+/* enable pinning per column only when the container opts the field in.
+   left offset comes from the matching --sl-<field> CSS variable (set on #notentable from JS). */
+#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"],
+#notentable.sticky-on-uid .sticky-col[tabulator-field="uid"],
+#notentable.sticky-on-vorname .sticky-col[tabulator-field="vorname"],
+#notentable.sticky-on-nachname .sticky-col[tabulator-field="nachname"] {
+	position: sticky;
+	z-index: 10;                  /* float above the scrolling pruefungs columns */
+	border-right: 1px solid #ddd; /* separator on the sticky block */
+}
+
+#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"] { left: var(--sl-selectCol, 0); }
+#notentable.sticky-on-uid       .sticky-col[tabulator-field="uid"]       { left: var(--sl-uid, 0); }
+#notentable.sticky-on-vorname   .sticky-col[tabulator-field="vorname"]   { left: var(--sl-vorname, 0); }
+#notentable.sticky-on-nachname  .sticky-col[tabulator-field="nachname"]  { left: var(--sl-nachname, 0); }
+
+
+/* styling for points input column for notenvorschläge in benotungstool*/
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="punkte"] {
+	position: relative;
+	background-color: rgba(255, 255, 157, 0.73);
+}
+
+/* styling for editable dropdown column of notenvorschläge in benotungstool*/
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"] {
+	position: relative;
+	background-color: rgba(255, 255, 157, 0.73);
+	cursor: pointer;
+}
+
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"]::after {
+	content: "▾";
+	position: absolute;
+	right: 8px;
+	top: 50%;
+	transform: translateY(-50%) rotate(0deg);
+	transform-origin: center;
+	color: rgba(120, 120, 60, 0.85);
+	font-size: 0.9rem;
+	line-height: 1;
+	pointer-events: none;
+	transition: transform 0.15s ease;
+}
+
+/* rotate the indicator up while the dropdown editor is open */
+#notentable .tabulator-tableholder .tabulator-cell.tabulator-editing[tabulator-field="note_vorschlag"]::after {
+	transform: translateY(-50%) rotate(180deg);
+}
+
+/*
+ * Prueufungszelle: feste Spuren fuer Note | Datum | Aktion.
+ * Vorher war das eine zentrierte Flex-Zeile, dadurch verschoben laengere Notenbezeichnungen
+ * ("Nicht Genuegend" vs "Genuegend") Datum und Button - die Zellen standen von Zeile zu Zeile
+ * nicht mehr untereinander. Mit festen Spurbreiten fluchten sie immer.
+ */
+.pruefung-cell {
+	position: relative;
+	display: grid;
+	grid-template-columns: minmax(0, 1fr) 6.5rem; /* Note | Aktion */
+	align-items: center;
+	column-gap: 0.5rem;
+	height: 100%;
+	padding-left: 32px; /* badge width (20) + its left offset (6) + gap (6) */
+	padding-right: 6px;
+	text-align: left;
+}
+
+/* Spaltenmodus 'antritt': das Datum steht in der Zelle, nicht im Spaltenkopf */
+.pruefung-cell.mit-datum {
+	grid-template-columns: minmax(0, 1fr) 4.75rem 6.5rem; /* Note | Datum | Aktion */
+}
+
+/*
+ * Zellen ohne Aktion (abschliessender Termin, wird in einem anderen Tool gepflegt): die Spur fuer
+ * den Button entfaellt, der Platz gehoert der Notenbezeichnung.
+ */
+.pruefung-cell.ohne-aktion {
+	grid-template-columns: minmax(0, 1fr); /* Note */
+}
+
+.pruefung-cell.ohne-aktion.mit-datum {
+	grid-template-columns: minmax(0, 1fr) 4.75rem; /* Note | Datum */
+}
+
+.pruefung-cell .pruefung-note {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.pruefung-cell .pruefung-datum {
+	font-size: 0.75rem;
+	white-space: nowrap;
+	text-align: right;
+	opacity: 0.7;
+}
+
+/* immer in der letzten Spur, auch wenn Note und Datum fehlen (leere Zelle mit "Hinzufuegen") */
+.pruefung-cell .pruefung-action {
+	grid-column: -2 / -1;
+	display: flex;
+	justify-content: flex-end;
+}
+
+.pruefung-cell .pruefung-action .btn {
+	white-space: nowrap;
+}
+
+.pruefung-badge::before {
+	content: attr(data-attempt);
+	position: absolute;
+	left: 6px;
+	top: 50%;
+	transform: translateY(-50%);
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	min-width: 20px;
+	height: 20px;
+	border-radius: 50%;
+	color: #fff;
+	font-size: 0.75rem;
+	font-weight: bold;
+}
+
+.pruefung-badge.attempt-t1::before { background: #0072B2; }
+.pruefung-badge.attempt-t2::before { background: #E69F00; }
+.pruefung-badge.attempt-t3::before { background: #CC79A7; }
+.pruefung-badge.attempt-k::before  { background: #D55E00; }
+/* Termin ohne verbrauchten Antritt (entschuldigt, nicht beurteilt) - traegt keine Nummer */
+.pruefung-badge.attempt-none::before { background: #767676; }

public/css/Cis4/CoreCalendarEvents.css

@@ -59,12 +59,21 @@
 	padding: .25em .5em .25em .25em;
 	margin-inline-end: .25rem;
 }
+.rangePageContainer .calendar-event-default .event-time {
+	display: none !important;
+}
 .weekPageContainer .calendar-event-default .event-text {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-evenly;
 	align-items: center;
 }
+.rangePageContainer .calendar-event-default .event-text {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+	align-items: start;
+}
 .dayPageContainer .calendar-event-default,
 .listPageContainer .calendar-event-default {
 	display: flex;
@@ -97,3 +106,17 @@
 	display: none;
 }
 
+.fhc-calendar-empty-slot-plus {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%,-50%);
+	font-size: 18px;
+	opacity: 0;
+	pointer-events: none;
+	user-select: none;
+}
+
+.part-body:hover .fhc-calendar-empty-slot-plus {
+	opacity: 1;
+}

public/css/Cis4/Studium.css

@@ -56,5 +56,68 @@
 	}
 }
 
+#studiengang-info-col {
+	transition: width 0.5s ease-in-out;
+}
+
+#studiengang-info-toggle {
+	color: inherit;
+	background-color: var(--fhc-secondary);
+	border: 1px solid var(--fhc-border);
+	border-radius: var(--bs-border-radius);
+	transition: background-color 0.2s ease-in-out;
+}
+
+#studiengang-info-toggle:hover {
+	background-color: var(--fhc-secondary-highlight);
+}
+
+#studiengang-info-toggle .fa-chevron-right {
+	transition: all 0.5s ease-in-out;
+}
+
+#studiengang-info-col.collapsed #studiengang-info-toggle .fa-chevron-right {
+	transform: scaleX(-1);
+	color: var(--fhc-black-40);
+}
+
+#studiengang-info {
+	transition: width 0.5s ease-in-out;
+}
+
+@media (min-width: 768px) {
+	#studiengang-info-col.collapsed {
+		width: 50px;
+	}
+
+	#studiengang-info-toggle {
+		min-height: 100px;
+	}
+
+	#studiengang-info-col.collapsed #studiengang-info {
+		width: 0;
+	}
 
 
+	#studiengang-info-col:not(.collapsed) #studiengang-info {
+		width: 100%;
+	}
+}
+
+@media (max-width: 767px) {
+	#studiengang-info-toggle {
+		width: 100%;
+	}
+
+	#studiengang-info {
+		width: 100%;
+	}
+
+	#studiengang-info-toggle .fa-chevron-right {
+		transform: rotate(-90deg);
+	}
+
+	#studiengang-info-col.collapsed #studiengang-info-toggle .fa-chevron-right {
+		transform: rotate(90deg);
+	}
+}

public/css/Cis4/Zeitsperren.css

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

public/css/Cis4/print.css

@@ -0,0 +1,106 @@
+@page {
+  size: portrait;
+}
+
+:root {
+	--range-view-print-border-color: rgb(150,150,150);
+}
+
+* {
+	background-color: white !important;
+	color: black !important;
+	font-size: x-small !important;
+	overflow: visible !important;
+	scrollbar-color: rgba(0,0,0,0) rgba(0,0,0,0) !important;
+	height: auto !important;
+	position: relative !important;
+}
+
+body
+{
+	padding-top: 0 !important;
+}
+
+header,
+#skiplink,
+#cis-lvplan-personal-heading,
+#cis-other-lvplan-heading,
+.cis-lvplan-personal hr,
+.cis-other-lvplan hr,
+.fhc-calendar-base-header,
+.fhc-calendar-mode-range .grid-allday,
+.fhc-calendar-mode-range #rangePresetSelector,
+.fhc-calendar-base-grid-line-background {
+	display: none !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid {
+	border: solid !important;
+	border-color: var(--range-view-print-border-color) !important;
+	border-width: 1px !important;
+	break-after: page !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid * {
+	gap: 0px !important;
+}
+
+.fhc-calendar-mode-range .main-header {
+	border-left: solid !important;
+	border-left-color: var(--range-view-print-border-color) !important;
+	border-left-width: 1px !important;
+}
+
+.fhc-calendar-mode-range .part-header {
+	border-top: solid !important;
+	border-top-color: var(--range-view-print-border-color) !important;
+	border-top-width: 1px !important;
+}
+
+.fhc-calendar-mode-range .part-body {
+	border-top: solid !important;
+	border-top-color: var(--range-view-print-border-color) !important;
+	border-top-width: 1px !important;
+	border-left: solid !important;
+	border-left-color: var(--range-view-print-border-color) !important;
+	border-left-width: 1px !important;
+	z-index: 9998;
+}
+
+.fhc-calendar-mode-range .part-header-followed-by-break,
+.fhc-calendar-mode-range .part-body-followed-by-break {
+	border-bottom: solid !important;
+	border-bottom-color: var(--range-view-print-border-color) !important;
+	border-bottom-width: 1px !important;
+}
+
+.fhc-calendar-mode-range .part-header,
+.fhc-calendar-mode-range .part-body,
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line-event {
+	break-inside: avoid;
+}
+
+.fhc-calendar-mode-range .main-header {
+	text-align: center !important;
+}
+
+.fhc-calendar-mode-range .event-text {
+	align-items: center !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line * {
+	background-color: rgba(0,0,0,0) !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line-event {
+	z-index: 9999 !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line-event {
+	max-height: 50px !important;
+	overflow-y: hidden !important;
+}
+
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line-event .event-lectors {
+	display: none !important;
+}

public/css/components/MyLv.css

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

public/css/components/Zeitsperrenma.css

@@ -0,0 +1,27 @@
+.item-inactive {
+    text-decoration: line-through;
+}
+
+.table-scroll {
+    height: calc(100vh - 300px);
+    overflow: auto;
+}
+
+.zeitsperrenma-content thead th {
+    position: sticky;
+    top: 0;
+    background: var(--bs-table-bg);
+    z-index: 2;
+}
+
+.zeitsperrenma-content .zeitsperrenma-name-header {
+	left: 0;
+    z-index: 3;
+}
+
+.zeitsperrenma-content .zeitsperrenma-name {
+    position: sticky;
+    left: 0;
+    background: var(--bs-table-bg);
+    z-index: 2;
+}

public/css/components/calendar/frame.css

@@ -101,14 +101,26 @@
 .fhc-calendar-base-grid .grid-main .part-body {
 	background-color: var(--fhc-calendar-bg-body);
 }
+.fhc-calendar-mode-range .fhc-calendar-base-grid {
+	border-bottom-style: solid;
+	border-bottom-width: 5px;
+	border-bottom-color: var(--fhc-calendar-gap);
+}
 .fhc-calendar-base-grid-line {
 	grid-gap: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
 }
+/* todo: remove commented lines below */
+/* .fhc-calendar-mode-range .main-header-sunday,
+.fhc-calendar-mode-range .all-day-events-sunday,
+.fhc-calendar-mode-range .fhc-calendar-base-grid-line-sunday {
+	border: solid;
+	border-width: 0 0 8px 0;
+	border-color: var(--fhc-calendar-gap);
+} */
 .fhc-calendar-base-label-time {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
-	align-items: end;
 }
 /* Header */
 .fhc-calendar-base-header .header-picker {

public/css/components/inViewTooltip.css

@@ -0,0 +1,81 @@
+/* the panel of js/directives/inViewTooltip.js. place() sets its place, max width and max height
+   inside the viewport, so neither a scrolling container nor a modal body clips it */
+.fhc-in-view-tooltip {
+	--fhc-in-view-tooltip-progress: var(--fhc-blue-primary, #0d6efd);
+	position: fixed;
+	z-index: 1080;
+	display: flex;
+	flex-direction: column;
+	width: max-content;
+	border: 1px solid var(--bs-border-color, #dee2e6);
+	border-radius: 0.375rem;
+	background-color: var(--bs-body-bg, #fff);
+	box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+	color: var(--bs-body-color, #212529);
+	font-size: 0.875rem;
+	font-weight: normal;
+	line-height: 1.5;
+	text-align: left;
+}
+
+/* the dark primary reaches 2:1 on the dark panel, the highlight 3.9:1 */
+html.dark .fhc-in-view-tooltip {
+	--fhc-in-view-tooltip-progress: var(--fhc-blue-primary-highlight, #6ea8fe);
+}
+
+/* the body scrolls, so the progress border stays on the panel edge */
+.fhc-in-view-tooltip-body {
+	min-height: 0;
+	overflow-y: auto;
+	padding: 0.75rem 1rem;
+	white-space: pre-line; /* the text keeps its line breaks */
+}
+
+/* the hover timer of a sticky panel: after a pause the border fills up clockwise, then the panel sticks.
+   The 2 px stroke covers the 1 px border and 1 px inside it */
+.fhc-in-view-tooltip-progress {
+	position: absolute;
+	inset: 0;
+	width: 100%;
+	height: 100%;
+	overflow: visible;
+	pointer-events: none;
+}
+
+.fhc-in-view-tooltip-progress rect {
+	fill: none;
+	stroke: var(--fhc-in-view-tooltip-progress);
+	stroke-width: 2;
+	stroke-dasharray: var(--fhc-in-view-tooltip-perimeter);
+	stroke-dashoffset: var(--fhc-in-view-tooltip-perimeter);
+}
+
+.fhc-in-view-tooltip--holding .fhc-in-view-tooltip-progress rect {
+	animation: fhc-in-view-tooltip-hold var(--fhc-in-view-tooltip-hold-fill) ease-in var(--fhc-in-view-tooltip-hold-delay) forwards;
+}
+
+/* a click during the hover timer fills the rest of the border quickly */
+.fhc-in-view-tooltip--pinned .fhc-in-view-tooltip-progress rect {
+	stroke-dashoffset: 0;
+	transition: stroke-dashoffset 0.15s linear;
+}
+
+@keyframes fhc-in-view-tooltip-hold {
+	to {
+		stroke-dashoffset: 0;
+	}
+}
+
+/* the ? icon of components/InViewHelp.js takes the color of its context, e.g. white in the blue
+   modal header. A class like text-muted overrides it */
+.fhc-in-view-help-btn,
+.fhc-in-view-help-btn:hover,
+.fhc-in-view-help-btn:focus-visible,
+.btn.fhc-in-view-help-btn:active {
+	color: inherit;
+}
+
+.fhc-in-view-help-btn {
+	line-height: 1;
+	text-decoration: none;
+}

public/js/api/cms.js

@@ -1,45 +1,24 @@
 export default {
-    content(content_id, version=null, sprache=null, sichtbar=null) {
-        return this.$fhcApi.get(
-			"/api/frontend/v1/Cms/content",
-			{ 
-				content_id: content_id,
-				...(version?{version}:{}),
-				...(sprache?{sprache}:{}),
-				...(sichtbar?{sichtbar}:{}),
-            }
-        );
-    },
+	content(content_id, version = null, sprache = null, sichtbar = null) {
+		return this.$fhcApi.get('/api/frontend/v1/Cms/content', {
+			content_id: content_id,
+			...(version ? { version } : {}),
+			...(sprache ? { sprache } : {}),
+			...(sichtbar ? { sichtbar } : {}),
+		});
+	},
 	//api function used for the news View that renders the html
 	getNews(page = 1, page_size = 10, sprache) {
-		return this.$fhcApi.get(
-			"/api/frontend/v1/Cms/getNews",
-			{
-				page,
-				page_size,
-				sprache,
-			},
-		);
+		return this.$fhcApi.get('/api/frontend/v1/Cms/getNews', {
+			page,
+			page_size,
+			sprache,
+		});
 	},
 	//api function used for the widget component
 	news(limit) {
-		return this.$fhcApi.get(
-			"/api/frontend/v1/Cms/news",
-			{
-				limit: limit
-			}
-		);
+		return this.$fhcApi.get('/api/frontend/v1/Cms/news', {
+			limit: limit,
+		});
 	},
-	getNewsRowCount: function () {
-		return this.$fhcApi.get(
-			"/api/frontend/v1/Cms/getNewsRowCount",
-			{}
-		);
-	},
-	getNewsExtra: function(){
-		return this.$fhcApi.get(
-			"/api/frontend/v1/Cms/getStudiengangInfoForNews",
-			{}
-		);
-	}
-  }
+};

public/js/api/factory/addons.js

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

public/js/api/factory/benutzer.js

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

public/js/api/factory/betreuungen.js

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

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

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

public/js/api/factory/cis/zeitsperren.js

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

public/js/api/factory/cms.js

@@ -16,7 +16,7 @@
  */
 
 export default {
-	content(content_id, version=null, sprache=null, sichtbar=null) {
+	content(content_id, version = null, sprache = null, sichtbar = null) {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Cms/content',
@@ -24,41 +24,29 @@ export default {
 				content_id,
 				...(version ? { version } : {}),
 				...(sprache ? { sprache } : {}),
-				...(sichtbar ? { sichtbar } : {})
-			}
+				...(sichtbar ? { sichtbar } : {}),
+			},
 		};
 	},
 	//api function used for the news View that renders the html
-	getNews(page = 1, page_size = 10, sprache) {
+	getNews(page = 1, page_size = 10, sprache, filterPublished = true) {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Cms/getNews',
 			params: {
 				page,
 				page_size,
-				sprache
+				sprache,
+				published: filterPublished,
 			},
 		};
 	},
 	//api function used for the widget component
-	news(limit) {
+	newsForWidget(limit) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Cms/news',
-			params: { limit }
+			url: '/api/frontend/v1/Cms/newsForWidget',
+			params: { limit },
 		};
 	},
-	getNewsRowCount() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Cms/getNewsRowCount'
-		};
-	},
-	getNewsExtra() {
-		// TODO(chris): seems to be called from nowhere?
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Cms/getStudiengangInfoForNews'
-		};
-	}
-};
+};

public/js/api/factory/lehre.js

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

public/js/api/factory/lehreinheit.js

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

public/js/api/factory/newsAdministration.js

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

public/js/api/factory/noten.js

@@ -0,0 +1,113 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getCisConfig(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getCisConfig'
+		};
+	},
+	getStudentenNoten(lv_id, sem_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getStudentenNoten',
+			params: { lv_id, sem_kurzbz }
+		};
+	},
+	getNoten(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getNoten'
+		};
+	},
+	saveStudentenNoten(password, noten, lv_id, sem_kurzbz) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveStudentenNoten',
+			params: { password, noten, lv_id, sem_kurzbz }
+		};
+	},
+	saveNotenvorschlag(lv_id, sem_kurzbz, student_uid, note, punkte = null) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveNotenvorschlag',
+			params: { lv_id, sem_kurzbz, student_uid, note, punkte }
+		};
+	},
+	// kein Termintyp mehr: welchen Antritt die Prüfung darstellt, leitet der Server aus dem
+	// bestehenden Prüfungsverlauf des Studenten in dieser LV und diesem Semester ab
+	// mitarbeiter_uid: der benotende Lektor. Nur nötig, wenn die Lehreinheit mehrere hat - sonst
+	// löst der Server ihn selbst auf.
+	saveStudentPruefung(student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, pruefung_id = null, mitarbeiter_uid = null){
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveStudentPruefung',
+			params: { student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, pruefung_id, mitarbeiter_uid }
+		};
+	},
+	// note/punkte optional: ohne Auswahl wird der Termin als "noch nicht eingetragen" angelegt
+	createPruefungen(uids, datum, lva_id, sem_kurzbz, note = null, punkte = null, mitarbeiter_uid = null){
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/createPruefungen',
+			params: { uids, datum, lva_id, sem_kurzbz, note, punkte, mitarbeiter_uid }
+		};
+	},
+	getLehrendeFuerLehreinheit(lehreinheit_id, lv_id, sem_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getLehrendeFuerLehreinheit',
+			params: { lehreinheit_id, lv_id, sem_kurzbz }
+		};
+	},
+	saveNotenvorschlagBulk(lv_id, sem_kurzbz, noten) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveNotenvorschlagBulk',
+			params: { lv_id, sem_kurzbz, noten }
+		};
+	},
+	saveStudentPruefungBulk(lv_id, sem_kurzbz, pruefungen) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/savePruefungenBulk',
+			params: { lv_id, sem_kurzbz, pruefungen }
+		};
+	},
+	getNoteByPunkte(punkte, lv_id, sem_kurzbz) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/getNoteByPunkte',
+			params: { punkte, lv_id, sem_kurzbz }
+		};
+	},
+	getBenotungstoolContext(sem_kurzbz, lv_id = null) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getBenotungstoolContext',
+			params: { sem_kurzbz, lv_id }
+		};
+	},
+	getLvForStudiengang(studiengang_kz, sem_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getLvForStudiengang',
+			params: { studiengang_kz, sem_kurzbz }
+		};
+	}
+}

public/js/api/factory/ort.js

@@ -18,23 +18,46 @@
 export default {
 	getContentID(ort_kurbz) {
 		return {
-			method: 'get',
-			url: '/api/frontend/v1/Ort/ContentID',
-			params: { ort_kurzbz: ort_kurbz }
+			method: "get",
+			url: "/api/frontend/v1/Ort/ContentID",
+			params: { ort_kurzbz: ort_kurbz },
 		};
 	},
-	getRooms(datum, von, bis, typ, personenanzahl = 0) {
+	getRooms(datum, von, bis, typ, personenanzahl = 0, standort_id = null, advancedFilters = {}) {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Ort/getRooms',
-			params: { datum, von, bis, typ, personenanzahl }
+			params: { datum, von, bis, typ, personenanzahl, standort_id, ...advancedFilters }
 		};
 	},
 	getRoomTypes() {
+		return {
+			method: "get",
+			url: "/api/frontend/v1/Ort/getTypes",
+			params: {},
+		};
+	},
+	getRoomInfo(ortKurzbz) {
+		return {
+			method: "get",
+			url: "/api/frontend/v1/Ort/getRoomInfo",
+			params: {
+				ortKurzbz,
+			},
+		};
+	},
+	getStandorte() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Ort/getTypes',
+			url: '/api/frontend/v1/Ort/getStandorte',
+			params: { }
+		};
+	},
+	getAdvancedFilterOptions() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getAdvancedFilterOptions',
 			params: { }
 		};
 	}
-};
+};

public/js/api/factory/paabgabeUebersicht.js

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

public/js/api/factory/permission.js

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