Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into demo

# Conflicts:
#	system/dbupdate_3.4.php

application/config/Events.php

@@ -33,27 +33,5 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
-//Tempus Renderers:
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-
 
 

application/config/routes.php

@@ -63,6 +63,7 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
+$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';

application/config/tempus.php

@@ -1,3 +0,0 @@
-<?php
-
-$config['send_update_mails'] = false;

application/controllers/Cis/Benotungstool.php

@@ -0,0 +1,51 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Benotungstool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED
+		]);
+
+		$this->_ci =& get_instance();
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		
+		// TODO: check if related CIS config is also loaded when being routed in Cis4 by vuerouter
+		// TODO: check if new benotungstool should be configurable the exact same way?
+
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'CIS_GESAMTNOTE_UEBERSCHREIBEN' => CIS_GESAMTNOTE_UEBERSCHREIBEN,
+			'CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF' => CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF,
+			'CIS_GESAMTNOTE_PRUEFUNG_TERMIN3' => CIS_GESAMTNOTE_PRUEFUNG_TERMIN3,
+			'CIS_GESAMTNOTE_PRUEFUNG_TERMIN2' => CIS_GESAMTNOTE_PRUEFUNG_TERMIN2,
+			'CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE' => CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE,
+			'CIS_GESAMTNOTE_PUNKTE' => CIS_GESAMTNOTE_PUNKTE,
+			'CIS_GESAMTNOTE_GEWICHTUNG' => CIS_GESAMTNOTE_GEWICHTUNG,
+			'CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN' => CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+	}
+	
+}

application/controllers/Tempus.php

@@ -1,40 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Tempus extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin')
-			],
-			'variables' => [
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			]
-		]);
-	}
-}

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

@@ -41,7 +41,9 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED
+			'getLv' => self::PERM_LOGGED,
+			'getLeEvents' => self::PERM_LOGGED,
+			'getLvEvents' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -54,6 +56,12 @@ class LvPlan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
+		$this->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'ui'
+			)
+		);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -145,6 +153,38 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
+	public function getLeEvents($le_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
+	{
+
+		if (is_null($le_id) || is_null($start_date) || is_null($end_date))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->library('StundenplanLib');
+
+		$result = $this->stundenplanlib->getEventsByLE($le_id, $start_date, $end_date, $stundenplan);
+		$lvplanEvents = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($lvplanEvents);
+	}
+
+	public function getLvEvents($lv_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
+	{
+		if (is_null($lv_id) || is_null($start_date) || is_null($end_date))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->library('StundenplanLib');
+
+		$result = $this->stundenplanlib->getEventsByLV($lv_id, $start_date, $end_date, $stundenplan);
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
 	public function studiensemesterDateInterval($date){
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');

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

@@ -0,0 +1,929 @@
+<?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');
+
+use CI3_Events as Events;
+
+class Noten extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudentenNoten' => array('lehre/benotungstool:rw'),
+			'getNoten' => array('lehre/benotungstool:rw'),
+			'saveStudentenNoten' => array('lehre/benotungstool:rw'),
+			'getNotenvorschlagStudent' => array('lehre/benotungstool:rw'),
+			'saveNotenvorschlag' => array('lehre/benotungstool:rw'),
+			'saveStudentPruefung' => array('lehre/benotungstool:rw'),
+			'createPruefungen' => array('lehre/benotungstool:rw'),
+			'saveNotenvorschlagBulk' => array('lehre/benotungstool:rw'),
+			'savePruefungenBulk' => array('lehre/benotungstool:rw')
+		]);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->library('PhrasesLib');
+		
+		// Loads phrases system
+		$this->loadPhrases([
+			'global',
+			'person',
+			'benotungstool',
+			'lehre',
+			'ui'
+		]);
+		require_once(FHCPATH . 'include/mobilitaet.class.php');
+		
+		$this->load->model('education/LePruefung_model', 'LePruefungModel');
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$this->load->helper('hlp_sancho_helper');
+
+	}
+
+
+	/**
+	 * GET METHOD
+	 * expects 'lv_id', 'sem_kurzbz'
+	 * returns List of all Students of given lehrveranstaltung and semester and fetches their grades.
+	 * Loads LvGesamtnote aswell as Teilnoten from externalSources via getExternalGrades Event.
+	 * Calculates the Notenvorschlag for every student based on averaging their Teilnoten.
+	 * Finally also fetches all Prüfungen for every student which are linked to lva and semester.
+	 */
+	public function getStudentenNoten() {
+		$lv_id = $this->input->get("lv_id",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		if (!isset($lv_id) || isEmptyString($lv_id)
+			|| !isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// get studenten for lva & sem with zeugnisnote if available
+		$studenten = $this->LehrveranstaltungModel->getStudentsByLv($sem_kurzbz, $lv_id);
+		$studentenData = $this->getDataOrTerminateWithError($studenten);
+		
+		$func = function ($value) {
+			return $value->uid;
+		};
+		
+		$grades = array();
+		$student_uids = array_map($func, $studentenData);
+		
+		foreach($student_uids as $uid) {
+			$grades[$uid]['grades'] = [];
+			
+			$res = $this->StudentModel->load([$uid]);
+			if(!isError($res) && hasData($res)) $student = getData($res)[0];
+
+			$prestudent_id = $student->prestudent_id;
+			
+			
+			// TODO: last class to get rid of but this one is complicated
+			$mobility = new mobilitaet();
+			$mobility->loadPrestudent($prestudent_id);
+			$output = $mobility->result;
+			$eintrag = '';
+			foreach ($output as $k)
+			{
+				if(($k->mobilitaetstyp_kurzbz == 'GS') && ($k->studiensemester_kurzbz == $sem_kurzbz))
+					$eintrag = ' (d.d.)';
+			}
+			$grades[$uid]['mobility'] = $eintrag;
+			
+			$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $uid, $sem_kurzbz);
+
+			if(!isError($result) && hasData($result)) {
+				$lvgesamtnote = getData($result)[0];
+				$grades[$uid]['note_lv'] = $lvgesamtnote->note;
+				$grades[$uid]['freigabedatum'] = $lvgesamtnote->freigabedatum;
+				$grades[$uid]['benotungsdatum'] = $lvgesamtnote->benotungsdatum;
+				$grades[$uid]['punkte_lv'] = $lvgesamtnote->punkte;
+			} else {
+				$grades[$uid]['note_lv'] = null;
+				$grades[$uid]['freigabedatum'] = null;
+				$grades[$uid]['benotungsdatum'] = null;
+				$grades[$uid]['punkte_lv'] = null;
+			}
+		}
+
+		// send $grades reference to moodle addon
+		Events::trigger(
+			'getExternalGrades',
+			function & () use (&$grades)
+			{
+				return $grades;
+			},
+			[
+				'lvid' => $lv_id,
+				'stsem' => $sem_kurzbz
+			]
+		);
+		
+		// calculate notenvorschläge from teilnoten
+		foreach($studentenData as $student) {
+			$g = $grades[$student->uid]['grades'];
+			$note_lv = $grades[$student->uid]['note_lv'];
+			
+			// overwrite any calculation with lv note once available
+			if(!is_null($note_lv)) {
+				$student->note_vorschlag = $note_lv;
+			} else if(count($g) > 0) {
+				
+				$notensumme = 0;
+				$notensumme_gewichtet = 0;
+				$gewichtsumme = 0;
+				$punktesumme = 0;
+				$punktesumme_gewichtet = 0;
+				$anzahlnoten = 0;
+				foreach($g as $teilnote) {
+					if (is_numeric($teilnote['grade']) || (is_null($teilnote['grade']) && is_numeric($teilnote['points'])))
+					{
+						$notensumme += $teilnote['grade'];
+						$punktesumme += $teilnote['points'];
+						$notensumme_gewichtet += $teilnote['grade'] * $teilnote['weight'];
+						$punktesumme_gewichtet += $teilnote['points'] * $teilnote['weight'];
+						$gewichtsumme += $teilnote['weight'];
+						$anzahlnoten += 1;
+					}
+				}
+
+				
+				// TODO: develop the punkte feature with models
+				// calculate grades points from notenschlüssel
+				if (CIS_GESAMTNOTE_PUNKTE)
+				{
+					if (defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG)
+					{
+						// Lehreinheitsgewichtung
+						$punkte_vorschlag = round($punktesumme_gewichtet / $gewichtsumme, 2);
+						$notenschluessel = new notenschluessel();
+						$note_vorschlag = $notenschluessel->getNote($punkte_vorschlag, $lv_id, $sem_kurzbz);
+					}
+					else
+					{
+						$punkte_vorschlag = round($punktesumme / $anzahlnoten, 2);
+						$notenschluessel = new notenschluessel();
+						$note_vorschlag = $notenschluessel->getNote($punkte_vorschlag, $lv_id, $sem_kurzbz);
+					}
+				}
+				else
+				{
+					if (defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG)
+					{
+						$note_vorschlag = round($notensumme_gewichtet / $gewichtsumme);
+					}
+					else
+					{
+						$note_vorschlag = round($notensumme / $anzahlnoten);
+					}
+				}
+				
+
+				$student->note_vorschlag = $note_vorschlag;
+			}
+		}
+		
+		// get all prüfungen with noten held in that semester in that lva
+		$pruefungen = $this->LePruefungModel->getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz);
+		$pruefungenData = getData($pruefungen);
+		
+		$this->terminateWithSuccess(array($studentenData, $pruefungenData, DOMAIN, $grades));
+	}
+
+	/**
+	 * GET METHOD
+	 * returns List of all available & active NotenOptions 
+	 */
+	public function getNoten() {
+		$this->load->model('education/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->getAllActive();
+		$noten = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($noten);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'lv_id', 'sem_kurzbz', 'password', 'noten'
+	 * Notenfreigabe method which checks the users password as a security measure.
+	 * Tries to load Lehrveranstaltung, Studiengang and Person via Model in order to validate the coherency of input parameters
+	 * lv_id & sem_kurzbz in relation to the noten array delivered.
+	 * Updates the LvGesamtnote note, aswell as freigabedatum, which is key in the logic of the freigegeben/offen/changed notenStatus
+	 * Along this process builds a html table to be placed in a confirmation email (uid only and full variant depending on config)
+	 * which is being sent to the Lektor, aswell as the assigned Assistenz.
+	 */
+	public function saveStudentenNoten() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'sem_kurzbz') || !property_exists($result, 'lv_id') || 
+			!property_exists($result, 'password') || !property_exists($result, 'noten')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+		
+		if(!$this->AuthLib->checkUserAuthByUsernamePassword(getAuthUID(), $result->password)->retval) {
+			$this->terminateWithError($this->p->t('global', 'wrongPassword'), 'general');
+		}
+		
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		
+		$ret = [];
+		
+		$res = $this->LehrveranstaltungModel->load($lv_id);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidLvFoundForId', [$lv_id]));
+		}
+
+		$lv = getData($res)[0];
+
+		$studiengang_kz = $lv->studiengang_kz;
+		$res = $this->StudiengangModel->load($studiengang_kz);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidStudiengangFoundForId', [$studiengang_kz]));
+		}
+		$sg = getData($res)[0];
+		$lvaFullName = $sg->kurzbzlang . ' ' . $lv->semester . '.Semester
+					' . $lv->bezeichnung . " - " .$lv->lehrform_kurzbz. " " . $lv->orgform_kurzbz . " - " . $sem_kurzbz;
+		
+		$emails = explode(', ', $sg->email);
+		
+
+		$res = $this->PersonModel->load(getAuthPersonId());
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidPersonFoundForId', [getAuthPersonId()]));
+		}
+		$pers = getData($res)[0];
+		$lektorFullName = $pers->anrede.' '.$pers->vorname.' '.$pers->nachname; //.' ('.$pers->kurzbz.')';
+
+		
+		$res = $this->StudienplanModel->getStudienplanByLvaSemKurzbz($lv_id, $sem_kurzbz);
+		$data = getData($res);
+		$studienplan_bezeichnung = '';
+		foreach ($data as $row) {
+			$studienplan_bezeichnung .= $row->bezeichnung . ' ';
+		}
+		$betreff = $this->p->t('benotungstool','notenfreigabe').' ' . $lv->bezeichnung . ' ' . $lv->orgform_kurzbz . ' - ' . $studienplan_bezeichnung;
+		
+		$studlist = "<table border='1'><tr>";
+
+		if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE) {
+			$studlist .= "<td><b>" . $this->p->t('person','personenkennzeichen') . "</b></td>\n
+			<td><b>" . $this->p->t('lehre','studiengang') . "</b></td>\n
+			<td><b>" . $this->p->t('benotungstool','c4nachname') . "</b></td>\n
+			<td><b>" . $this->p->t('benotungstool','c4vorname') . "</b></td>\n";
+			$studlist .= "<td><b>" . $this->p->t('benotungstool','c4grade') . "</b></td>\n";
+			$studlist .= "<td><b>" . $this->p->t('ui','bearbeitetVon') . "</b></td></tr>\n";
+		} else {
+			$studlist .= "<td><b>" . $this->p->t('person','uid') . "</b></td></tr>\n";
+		}
+		
+		foreach($result->noten as $note) {
+
+			$resultLVGes = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $note->uid, $sem_kurzbz);
+
+			if (!isError($resultLVGes) && hasData($resultLVGes))
+			{
+				$lvgesamtnote = getData($resultLVGes)[0];
+
+				if ($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
+				{
+
+					$id = $this->LvgesamtnoteModel->update(
+						[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+						array(
+							'note' => $note->note,
+							'freigabevon_uid' => getAuthUID(),
+							'freigabedatum' => date("Y-m-d H:i:s"),
+							'updateamum' => date("Y-m-d H:i:s"),
+							'updatevon' => getAuthUID()
+						)
+					);
+
+					if($id) {
+						$res = $this->LvgesamtnoteModel->load($id->retval);
+						if(hasData($res)) {
+							$lvgesamtnote = getData($res)[0];
+							$ret[] = array('uid' => $note->uid, 'freigabedatum' => $lvgesamtnote->freigabedatum, 'benotungsdatum' => $lvgesamtnote->benotungsdatum);
+						}
+					}
+					 
+					if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
+					{
+						$studlist .= "<tr><td>" . trim($note->matrikelnr) . "</td>";
+						$studlist .= "<td>" . trim($note->kuerzel) . "</td>";
+						$studlist .= "<td>" . trim($note->nachname) . "</td>";
+						$studlist .= "<td>" . trim($note->vorname) . "</td>";
+
+						// TODO: if defined(CIS_PUNKTE) ...
+						$studlist .= "<td>" .$note->noteBezeichnung. "</td>";
+
+						$studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
+						if ($lvgesamtnote->updatevon != '')
+							$studlist .= " (" . $lvgesamtnote->updatevon . ")";
+						$studlist .= "</td></tr>";
+					} else {
+						$studlist .= "<tr><td>" . trim($note->uid) . "</td></tr>\n";
+					}
+				}
+			}
+		}
+		$studlist .= "</table>";
+
+		// always send the mail, config toggles data contents
+		$this->sendEmail($lektorFullName, $lvaFullName, count($result->noten), $emails, $studlist, $betreff);
+		
+		$this->terminateWithSuccess($ret);
+	}
+
+	
+	private function sendEmail($lektorFullName, $lvaFullName, $notenCount, $emailAdressen, $studlist, $betreff)
+	{
+		$emailAdressen[] = getAuthUID() . "@" . DOMAIN; // also send mail to lektors own adress
+		$adressen = implode(";", $emailAdressen);
+		
+		foreach ($emailAdressen as $email)
+		{
+			// Prepare mail content
+			$body_fields = array(
+				'lektor' => $lektorFullName,
+				'lvaname' => $lvaFullName,
+				'studlist' => $studlist,
+				'neuenotencount' => $notenCount,
+				'adressen' => $adressen
+			);
+
+			// Send mail
+			sendSanchoMail(
+				'Notenfreigabe',
+				$body_fields,
+				$email,
+				$betreff
+			);
+		}
+
+	}
+
+	/**
+	 * GET METHOD
+	 * should return Notenvorschlag for single Students, not yet implemented since it is not needed anywhere right now,
+	 * but could be useful later on.
+	 */
+	public function getNotenvorschlagStudent() {
+		// TODO: Notenvorschlag laden allgemeiner Endpunkt, der im Backend mit Logik (z.B. Moodle) angepasst werden kann.
+		
+		$this->terminateWithSuccess();
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'datum', 'lva_id', 'student_uid', 'note'
+	 * Inserts or updates a pruefung for lva & student_uid at given datum (YYYY-MM-DD). When creating a new
+	 * Pruefung, sets the provided (Prüfungs-) Note.
+	 * Updates the LvGesamtnote of student.
+	 * Can return 1 or 2 Prüfungen, since the original grade before the first prüfung is being saved as "Termin1" when
+	 * a "Termin2" is being created.
+	 */
+	public function saveStudentPruefung() { // einzelne pruefung speichern
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'datum') || !property_exists($result, 'lva_id') ||
+			!property_exists($result, 'student_uid') || !property_exists($result, 'note')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$student_uid = $result->student_uid;
+		$note = $result->note;
+		$punkte = null;
+		$datum = $result->datum;
+		$lva_id = $result->lva_id;
+		$lehreinheit_id = $result->lehreinheit_id;
+		
+		$stsem = $result->sem_kurzbz;
+		$typ = $result->typ;
+		
+		$jetzt = date("Y-m-d H:i:s");
+		
+		// nachpruefungeintragen.php script calls query on campus.student_lehrveranstaltung to find a
+		// lehreinheit_id for lva_id -> lehreinheit should be determined prior to that in new benotungstool
+		// by retrieving it from students row in campus.vw_student_lehrveranstaltung earlier on
+		
+//		$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
+//		$lehreinheit_id = $result->lehreinheit_id;
+		
+		$punkte = null;
+
+//		if($punkte!='')
+//		{
+//			// Bei Punkteeingabe wird die Note nochmals geprueft und ggf korrigiert
+//			$notenschluessel = new notenschluessel();
+//			$note_pruef = $notenschluessel->getNote($punkte, $lva_id, $stsem);
+//			if($note_pruef!=$note)
+//			{
+//				$note = $note_pruef;
+//				$note_dirty=true;
+//			}
+//		}
+
+		// TODO: more sophisticated empty check
+		if($note=='')
+			$note = 9;
+		
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$res = $this->LehrveranstaltungModel->load($lva_id);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError('Keine gültige Lehrveranstaltung gefunden für ID: '.$lva_id);
+		}
+		
+		$studiengang_kz = getData($res)[0]->studiengang_kz;
+		$res = $this->StudiengangModel->load($studiengang_kz);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError('Kein gültiger Studiengang gefunden für ID: '.$studiengang_kz);
+		}
+		
+		$pruefungenChanged = $this->savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum);
+		
+		//Gesamtnote updaten
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lva_id, $student_uid, $stsem);
+		if(!isError($result) && !hasData($result)) {
+			
+			$id = $this->LvgesamtnoteModel->insert(
+				array(
+					'student_uid' => $student_uid,
+					'lehrveranstaltung_id' => $lva_id,
+					'studiensemester_kurzbz' => $stsem,
+					'note' => $note,
+					'punkte' => $punkte,
+					'mitarbeiter_uid' => getAuthUID(),
+					'benotungsdatum' => $jetzt,
+					'freigabedatum' => null,
+					'freigabevon_uid' => null,
+					'bemerkung' => null,
+					'updateamum' => null,
+					'updatevon' => null,
+					'insertamum' => $jetzt,
+					'insertvon' => getAuthUID()
+				)
+			);
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		}
+		else if(!isError($result) && hasData($result))
+		{
+			$lvgesamtnote = getData($result)[0];
+
+			$id = $this->LvgesamtnoteModel->update(
+				[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+				array(
+					'note' => $note,
+					'punkte' => $punkte,
+					'benotungsdatum' => $jetzt,
+					'updateamum' => $jetzt,
+					'updatevon' => getAuthUID()
+				)
+			);
+
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+			
+		}
+		
+		$savedPruefung = $pruefungenChanged['savedPruefung'] ?? null;
+		$extraPruefung = $pruefungenChanged['extraPruefung'] ?? null;
+
+		$savedPruefungData = count($savedPruefung) > 0 ? $savedPruefung[0] : null;
+		$extraPruefungData = count($extraPruefung) > 0 ? $extraPruefung[0] : null;
+		
+		$this->terminateWithSuccess(array($savedPruefungData, $lvgesamtnote, $extraPruefungData));
+	}
+
+	/**
+	 * private helper method to update/insert pruefungstermine 
+	 */
+	private function savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum) 
+	{
+
+		$status = [];
+		
+		// send $grades reference to moodle addon
+		Events::trigger(
+			'getEntschuldigungsStatusForStudentOnDate',
+			function & () use (&$status)
+			{
+				return $status;
+			},
+			[
+				'student_uid' => $student_uid,
+				'datum' => $datum
+			]
+		);
+		
+		if(count($status) > 0 && $status[0] == true) {
+			$note = 17; //entschuldigt
+		}
+		
+		$jetzt = date("Y-m-d H:i:s");
+		
+		$pruefungenChanged = [];
+		
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		
+		if($typ == "Termin2" && defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2) 
+		{
+			
+			// Wenn eine Nachprüfung angelegt wird, wird zuerst eine Pruefung mit 1. Termin angelegt welche für die ursprüngliche Note
+			// vor den Prüfungsantritten zählt
+			
+			$result1 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin1", $lva_id, $stsem);
+			
+			// if there is a termin 1 entry already do nothing
+			if(!isError($result1) && hasData($result1)) {
+
+			} else if(!isError($result1) && !hasData($result1)) {
+				// new entry termin1
+
+				$resultLV = $this->LvgesamtnoteModel->getLvGesamtNoten($lva_id, $student_uid, $stsem);
+				
+				// update Termin1 note
+				if (hasData($resultLV))
+				{
+					$lvgesamtnote = getData($resultLV)[0];
+					$pr_note = $lvgesamtnote->note;
+					$pr_punkte = $lvgesamtnote->punkte;
+					$benotungsdatum = $lvgesamtnote->benotungsdatum;
+				}
+				else if(!hasData($resultLV))// set Termin1 note to "noch nicht eingetragen"
+				{
+					$pr_note = 9; 
+					$pr_punkte = null;
+					$benotungsdatum = $jetzt;
+				}
+				
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $pr_note,
+//						'punkte' => $pr_punkte,
+						'pruefungstyp_kurzbz' => "Termin1",
+						'datum' => $benotungsdatum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['extraPruefung'] = getData($res);
+				}
+			}
+			
+			
+			// Die Pruefung wird als Termin2 eingetragen
+			$result2 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin2", $lva_id, $stsem);
+			// if there is a termin 2 entry already update it
+			if(!isError($result2) && hasData($result2)) {
+				// update
+				$termin2 = getData($result2)[0];
+				$id = $this->LePruefungModel->update(
+					$termin2->pruefung_id,
+					array(
+						'updateamum' => $jetzt,
+						'updatevon' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => $punkte,
+						'datum' => $datum,
+						'anmerkung' => ""
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+
+			} else if(!isError($result2) && !hasData($result2)) {
+				// new entry termin 2
+
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => null,//$punkte,
+						'pruefungstyp_kurzbz' => $typ,
+						'datum' => $datum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+			}
+
+		} else if($typ == "Termin3" && defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3) 
+		{
+
+			$result3 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin3", $lva_id, $stsem);
+
+			if(!isError($result3) && hasData($result3)) {
+				// update
+				$termin3 = getData($result3)[0];
+
+				$id = $this->LePruefungModel->update(
+					$termin3->pruefung_id,
+					array(
+						'updateamum' => $jetzt,
+						'updatevon' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => $punkte,
+						'datum' => $datum,
+						'anmerkung' => ""
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+
+			} else if(!isError($result3) && !hasData($result3)) {
+				// insert new termin3
+
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => null,//$punkte,
+						'pruefungstyp_kurzbz' => $typ,
+						'datum' => $datum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+				
+			}
+		} else {
+			$this->terminateWithError($this->p->t('benotungstool', 'wrongPruefungType', [$student_uid, $typ]), 'general');
+		}
+		
+		return $pruefungenChanged;
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'sem_kurzbz', 'lv_id', 'student_uid', 'note'
+	 * Method that sets lv_note of student in lva and semester from provided Points/Grade Selection.
+	 * Updates the note & benotungsdatum, which is key in the noten state offen/freigegeben/changed
+	 */
+	public function saveNotenvorschlag() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'student_uid') || !property_exists($result, 'note')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$student_uid = $result->student_uid;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$note = $result->note;
+
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $student_uid, $sem_kurzbz);
+
+		if(!isError($result) && hasData($result)) {
+			$lvgesamtnote = getData($result)[0];
+			
+			$id = $this->LvgesamtnoteModel->update(
+				[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+				array(
+					'note' => $note,
+					'punkte' => null,
+					'benotungsdatum' => date("Y-m-d H:i:s"),
+					'updateamum' => date("Y-m-d H:i:s"),
+					'updatevon' => getAuthUID()
+				)
+			);
+
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		} else if(!isError($result) && !hasData($result)) {
+			$id = $this->LvgesamtnoteModel->insert(
+				array(
+					'student_uid' => $student_uid,
+					'lehrveranstaltung_id' => $lv_id,
+					'studiensemester_kurzbz' => $sem_kurzbz,
+					'note' => $note,
+					'punkte' => null,
+					'mitarbeiter_uid' => getAuthUID(),
+					'benotungsdatum' => date("Y-m-d H:i:s"),
+					'freigabedatum' => null,
+					'freigabevon_uid' => null,
+					'bemerkung' => null,
+					'updateamum' => null,
+					'updatevon' => null,
+					'insertamum' => date("Y-m-d H:i:s"),
+					'insertvon' => getAuthUID()
+				)
+			);
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		}
+		
+		$this->terminateWithSuccess(array($lvgesamtnote));
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'sem_kurzbz', 'lv_id', 'noten'
+	 * Bulk variant of saveNotenvorschlag, used when importing grades from csv.
+	 */
+	public function saveNotenvorschlagBulk() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'noten')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$noten = $result->noten;
+		
+		$retLvNoten = [];
+		
+		foreach($noten as $note)
+		{
+
+			$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $note->uid, $sem_kurzbz);
+
+			if(!isError($result) && hasData($result)) {
+				$lvgesamtnote = getData($result)[0];
+
+				$id = $this->LvgesamtnoteModel->update(
+					[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+					array(
+						'note' => trim($note->note),
+						'punkte' => null,
+						'benotungsdatum' => date("Y-m-d H:i:s"),
+						'updateamum' => date("Y-m-d H:i:s"),
+						'updatevon' => getAuthUID()
+					)
+				);
+
+				if($id) {
+					$res = $this->LvgesamtnoteModel->load($id->retval);
+					if(hasData($res)) $lvgesamtnote = getData($res)[0];
+				}
+			} else if(!isError($result) && !hasData($result)) {
+				$id = $this->LvgesamtnoteModel->insert(
+					array(
+						'student_uid' => $note->uid,
+						'lehrveranstaltung_id' => $lv_id,
+						'studiensemester_kurzbz' => $sem_kurzbz,
+						'note' => trim($note->note),
+						'punkte' => null,
+						'mitarbeiter_uid' => getAuthUID(),
+						'benotungsdatum' => date("Y-m-d H:i:s"),
+						'freigabedatum' => null,
+						'freigabevon_uid' => null,
+						'bemerkung' => null,
+						'updateamum' => null,
+						'updatevon' => null,
+						'insertamum' => date("Y-m-d H:i:s"),
+						'insertvon' => getAuthUID()
+					)
+				);
+				if($id) {
+					$res = $this->LvgesamtnoteModel->load($id->retval);
+					if(hasData($res)) $lvgesamtnote = getData($res)[0];
+				}
+			}
+
+			$retLvNoten[] = $lvgesamtnote;
+		}
+
+		$this->terminateWithSuccess($retLvNoten);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'uids', 'datum'
+	 * Bulk variant of saveStudentPruefung, used when creating a new Prüfung for several students. Always sets note to
+	 * "noch nicht eingetragen" for the created Prüfung.
+	 */
+	public function createPruefungen() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'uids') || !property_exists($result, 'datum')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$uids = $result->uids;
+		$datum = $result->datum;
+		$lva_id = $result->lva_id;
+		
+		$stsem = $result->sem_kurzbz;
+		
+		$ret = [];
+		
+		foreach ($uids as $student) {
+			$student_uid = $student->uid;
+			$typ = $student->typ;
+			$note = 9; //$result->note; // TODO: parameterize for import maybe
+			$punkte = ''; // TODO: check punkte feature
+
+			$lehreinheit_id = $student->lehreinheit_id;
+			$ret[$student->uid] = $this->savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum);
+		}
+
+		$this->terminateWithSuccess($ret);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'lv_id', 'sem_kurzbz', 'pruefungen'
+	 * Bulk variant of saveStudentPruefung, used when importing pruefungsdata from csv with available noten.
+	 */
+	public function savePruefungenBulk() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'pruefungen')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$pruefungen = $result->pruefungen;
+		
+		$ret = [];
+
+		foreach ($pruefungen as $pruefung) {
+			$student_uid = $pruefung->uid;
+			$typ = $pruefung->typ;
+			$note = $pruefung->note; // TODO: parameterize for import maybe
+			$datum = $pruefung->datum;
+			$punkte = ''; // TODO: check punkte feature
+
+			$lehreinheit_id = $pruefung->lehreinheit_id;
+			$ret[$student_uid] = $this->savePruefungstermin($typ, $student_uid, $lv_id, $sem_kurzbz, $lehreinheit_id, $note, $punkte, $datum);
+		}
+		
+		$this->terminateWithSuccess($ret);
+	}
+
+}
+

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

@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller
 
 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-			'GetTempusRenderers' => self::PERM_LOGGED,
+           
 		]);
 
         $this->load->library('LogLib');
@@ -66,26 +66,6 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}
 
-	public function GetTempusRenderers(){
-		$renderer_paths = [];
-		Events::trigger(
-				'loadRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-
-		Events::trigger(
-				'loadTempusRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-		$this->terminateWithSuccess($renderer_paths);
-	}
-
 	
 	
 

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

@@ -0,0 +1,86 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Config extends FHCAPI_Controller
+{
+	private $_ci;
+	private $_uid;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+
+		$this->loadPhrases([
+			'lehre'
+		]);
+
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->library('PermissionLib');
+
+	}
+
+
+	public function get()
+	{
+		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
+			$this->terminateWithSuccess([]);
+
+		$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
+		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
+		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
+
+		$config['ignore_kollision'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_kollision',
+			"value" => $ignore_kollision,
+		];
+
+		$config['ignore_zeitsperre'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_zeitsperre',
+			"value" => $ignore_zeitsperre,
+		];
+
+		$config['ignore_reservierung'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_reservierung',
+			"value" => $ignore_reservierung,
+		];
+
+		$this->terminateWithSuccess($config);
+	}
+	public function set()
+	{
+		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		foreach (['ignore_kollision','ignore_zeitsperre','ignore_reservierung'] as $variable)
+		{
+			if ($this->_ci->input->post($variable) !== null)
+			{
+				$this->VariableModel->update(array('uid' => $this->_uid, 'name' => $variable), array('wert' => $this->input->post($variable)));
+
+			}
+		}
+
+		$this->terminateWithSuccess();
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+}

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

@@ -15,6 +15,7 @@ class Gruppe extends FHCAPI_Controller
 			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
 			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
+			'getGruppe' => ['admin:r', 'assistenz:r'],
 		]);
 
 		$this->_ci = &get_instance();
@@ -67,7 +68,7 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->checkPermission($lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, $lehrverband === true || $lehrverband === 'true');
 
 		if (isError($result))
 			$this->terminateWithError(getError($result));
@@ -75,6 +76,71 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getGruppe()
+	{
+		$lehrverband = $this->input->post('lehrverband');
+
+		$gruppen_result = array();
+
+		if ($lehrverband === false)
+		{
+			$gruppen_result = $this->_ci->GruppeModel->loadWhere(array(
+				'studiengang_kz' => $this->input->post('stg_kz'),
+				'gruppe_kurzbz' => $this->input->post('gruppe_kurzbz'),
+				'aktiv' => true
+			));
+		}
+		else if ($lehrverband === true)
+		{
+
+			if (!isEmptyString($this->input->post('verband')))
+			{
+				$this->LehrverbandModel->db->where('verband', $this->input->post('verband'));
+			}
+			else
+			{
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("trim(verband) = ''");
+				$this->LehrverbandModel->db->or_where("verband IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			if (!isEmptyString($this->input->post('gruppe')))
+			{
+				$this->LehrverbandModel->db->where('gruppe', $this->input->post('gruppe'));
+			}
+			else
+			{
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("trim(gruppe) = ''");
+				$this->LehrverbandModel->db->or_where("gruppe IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			if (!isEmptyString((string)$this->input->post('semester')))
+			{
+				$this->LehrverbandModel->db->where('semester', $this->input->post('semester'));
+			}
+			else
+			{
+
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("semester = ''");
+				$this->LehrverbandModel->db->or_where("semester IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			$gruppen_result = $this->LehrverbandModel->loadWhere(array('studiengang_kz' => $this->input->post('stg_kz'), 'aktiv' => true));
+		}
+
+		if (!hasData($gruppen_result))
+			return $this->terminateWithError('No group found');
+
+		$gruppen_array = getData($gruppen_result)[0];
+
+		$this->terminateWithSuccess($gruppen_array->gid);
+	}
+
 	public function getByLehreinheit($lehreinheit_id = null)
 	{
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
@@ -118,17 +184,54 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
+											studiengang_kz,
+											semester,
+											bezeichnung,
+											gid,
+											\'false\' as lehrverband');
+		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->GruppeModel->db->group_start();
+			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->group_end();
+		}
+		$this->_ci->GruppeModel->db->group_end();
+
+		$gruppen_result = $this->_ci->GruppeModel->load();
+
+		$gruppen_array = array();
 
 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
 
-		$gruppen_array = array();
-
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);
 
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
+												studiengang_kz,
+												semester,
+												tbl_lehrverband.bezeichnung,
+												gid,
+												\'true\' as lehrverband');
+		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehrverbandModel->addOrder('verband');
+		$this->_ci->LehrverbandModel->addOrder('gruppe');
+		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->_ci->LehrverbandModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehrverbandModel->db->group_start();
+			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->group_end();
+		}
+		$this->_ci->LehrverbandModel->db->group_end();
+		$lehrverband_result = $this->_ci->LehrverbandModel->load();
 
 		$lehrverband_array = array();
 

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

@@ -134,9 +134,14 @@ class Lektor extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
+		$nullable_fields = array('semesterstunden', 'stundensatz', 'planstunden');
+
+		foreach ($nullable_fields as $nullable_field)
 		{
-			$formData['semesterstunden'] = null;
+			if (isset($formData[$nullable_field]) && (!is_numeric($formData[$nullable_field]) || $formData[$nullable_field] === ''))
+			{
+				$formData[$nullable_field] = null;
+			}
 		}
 
 		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
@@ -144,6 +149,9 @@ class Lektor extends FHCAPI_Controller
 		if (!$lehreinheit_permission)
 			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
 
+		if (!is_null($this->getLektorVertrag($lehreinheit_id, $mitarbeiter_uid)) && (array_key_exists('mitarbeiter_uid', $formData) && $mitarbeiter_uid !== $formData['mitarbeiter_uid']))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+
 		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
 
 		if (isError($result)) $this->terminateWithError(getError($result));
@@ -154,7 +162,7 @@ class Lektor extends FHCAPI_Controller
 	{
 		$value = str_replace(',', '.', $value);
 
-		if (!is_numeric($value))
+		if (!is_numeric($value) && $value !== "")
 		{
 			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss eine Zahl sein.');
 			return false;

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

@@ -0,0 +1,84 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Noten extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getCertificate' => 'student/noten:r',
+			'getTeacherProposal' => 'student/noten:r',
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'stv',
+			'person',
+			'lehre'
+		]);
+	}
+
+	public function getCertificate($lv_id, $studiensemester_kurzbz = null)
+	{
+		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->LehrveranstaltungModel->loadWhere([
+			'lehrveranstaltung_id' => $lv_id
+		]);
+
+		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehrveranstaltung)
+			$this->terminateWithSuccess([]);
+
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$result = $this->ZeugnisnoteModel->getZeugnisnoten(null, $studiensemester_kurzbz, $lehrveranstaltung[0]->lehrveranstaltung_id);
+
+		$grades = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($grades);
+	}
+
+	public function getTeacherProposal($lv_id, $studiensemester_kurzbz = null)
+	{
+		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->LehrveranstaltungModel->loadWhere([
+			'lehrveranstaltung_id' => $lv_id
+		]);
+
+		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehrveranstaltung)
+			$this->terminateWithSuccess([]);
+
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, null, $studiensemester_kurzbz);
+
+		$grades = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($grades);
+	}
+
+}

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

@@ -27,7 +27,8 @@ class Setup extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getTabs' => ['admin:r', 'assistenz:r'],
+			'getLETabs' => ['admin:r', 'assistenz:r'],
+			'getLVTabs' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
@@ -41,9 +42,10 @@ class Setup extends FHCAPI_Controller
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->helper('hlp_document');
 	}
 
-	public function getTabs()
+	public function getLETabs()
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
@@ -60,6 +62,11 @@ class Setup extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
+		$tabs['termine'] = array (
+			'title' =>  'Termine',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Termine.js',
+			'config' => []
+		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
@@ -68,6 +75,28 @@ class Setup extends FHCAPI_Controller
 		$this->terminateWithSuccess($tabs);
 	}
 
+	public function getLVTabs()
+	{
+		$tabs['termine'] = array (
+			'title' =>  'Termine',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/LVTermine.js',
+			'config' => []
+		);
+		$tabs['noten'] = array (
+			'title' =>  'Noten',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Noten.js',
+			'config' => [
+				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
+				'edit' => 'both', // Possible values: both|header|inline
+				'delete' => 'inline', // Possible values: both|header|inline
+				'documents' => 'inline', // Possible values: both|header|inline
+				'documentslist' => gradesDocumentsList(),
+				'semesterSelect' => false
+			]
+		);
+		$this->terminateWithSuccess($tabs);
+	}
+
 	public function getStudiensemester()
 	{
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');

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

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

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

@@ -301,6 +301,7 @@ class Config extends FHCAPI_Controller
 
 	public function student()
 	{
+		$this->load->helper('hlp_document');
 		$result = [];
 		$config = $this->config->item('tabs');
 
@@ -376,9 +377,9 @@ class Config extends FHCAPI_Controller
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
 				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'both', // Possible values: both|header|inline
-				'documents' => 'both', // Possible values: both|header|inline
-				'documentslist' => $this->gradesDocumentsList()
+				'delete' => 'inline', // Possible values: both|header|inline
+				'documents' => 'inline', // Possible values: both|header|inline
+				'documentslist' => gradesDocumentsList()
 			]
 		];
 
@@ -622,188 +623,6 @@ class Config extends FHCAPI_Controller
 		] + $this->kontoColumns();
 	}
 
-	/**
-	 * Helper function to generate the default documentslist config for the
-	 * grades tab.
-	 *
-	 * The resulting array consists of elements which are associative arrays
-	 * that can have the following entries:
-	 * title			(required) on the first level this can be HTML code.
-	 * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
-	 * 						true or false.
-	 * link				(optional) an URL that will be called if "action" and
-	 * 						"children" are not defined.
-	 * action			(optional) an associative array that describes an
-	 * 						POST action that will be called if "children" is
-	 * 						not defined.
-	 * 						It can have the following entries:
-	 * - url			(required) an URL to an FHCAPI endpoint.
-	 * - post			(optional) an associative array with the POST data to
-	 * 						be sent.
-	 * - response		(optional) a string that will be displayed on success.
-	 * children			(optional) an array of child elements
-	 *
-	 * All strings that start with { and end with } in the URLs and the
-	 * actions post parameter will be replaced with the corresponding
-	 * attribute of the current dataset (e.G: {uid} will be replaced with the
-	 * uid of the current dataset)
-	 *
-	 * @return array
-	 */
-	protected function gradesDocumentsList()
-	{
-		$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
-
-		$title_ger = $this->p->t("global", "deutsch");
-		$title_eng = $this->p->t("global", "englisch");
-		$title_ff = $this->p->t("stv", "document_certificate");
-		$title_lv = $this->p->t("stv", "document_coursecertificate");
-
-		$link_ff = "documents/export/" .
-			"zertifikat.rdf.php/" .
-			"Zertifikat" .
-			"?stg_kz={studiengang_kz_lv}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-		$link_lv_ger = "documents/export/" .
-			"lehrveranstaltungszeugnis.rdf.php/" .
-			"LVZeugnis" .
-			"?stg_kz={studiengang_kz}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-		$link_lv_eng = "documents/export/" .
-			"lehrveranstaltungszeugnis.rdf.php/" .
-			"LVZeugnisEng" .
-			"?stg_kz={studiengang_kz}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-
-		$archive_url = "api/frontend/v1/documents/archiveSigned";
-		$archive_response = $this->p->t("stv", "document_signed_and_archived");
-		$archive_post_ff = [
-			"xml" => "zertifikat.rdf.php",
-			"xsl" => "Zertifikat",
-			"stg_kz" => "{studiengang_kz_lv}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-		$archive_post_lv_ger = [
-			"xml" => "lehrveranstaltungszeugnis.rdf.php",
-			"xsl" => "LVZeugnis",
-			"stg_kz" => "{studiengang_kz}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-		$archive_post_lv_eng = [
-			"xml" => "lehrveranstaltungszeugnis.rdf.php",
-			"xsl" => "LVZeugnisEng",
-			"stg_kz" => "{studiengang_kz}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-
-		$list = [
-			[
-				'title' => '<i class="fa fa-download" title="' . $this->p->t("stv", "document_download") . '"></i>',
-				'children' => [
-					[
-						'title' => $title_ff,
-						'link' => site_url($link_ff)
-					],
-					[
-						'title' => $title_lv,
-						'children' => [
-							[
-								'title' => $title_ger,
-								'link' => site_url($link_lv_ger),
-								'children' => [
-									[
-										'title' => 'PDF',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger)
-									],
-									[
-										'title' => 'DOC',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger . "&output=doc")
-									],
-									[
-										'title' => 'ODT',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger . "&output=odt")
-									]
-								]
-							],
-							[
-								'title' => $title_eng,
-								'link' => site_url($link_lv_eng),
-								'children' => [
-									[
-										'title' => 'PDF',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng)
-									],
-									[
-										'title' => 'DOC',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng . "&output=doc")
-									],
-									[
-										'title' => 'ODT',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng . "&output=odt")
-									]
-								]
-							]
-						]
-					]
-				]
-			],
-			[
-				'title' => '<i class="fas fa-archive" title="' . $this->p->t("stv", "document_archive") . '"></i>',
-				'children' => [
-					[
-						'title' => $title_ff,
-						'action' => [
-							'url' => site_url($archive_url),
-							'post' => $archive_post_ff,
-							'response' => $archive_response
-						]
-					],
-					[
-						'title' => $title_lv,
-						'children' => [
-							[
-								'title' => $title_ger,
-								'action' => [
-									'url' => site_url($archive_url),
-									'post' => $archive_post_lv_ger,
-									'response' => $archive_response
-								]
-							],
-							[
-								'title' => $title_eng,
-								'action' => [
-									'url' => site_url($archive_url),
-									'post' => $archive_post_lv_eng,
-									'response' => $archive_response
-								]
-							]
-						]
-					]
-				]
-			]
-		];
-
-		return $list;
-	}
-
 	/**
 	 * Sort tab list
 	 *

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

@@ -34,7 +34,7 @@ class LvTermine extends FHCAPI_Controller
 
 	//TODO Build own lib or combine with Controller Stundenplan.php
 	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
-	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
 	{
 		$student_uid = $uid;
 		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
@@ -80,13 +80,6 @@ class LvTermine extends FHCAPI_Controller
 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 		$this->terminateWithSuccess($stundenplan_data);
-
-		$this->expand_object_information($stundenplan_data);
-
-		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
-		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
-		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
-		$this->terminateWithSuccess($stundenplan_data);
 	}
 
 	public function getStudiensemester()

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

@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-		
+
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,40 +851,44 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$this->load->config('stv');
-		$tags = $this->config->item('stv_prestudent_tags');
 
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags)) {
-			$tags = array_keys($tags);
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
 
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->db->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 			}
-			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			$subQueryTag = "
+			  (
+				SELECT
+				  tag.prestudent_id,
+				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+				FROM (
+				  SELECT DISTINCT ON (n.notiz_id)
+					n.notiz_id AS id,
+					nt.typ_kurzbz,
+					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+					n.text AS notiz,
+					nt.style,
+					n.erledigt AS done,
+					nz.prestudent_id
+				  FROM public.tbl_notizzuordnung AS nz
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+				. $whereTags .
+				"
+				) AS tag
+				GROUP BY tag.prestudent_id
+			  ) AS tag_data_agg
+			";
 		}
-		$subQueryTag = "
-		  (
-			SELECT
-			  tag.prestudent_id,
-			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-			FROM (
-			  SELECT DISTINCT ON (n.notiz_id)
-				n.notiz_id AS id,
-				nt.typ_kurzbz,
-				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-				n.text AS notiz,
-				nt.style,
-				n.erledigt AS done,
-				nz.prestudent_id
-			  FROM public.tbl_notizzuordnung AS nz
-				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-			. $whereTags .
-			"
-			) AS tag
-			GROUP BY tag.prestudent_id
-		  ) AS tag_data_agg
-		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -907,11 +911,17 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
 
 
 		$this->PrestudentModel->addSelect("b.uid");
-		$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

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

@@ -1,116 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'getHeader' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-	}
-
-	public function get()
-	{
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-
-		$config = [];
-
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre']);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$config['ignore_kollision'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_kollision'),
-			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
-
-		];
-
-		$config['kollision_student'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'kollision_student'),
-			"value" => ($data['kollision_student'] ?? 'false') === 'true'
-		];
-
-		$config['ignore_reservierung'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_reservierung'),
-			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
-
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
-			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
-		];
-
-
-
-		$this->terminateWithSuccess($config);
-	}
-	public function getHeader()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
-		$this->_ci->KalenderStatusModel->addOrder('sort');
-		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
-		$visible_status = $this->_ci->KalenderStatusModel->load();
-
-		$visible_status = getData($visible_status);
-
-		$config['visible_status']['all'] = 'Alle';
-
-		foreach ($visible_status as $status)
-		{
-			$config['visible_status'][$status->status_kurzbz] = $status->status;
-		}
-
-		$this->terminateWithSuccess($config);
-	}
-
-	public function set()
-	{
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_kollision',
-			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'kollision_student',
-			$this->input->post('kollision_student') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_reservierung',
-			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_zeitsperre',
-			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
-		);
-		$this->terminateWithSuccess();
-	}
-
-
-}

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

@@ -1,254 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-	public function __construct()
-	{
-		parent::__construct([
-			'search' => self::PERM_LOGGED,
-			'getByStg' => self::PERM_LOGGED
-		]);
-
-		$this->_ci = &get_instance();
-		$this->load->library('form_validation');
-
-		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
-
-
-		$this->loadPhrases(['ui']);
-	}
-
-	public function search()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		//TODO Where weiter anpassen z.B. Fachbereich
-		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
-												tbl_lehreinheit.unr,
-												tbl_lehreinheit.lvnr,
-												tbl_lehreinheit.lehrfach_id,
-												lehrfach.kurzbz AS lehrfach,
-												lehrfach.bezeichnung AS lehrfach_bez,
-												lehrfach.farbe AS lehrfach_farbe,
-												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-												lema.mitarbeiter_uid AS lektor_uid,
-												tbl_mitarbeiter.kurzbz AS lektor,
-												tbl_studiengang.studiengang_kz,
-												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-												lvb.semester,
-												lvb.verband,
-												lvb.gruppe,
-												lvb.gruppe_kurzbz,
-												tbl_lehreinheit.raumtyp,
-												tbl_lehreinheit.raumtypalternativ,
-												tbl_lehreinheit.stundenblockung,
-												tbl_lehreinheit.wochenrythmus,
-												lema.semesterstunden,
-												lema.planstunden,
-												tbl_lehreinheit.start_kw,
-												tbl_lehreinheit.anmerkung,
-												tbl_lehreinheit.studiensemester_kurzbz');
-
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehreinheitModel->db->group_start();
-			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
-				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
-			}
-			$this->_ci->LehreinheitModel->db->group_end();
-
-		}
-		$this->_ci->LehreinheitModel->db->group_end();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
-		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
-
-		$result = $this->_ci->LehreinheitModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-	public function getByStg()
-	{
-		//TODO check einbauen ob studiensemester und stg vorhanden ist
-		$stg = $this->input->get('stg');
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-		if (is_null($stg) || is_null($studiensemester_kurzbz))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->_ci->LehreinheitModel->addSelect('
-			tbl_lehreinheit.lehreinheit_id,
-			tbl_lehreinheit.unr,
-			tbl_lehreinheit.lvnr,
-			tbl_lehreinheit.lehrfach_id,
-			lehrfach.kurzbz AS lehrfach,
-			lehrfach.bezeichnung AS lehrfach_bez,
-			lehrfach.farbe AS lehrfach_farbe,
-			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-			lema.mitarbeiter_uid AS lektor_uid,
-			ma.kurzbz AS lektor,
-			tbl_person.vorname,
-			tbl_person.nachname,
-			tbl_studiengang.studiengang_kz,
-			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-			lvb.semester,
-			lvb.verband,
-			lvb.gruppe,
-			lvb.gruppe_kurzbz,
-			tbl_lehreinheit.raumtyp,
-			tbl_lehreinheit.raumtypalternativ,
-			tbl_lehreinheit.stundenblockung,
-			tbl_lehreinheit.wochenrythmus,
-			lema.semesterstunden,
-			lema.planstunden,
-			tbl_lehreinheit.start_kw,
-			tbl_lehreinheit.anmerkung,
-			tbl_lehreinheit.studiensemester_kurzbz
-		');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
-
-		$result = $this->_ci->LehreinheitModel->loadWhere(array(
-			'tbl_lehrform.verplanen' => true,
-			'tbl_studiengang.studiengang_kz' => $stg,
-			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$result = hasData($result) ? getData($result) : array();
-		$grouped = array();
-
-		foreach ($result as $row)
-		{
-			$unr = $row->unr;
-			if (!isset($grouped[$unr]))
-			{
-				$grouped[$unr] = (object)array(
-					'unr' => $row->unr,
-					'lehrfach_id' => $row->lehrfach_id,
-					'lehrfach_bez' => $row->lehrfach_bez,
-					'lehrfach_farbe' => $row->lehrfach_farbe,
-					'studiengang_kz' => $row->studiengang_kz,
-					'studiengang' => $row->studiengang,
-					'semester' => $row->semester,
-					'verband' => $row->verband,
-					'gruppe' => $row->gruppe,
-					'gruppe_kurzbz' => $row->gruppe_kurzbz,
-					'raumtyp' => $row->raumtyp,
-					'raumtypalternativ' => $row->raumtypalternativ,
-					'anmerkung' => $row->anmerkung,
-					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
-					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
-					'lektoren' => array(),
-					'lehreinheit_id' => array(),
-					'lvnr' => array(),
-					'lehrfach' => array(),
-					'lehrform' => array(),
-					'stundenblockung' => array(),
-					'wochenrythmus' => array(),
-					'planstunden' => array(),
-					'start_kw' => array(),
-					'verplant' => array(),
-					'offenestunden' => array(),
-					'lehrverband' => array(),
-					'lem' => array(),
-					'verplant_gesamt' => 0,
-				);
-			}
-
-			$group = $grouped[$unr];
-
-			$group->lektoren[$row->lektor_uid] = (object)array(
-				'uid' => $row->lektor_uid,
-				'kurzbz' => trim($row->lektor),
-				'name' => $row->vorname . ' ' . $row->nachname,
-			);
-
-			$group->lehreinheit_id[] = $row->lehreinheit_id;
-			$group->lvnr[] = $row->lvnr;
-			$group->lehrfach[] = $row->lehrfach;
-			$group->lehrform[] = $row->lehrform;
-			$group->stundenblockung[] = $row->stundenblockung;
-			$group->wochenrythmus[] = $row->wochenrythmus;
-			$group->planstunden[] = $row->planstunden;
-			$group->start_kw[] = $row->start_kw;
-			$group->verplant[] = isset($row->verplant) ? $row->verplant : 0;
-			$group->offenestunden[] = isset($row->offenestunden) ? $row->offenestunden : 0;
-			$group->verplant_gesamt += isset($row->verplant) ? $row->verplant : 0;
-
-			$lvb = $row->studiengang . '-' . $row->semester;
-
-			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
-				$lvb .= $row->verband;
-
-			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
-				$lvb .= $row->gruppe;
-
-			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
-
-			$group->lem[] = array(
-				'lehreinheit_id' => $row->lehreinheit_id,
-				'mitarbeiter_uid' => $row->lektor_uid,
-			);
-		}
-
-		foreach ($grouped as $group)
-		{
-			$group->lektoren = array_values($group->lektoren);
-			$group->lehrverband = array_values(array_unique($group->lehrverband));
-			$group->lehrfach = $this->_formatArr($group->lehrfach);
-			$group->lehrform = $this->_formatArr($group->lehrform);
-			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
-			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
-			$group->planstunden = $this->_formatArr($group->planstunden);
-			$group->start_kw = $this->_formatArr($group->start_kw);
-			$group->verplant = $this->_formatArr($group->verplant);
-			$group->offenestunden = $this->_formatArr($group->offenestunden);
-		}
-
-		$this->terminateWithSuccess(array_values($grouped));
-	}
-
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($formatted) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-
-}

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

@@ -1,416 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Kalender extends FHCAPI_Controller
-{
-
-	private $_ci;
-	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
-	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
-
-	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => self::PERM_LOGGED,
-			'getPlan' => self::PERM_LOGGED,
-			'getPlanByOrt' => self::PERM_LOGGED,
-			'getRaumvorschlag' => self::PERM_LOGGED,
-			'getHistory' => 'lehre/lvplan:rw',
-			'deleteEntry' => 'lehre/lvplan:rw',
-			'syncToLecturer' => 'lehre/lvplan:rw',
-			'syncToStudent' => 'lehre/lvplan:rw',
-			'getPlanLecturer' =>'lehre/lvplan:rw',
-			'getPlanStudent' => 'lehre/lvplan:rw',
-			'getZeitwuensche' => self::PERM_LOGGED,
-			'getZeitsperren' => self::PERM_LOGGED,
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'addKalenderEvent' => 'lehre/lvplan:rw',
-			'addReservierung' => 'lehre/lvplan:rw',
-			'sync' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
-		$this->loadPhrases([
-			'ui'
-		]);
-
-
-		$this->_ci->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function getStunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
-		$stunden = $this->_ci->StundeModel->load();
-
-		$stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$this->terminateWithSuccess($stunden);
-	}
-
-	public function getPlan()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
-			$start_date,
-			$end_date,
-			isset($filter->ort) ? $filter->ort : null,
-			isset($filter->uid) ? $filter->uid : null,
-			isset($filter->stg) ? $filter->stg : null
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanStudent()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanLecturer()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
-	{
-		if (!isset($start_date) || !isset($end_date) || !isset($ort))
-		{
-			$this->_ci->form_validation->set_data($_GET);
-			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-			$this->_ci->form_validation->set_rules('ort',"ort","required");
-			if($this->_ci->form_validation->run() === FALSE)
-				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-			$start_date = $this->_ci->input->get('start_date', TRUE);
-			$end_date = $this->_ci->input->get('end_date', TRUE);
-			$ort = $this->_ci->input->get('ort', TRUE);
-		}
-
-		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
-	}
-
-	public function getZeitsperren()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getZeitwuensche()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function updateKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	public function getRaumvorschlag()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
-
-		if (isset($filter->lehreinheit_id))
-		{
-			$result = $this->_ci->kalenderlib->getRaumvorschlagByLehreinheitID(
-				$start_date,
-				$end_date,
-				$filter->lehreinheit_id
-			);
-		}
-
-		if (isset($filter->kalender_id))
-		{
-			$result = $this->_ci->kalenderlib->getRaumvorschlagByKalenderID(
-				$start_date,
-				$end_date,
-				$filter->kalender_id
-			);
-		}
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function getHistory()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteEntry()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function sync()
-	{
-		$result = $this->_ci->kalenderlib->sync();
-		$this->terminateWithSuccess($result);
-	}
-	public function syncToLecturer()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function syncToStudent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function addKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-
-		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	public function addReservierung()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('titel',"titel","required");
-		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
-		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-
-		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = true;
-		$filter_object = new stdClass();
-		foreach ($filters as $filter)
-		{
-			if ($this->_ci->input->get($filter))
-			{
-				$filter_valid = true;
-				$filter_object->$filter = $this->_ci->input->get($filter);
-			}
-		}
-
-		if (!$filter_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		return $filter_object;
-	}
-
-	private function _checkUpdate($updateInfos)
-	{
-		$update_valid = false;
-		$update_object = new stdClass();
-		foreach (self::ALLOWED_TO_UPDATE as $filter)
-		{
-			if (isset($updateInfos[$filter]))
-			{
-				$update_valid = true;
-				$update_object->$filter = $updateInfos[$filter];
-			}
-		}
-
-		if (!$update_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-
-		return $update_object;
-	}
-}

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

@@ -1,231 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Reservierung extends FHCAPI_Controller
-{
-	private $_ci;
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addReservierung' => 'lehre/lvplan:rw',
-			'getRollen' => 'lehre/lvplan:rw',
-			'getInformation' => 'lehre/lvplan:rw',
-			'getLektor' => 'lehre/lvplan:rw',
-			'searchGroup' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
-
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
-
-
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getInformation()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
-
-		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError($studiengaenge);
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$rollen = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemester = $this->_ci->StudiensemesterModel->load();
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
-		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
-
-
-		$this->terminateWithSuccess($return_array);
-	}
-	public function getRaeume()
-	{
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	public function searchGroup()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-
-		$query_words = explode(' ', urldecode($query));
-
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
-
-		if (isError($gruppen_result))
-			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
-
-		$gruppen_array = array();
-
-		if (hasData($gruppen_result))
-			$gruppen_array = getData($gruppen_result);
-
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
-
-		$lehrverband_array = array();
-
-		if (isError($lehrverband_result))
-			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
-
-		if (hasData($lehrverband_result))
-			$lehrverband_array = getData($lehrverband_result);
-
-		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
-
-		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
-		{
-			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
-		});
-
-		$this->terminateWithSuccess($gefilterte_gruppen);
-	}
-
-	public function getRollen()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$result = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-	public function addReservierung()
-	{
-
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('titel',"titel","required");
-		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
-		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
-		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
-		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
-		$groups = $this->_ci->input->post('groups', TRUE);
-
-		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-		{
-			if (empty($teilnehmer) || !is_array($teilnehmer))
-			{
-				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-			}
-		}
-		else
-			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-
-
-		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
-
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-
-	public function getLektor()
-	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-
-		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->MitarbeiterModel->db->group_start();
-			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->group_end();
-		}
-		$this->_ci->MitarbeiterModel->db->group_end();
-		$this->_ci->MitarbeiterModel->addOrder('nachname');
-		$this->_ci->MitarbeiterModel->addOrder('vorname');
-		$result = $this->_ci->MitarbeiterModel->load();
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-}

application/controllers/jobs/TempusJob.php

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

application/controllers/system/MigrateKalender.php

@@ -1,562 +0,0 @@
-<?php
-/*
- * Job zur einmaligen Migration des Stundenplans
- *
- * Aufruf
- * php index.ci.php system/MigrateKalender
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateKalender extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(array(
-			'migrateStundenplan' => ['admin:rw'],
-			'migrateReservierung' => ['admin:rw'],
-		));
-		$this->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
-		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
-		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
-		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
-		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
-		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function migrateStundenplan($von = null, $bis = null, $studiengang_kz = null)
-	{
-		$db = new DB_Model();
-
-		$stpldevsql = '
-			WITH eindeutige_stunden AS (
-				SELECT DISTINCT unr, datum, stunde
-				FROM lehre.tbl_stundenplandev
-				WHERE datum >= ? AND datum <= ?';
-
-		$params = [$von, $bis];
-
-		if (!is_null($studiengang_kz))
-		{
-			$stpldevsql .= ' AND studiengang_kz = ?';
-
-			$params[] = $studiengang_kz;
-		}
-
-		$stpldevsql .= '),
-			
-			block_keys AS (
-				SELECT
-					unr,
-					datum,
-					stunde,
-					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
-				FROM eindeutige_stunden
-			),
-			blocks AS (
-				SELECT
-					bk.unr,
-					bk.datum,
-					bk.block_nr,
-					MIN(bk.stunde) AS stunde_von,
-					MAX(bk.stunde) AS stunde_bis,
-					MIN(sp.lehreinheit_id) AS lehreinheit_id,
-					MIN(sp.ort_kurzbz) AS ort_kurzbz,
-					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
-					MIN(sp.insertamum) AS insertamum,
-					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
-					MAX(sp.updateamum) AS updateamum,
-					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
-				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
-				WHERE sp.datum >= ? AND sp.datum <= ?
-				GROUP BY bk.unr, bk.datum, bk.block_nr
-			)
-			SELECT
-				b.stundenplandev_ids,
-				b.unr,
-				b.datum,
-				b.block_nr,
-				b.lehreinheit_id,
-				b.ort_kurzbz,
-				b.datum + stundevon.beginn AS von,
-				b.datum + stundebis.ende AS bis,
-				b.insertamum,
-				b.insertvon,
-				b.updateamum,
-				b.updatevon
-			FROM blocks b
-				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
-				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
-			ORDER BY b.datum, b.unr, b.block_nr;';
-
-		array_push($params, $von, $bis);
-		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
-
-		if (hasData($stpldev))
-		{
-			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
-			// Wenn neuere Änderungen vorhanden dann Update
-			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
-			// Wenn noch nicht vorhanden neu anlegen
-			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
-			// in der neuen Tabelle auch archivieren oder loeschen
-
-			$data = getData($stpldev);
-			foreach($data as $block)
-			{
-				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
-				/*$ids = array_map('intval', $ids);*/
-
-				$this->SyncModel->db->where('stundenplandev_id IN (' . implode(',', $ids) . ')');
-				$sync_result = $this->SyncModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
-					if ($kalender_id)
-					{
-						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'stundenplandev_id');
-
-					if ($block->updateamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertSync($fehlende, $kalender_id);
-					}
-				}
-				/*if(hasData($SyncResult))
-				{
-					//bereits vorhanden
-					// TODO Update
-				}
-				else
-				{
-					// Neuen Eintrag anlegen
-
-					$von = $rowstpl->datum.' '.$rowstpl->beginn;
-					$bis = $rowstpl->datum.' '.$rowstpl->ende;
-					$typ = 'lehreinheit';
-					$status = 'live';
-					$insertamum = $rowstpl->insertamum;
-					$insertvon = $rowstpl->insertvon;
-					$updateamum = $rowstpl->updateamum;
-					$updatevon = $rowstpl->updatevon;
-
-					$resultKalenderInsert = $this->KalenderModel->insert(
-						array(
-							'von' => $von,
-							'bis' => $bis,
-							'typ' => $typ,
-							'status_kurzbz' => $status,
-							'vorgaenger_kalender_id' => null,
-							'insertamum' => $insertamum,
-							'insertvon' => $insertvon,
-							'updateamum' => $updateamum,
-							'updatevon' => $updatevon
-						)
-					);
-
-					if(isSuccess($resultKalenderInsert))
-					{
-						$kalender_id = getData($resultKalenderInsert);
-
-						$resultKalenderInsert = $this->KalenderLehreinheitModel->insert(
-							array(
-								'kalender_id' => $kalender_id,
-								'lehreinheit_id' => $rowstpl->lehreinheit_id,
-							)
-						);
-
-						$resultKalenderInsert = $this->KalenderOrtModel->insert(
-							array(
-								'kalender_id' => $kalender_id,
-								'ort_kurzbz' => $rowstpl->ort_kurzbz,
-							)
-						);
-
-						$resultSyncInsert = $this->SyncModel->insert(
-							array(
-								'stundenplandev_id' => $rowstpl->stundenplandev_id,
-								'kalender_id' => $kalender_id,
-								'lastupdate' => date('Y-m-d H:i:s')
-							)
-						);
-
-					}
-				}*/
-			}
-		}
-	}
-
-	public function migrateReservierung($von = null, $bis = null, $ort_kurzbz = null)
-	{
-		$db = new DB_Model();
-
-		$qry = "WITH eindeutige_stunden AS (
-					SELECT DISTINCT titel, beschreibung, datum, stunde
-					FROM campus.tbl_reservierung
-					WHERE datum >= ? AND datum <= ?";
-
-		$params = array($von, $bis);
-
-		if (!is_null($ort_kurzbz))
-		{
-			$qry .= " AND ort_kurzbz = ?";
-			$params[] = $ort_kurzbz;
-		}
-
-		$qry .=	"),
-					 block_keys AS (
-						 SELECT
-							 titel, beschreibung, datum, stunde,
-							 stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
-						 FROM eindeutige_stunden
-					 ),
-					 blocks AS (
-						 SELECT
-							 bk.titel,
-							 bk.beschreibung,
-							 bk.datum,
-							 bk.block_nr,
-							 MIN(bk.stunde) AS stunde_von,
-							 MAX(bk.stunde) AS stunde_bis,
-							 array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
-							 array_agg(DISTINCT r.uid) AS uids,
-							 array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
-							 array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe)::text) AS svg_kombis,
-							 MIN(r.ort_kurzbz) AS ort_kurzbz,
-							 MIN(r.studiengang_kz) AS studiengang_kz,
-							 MIN(r.veranstaltung_id) AS veranstaltung_id,
-							 MIN(r.reservierung_id) AS reservierung_id,
-							 MAX(r.insertamum) AS insertamum,
-							 (array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
-						 FROM block_keys bk
-								  JOIN campus.tbl_reservierung r
-									   ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
-						 WHERE r.datum >= ? AND r.datum <= ?
-						 GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
-					 )
-				SELECT
-					b.*,
-					(b.datum + s_von.beginn) AS von,
-					(b.datum + s_bis.ende)   AS bis
-				FROM blocks b
-						 JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
-						 JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
-				ORDER BY b.reservierung_id DESC;";
-		/*$qry = "WITH per_stunde AS (
-					SELECT
-						datum,
-						titel,
-						beschreibung, ort_kurzbz, studiengang_kz, stunde,
-						veranstaltung_id,
-						array_agg(DISTINCT uid) AS uids,
-						array_agg(DISTINCT reservierung_id::text) AS reservierung_ids,
-						array_agg(DISTINCT ROW(semester, verband, gruppe)::text) AS svg_kombis,
-						array_agg(DISTINCT gruppe_kurzbz) AS gruppen_kurzbz,
-						MIN(reservierung_id) AS reservierung_id,
-						MAX(insertamum) AS insertamum,
-						MAX(insertvon) AS insertvon
-					FROM campus.tbl_reservierung
-					WHERE datum >= ? AND datum <= ?
-					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, stunde, veranstaltung_id
-				),
-				numbered AS (
-					SELECT
-						per_stunde.*,
-						stunde - ROW_NUMBER() OVER (PARTITION BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id ORDER BY stunde) AS grp
-					FROM per_stunde
-				),
-				grouped AS (
-					SELECT
-						MIN(reservierung_id) AS reservierung_id,
-						ort_kurzbz, studiengang_kz, datum,
-						MIN(stunde) AS stunde_von,
-						MAX(stunde) AS stunde_bis,
-						titel, beschreibung,
-						array_agg(DISTINCT gruppe_kurzbz_elem) AS gruppen_kurzbz,
-						array_agg(DISTINCT uid_elem) AS uids,
-						array_agg(DISTINCT res_id) AS reservierung_ids,
-						array_agg(DISTINCT svg_elem) AS svg_kombis,
-						veranstaltung_id,
-						MAX(insertamum) AS insertamum,
-						MAX(insertvon) AS insertvon
-					FROM numbered,
-						unnest(uids) AS uid_elem,
-						unnest(reservierung_ids) AS res_id,
-						unnest(gruppen_kurzbz) AS gruppe_kurzbz_elem,
-						unnest(svg_kombis) AS svg_elem
-					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id, grp
-				)
-				SELECT
-					grouped.*,
-					(datum + s_von.beginn) AS von,
-					(datum + s_bis.ende) AS bis
-				FROM grouped
-					JOIN lehre.tbl_stunde s_von ON s_von.stunde = grouped.stunde_von
-					JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = grouped.stunde_bis
-				ORDER BY grouped.reservierung_id DESC";*/
-
-		array_push($params, $von, $bis);
-		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
-
-
-		if (hasData($reservierung_data))
-		{
-			$data = getData($reservierung_data);
-
-			foreach($data as $block)
-			{
-
-				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
-
-				$this->SyncReservierungModel->db->where('reservierung_id IN (' . implode(',', $ids) . ')');
-				$sync_result = $this->SyncReservierungModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'reservierung');
-					if ($kalender_id)
-					{
-						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'reservierung_id');
-
-					if ($block->insertamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateReservierungSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertReservierungSync($fehlende, $kalender_id);
-					}
-				}
-			}
-		}
-	}
-
-
-	private function _insertKalender($block, $typ)
-	{
-		$result = $this->KalenderModel->insert(
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'typ' => $typ,
-				'status_kurzbz'=> 'live',
-				'insertamum' => $block->insertamum,
-				'insertvon' => $block->insertvon,
-				'updateamum' => $block->updateamum ?? null,
-				'updatevon' => $block->updatevon ?? null
-			)
-		);
-		if(!isSuccess($result))
-			return null;
-
-		$kalender_id = getData($result);
-
-		if ($typ === 'lehreinheit')
-		{
-			$this->KalenderLehreinheitModel->insert(
-				array (
-					'kalender_id' => $kalender_id,
-					'lehreinheit_id'=> $block->lehreinheit_id
-				)
-			);
-		}
-		else if ($typ === 'reservierung')
-		{
-			$this->KalenderEventModel->insert(array(
-				'kalender_id' => $kalender_id,
-				'titel' => $block->titel,
-				'beschreibung' => $block->beschreibung
-			));
-
-
-			if ($block->insertvon)
-			{
-				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
-
-				if (hasData($user))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'uid' => getData($user)[0]->uid,
-						'rolle_kurzbz' => 'organisator'
-					));
-				}
-			}
-
-			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
-			foreach ($uids as $uid)
-			{
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'uid' => $uid,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-
-			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
-			if (isError($semester_range)) return $semester_range;
-			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
-
-			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
-
-			foreach ($gruppen as $gruppe_kurzbz)
-			{
-				$gruppe_kurzbz = trim($gruppe_kurzbz);
-				if (!empty($gruppe_kurzbz))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'gruppe_kurzbz' => $gruppe_kurzbz,
-						'studiengang_kz' => $block->studiengang_kz,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'rolle_kurzbz' => 'teilnehmer'
-					));
-				}
-			}
-
-			foreach ($block->svg_kombis as $kombi_str)
-			{
-				$kombi_str = trim($kombi_str, '()');
-				list($sem, $verb, $grp) = explode(',', $kombi_str);
-
-				$sem = trim($sem) === '' ? null : trim($sem);
-				$verb = trim($verb) === '' ? null : trim($verb);
-				$grp = trim($grp) === '' ? null : trim($grp);
-
-				if (is_null($sem) && is_null($verb) && is_null($grp))
-					continue;
-
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'studiengang_kz' => $block->studiengang_kz,
-					'semester' => $sem,
-					'verband' => $verb,
-					'gruppe' => $grp,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-		}
-
-
-		$this->KalenderOrtModel->insert(
-			array (
-				'kalender_id' => $kalender_id,
-				'ort_kurzbz' => $block->ort_kurzbz
-			)
-		);
-
-		return $kalender_id;
-	}
-
-	private function _insertSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->insert(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-	private function _insertReservierungSync($ids, $kalender_id)
-	{
-
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->insert(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateKalender($kalender_id, $block)
-	{
-		$this->KalenderModel->update(
-			array (
-				'kalender_id' => $kalender_id
-			),
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'updateamum'=> $block->updateamum,
-				'updatevon' => $block->updatevon
-			)
-		);
-	}
-
-	private function _updateSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->update(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateReservierungSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->update(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-}

application/core/ICollisionCheck.php

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

application/helpers/hlp_document_helper.php

@@ -0,0 +1,188 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Helper function to generate the default documentslist config for the
+ * grades tab.
+ *
+ * The resulting array consists of elements which are associative arrays
+ * that can have the following entries:
+ * title			(required) on the first level this can be HTML code.
+ * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
+ * 						true or false.
+ * link				(optional) an URL that will be called if "action" and
+ * 						"children" are not defined.
+ * action			(optional) an associative array that describes an
+ * 						POST action that will be called if "children" is
+ * 						not defined.
+ * 						It can have the following entries:
+ * - url			(required) an URL to an FHCAPI endpoint.
+ * - post			(optional) an associative array with the POST data to
+ * 						be sent.
+ * - response		(optional) a string that will be displayed on success.
+ * children			(optional) an array of child elements
+ *
+ * All strings that start with { and end with } in the URLs and the
+ * actions post parameter will be replaced with the corresponding
+ * attribute of the current dataset (e.G: {uid} will be replaced with the
+ * uid of the current dataset)
+ *
+ * @return array
+ */
+function gradesDocumentsList()
+{
+	$ci =& get_instance();
+	$ci->load->library('PhrasesLib', array('stv'), 'p');
+
+	$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
+
+	$title_ger = $ci->p->t("global", "deutsch");
+	$title_eng = $ci->p->t("global", "englisch");
+	$title_ff = $ci->p->t("stv", "document_certificate");
+	$title_lv = $ci->p->t("stv", "document_coursecertificate");
+
+	$link_ff = "documents/export/" .
+		"zertifikat.rdf.php/" .
+		"Zertifikat" .
+		"?stg_kz={studiengang_kz_lv}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+	$link_lv_ger = "documents/export/" .
+		"lehrveranstaltungszeugnis.rdf.php/" .
+		"LVZeugnis" .
+		"?stg_kz={studiengang_kz}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+	$link_lv_eng = "documents/export/" .
+		"lehrveranstaltungszeugnis.rdf.php/" .
+		"LVZeugnisEng" .
+		"?stg_kz={studiengang_kz}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+
+	$archive_url = "api/frontend/v1/documents/archiveSigned";
+	$archive_response = $ci->p->t("stv", "document_signed_and_archived");
+	$archive_post_ff = [
+		"xml" => "zertifikat.rdf.php",
+		"xsl" => "Zertifikat",
+		"stg_kz" => "{studiengang_kz_lv}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+	$archive_post_lv_ger = [
+		"xml" => "lehrveranstaltungszeugnis.rdf.php",
+		"xsl" => "LVZeugnis",
+		"stg_kz" => "{studiengang_kz}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+	$archive_post_lv_eng = [
+		"xml" => "lehrveranstaltungszeugnis.rdf.php",
+		"xsl" => "LVZeugnisEng",
+		"stg_kz" => "{studiengang_kz}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+
+	$list = [
+		[
+			'title' => '<i class="fa fa-download" title="' . $ci->p->t("stv", "document_download") . '"></i>',
+			'children' => [
+				[
+					'title' => $title_ff,
+					'link' => site_url($link_ff)
+				],
+				[
+					'title' => $title_lv,
+					'children' => [
+						[
+							'title' => $title_ger,
+							'link' => site_url($link_lv_ger),
+							'children' => [
+								[
+									'title' => 'PDF',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger)
+								],
+								[
+									'title' => 'DOC',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger . "&output=doc")
+								],
+								[
+									'title' => 'ODT',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger . "&output=odt")
+								]
+							]
+						],
+						[
+							'title' => $title_eng,
+							'link' => site_url($link_lv_eng),
+							'children' => [
+								[
+									'title' => 'PDF',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng)
+								],
+								[
+									'title' => 'DOC',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng . "&output=doc")
+								],
+								[
+									'title' => 'ODT',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng . "&output=odt")
+								]
+							]
+						]
+					]
+				]
+			]
+		],
+		[
+			'title' => '<i class="fas fa-archive" title="' . $ci->p->t("stv", "document_archive") . '"></i>',
+			'children' => [
+				[
+					'title' => $title_ff,
+					'action' => [
+						'url' => site_url($archive_url),
+						'post' => $archive_post_ff,
+						'response' => $archive_response
+					]
+				],
+				[
+					'title' => $title_lv,
+					'children' => [
+						[
+							'title' => $title_ger,
+							'action' => [
+								'url' => site_url($archive_url),
+								'post' => $archive_post_lv_ger,
+								'response' => $archive_response
+							]
+						],
+						[
+							'title' => $title_eng,
+							'action' => [
+								'url' => site_url($archive_url),
+								'post' => $archive_post_lv_eng,
+								'response' => $archive_response
+							]
+						]
+					]
+				]
+			]
+		]
+	];
+
+	return $list;
+}

application/libraries/CollisionChecker.php

@@ -1,65 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class CollisionChecker
-{
-	private $_checks = [];
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('collision/checks/RoomCollisionCheck');
-		$this->_ci->load->library('collision/checks/LectureCollisionCheck');
-		$this->_ci->load->library('collision/checks/VerbandCollisionCheck');
-		$this->_ci->load->library('collision/checks/StudentCollisionCheck');
-		$this->register($this->_ci->roomcollisioncheck);
-		$this->register($this->_ci->lecturecollisioncheck);
-		$this->register($this->_ci->verbandcollisioncheck);
-		$this->register($this->_ci->studentcollisioncheck);
-		Events::trigger('collision_register', $this);
-	}
-
-	public function register(ICollisionCheck $check)
-	{
-		$this->_checks[$check->getName()] = $check;
-	}
-
-	public function run($data)
-	{
-		$errors = [];
-
-		foreach ($this->_checks as $check)
-		{
-			$result = $check->check($data);
-
-			if (!empty($result))
-			{
-				$errors[] = $result;
-			}
-		}
-
-		return $errors;
-	}
-
-	public function runAll($kalender_ids)
-	{
-		$results = array_fill_keys($kalender_ids, []);
-
-		foreach ($this->_checks as $check)
-		{
-			$batchResult = $check->checkAll($kalender_ids);
-			foreach ($batchResult as $kalender_id => $errors)
-			{
-				$results[$kalender_id] = array_merge($results[$kalender_id], $errors);
-			}
-		}
-
-		return $results;
-	}
-}

application/libraries/KalenderNotificationLib.php

@@ -1,170 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-class KalenderNotificationLib
-{
-	private $_ci;
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->library('MailLib');
-		$this->_ci->load->config('tempus');
-
-	}
-
-	public function sendMails($mail_infos)
-	{
-		if (!$this->_ci->config->item('send_update_mails'))
-			return true;
-
-		$lektor_added = array();
-		$lektor_changed = array();
-		$lektor_deleted = array();
-
-		$student_added = array();
-		$student_changed = array();
-		$student_deleted = array();
-
-		foreach ($mail_infos as $info)
-		{
-			$entry = $info['entry'];
-			$new_status = $info['new_status'];
-			$notify = $info['notify'];
-
-			$old_entry = null;
-			if ($entry->vorgaenger_kalender_id)
-			{
-				$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-				$vorgaenger = $this->_ci->KalenderModel->load(array('tbl_kalender.kalender_id' => $entry->vorgaenger_kalender_id));
-				if (hasData($vorgaenger))
-					$old_entry = getData($vorgaenger)[0];
-			}
-
-			if ($new_status === 'deleted')
-				$row = $this->_buildMailDeleted($entry);
-			else if ($old_entry)
-				$row = $this->_buildMailChanged($old_entry, $entry);
-			else
-				$row = $this->_buildMailNew($entry);
-
-			if (in_array('lektor', $notify))
-			{
-				if ($new_status === 'deleted')
-					$lektor_deleted[] = $row;
-				else if ($old_entry)
-					$lektor_changed[] = $row;
-				else
-					$lektor_added[] = $row;
-			}
-
-			if (in_array('student', $notify))
-			{
-				if ($new_status === 'deleted')
-					$student_deleted[] = $row;
-				else if ($old_entry)
-					$student_changed[] = $row;
-				else
-					$student_added[] = $row;
-			}
-		}
-
-		$lektor_entries = '';
-		$student_entries = '';
-
-		if (!empty($lektor_added))
-			$lektor_entries .= $this->_addToList($lektor_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($lektor_changed))
-			$lektor_entries .= $this->_addToList($lektor_changed, 'geändert') . '<hr/>';
-
-		if (!empty($lektor_deleted))
-			$lektor_entries .= $this->_addToList($lektor_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($student_added))
-			$student_entries .= $this->_addToList($student_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($student_changed))
-			$student_entries .= $this->_addToList($student_changed, 'geändert') . '<hr/>';
-
-		if (!empty($student_deleted))
-			$student_entries .= $this->_addToList($student_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($lektor_entries))
-			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Lektor Tempus Update', $lektor_entries);
-		if (!empty($student_entries))
-			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Student Tempus Update', $student_entries);
-	}
-
-	private function _addToList($entries, $status)
-	{
-		return 'Folgende Einträge wurden <b>'. $status .'</b>: <ul>' . implode('', $entries) . '</ul>';
-
-	}
-	private function _buildMailNew($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li>
-					<b>Kalender ID ' . ($entry->kalender_id ?? '-') . '</b>
-					<ul>
-						<li><b>Uhrzeit:</b> ' . $von . ' - ' . $bis . '</li>
-						<li><b>Ort:</b> ' . ($entry->ort_kurzbz ?? '-') . '</li>
-					</ul>
-				</li>';
-	}
-
-	private function _buildMailChanged($old_entry, $new_entry)
-	{
-		$old_von = date('d.m.Y H:i', strtotime($old_entry->von));
-		$old_bis = date('H:i', strtotime($old_entry->bis));
-		$new_von = date('d.m.Y H:i', strtotime($new_entry->von));
-		$new_bis = date('H:i', strtotime($new_entry->bis));
-
-		$old_ort = $old_entry->ort_kurzbz ?? '-';
-		$new_ort = $new_entry->ort_kurzbz ?? '-';
-
-		$uhrzeit_changed = ($old_von . $old_bis) !== ($new_von . $new_bis);
-		$ort_changed = $old_ort !== $new_ort;
-
-		$changes = '';
-
-		if ($uhrzeit_changed)
-		{
-			$changes .= '<li>
-							<b>Uhrzeit:</b>
-							<s style="color:red;">' . $old_von . ' - ' . $old_bis . '</s>
-							<span style="color:green;">' . $new_von . ' - ' . $new_bis . '</span>
-						</li>';
-		}
-
-		if ($ort_changed)
-		{
-			$changes .= '<li>
-				<b>Ort:</b>
-				<s style="color:red;">' . $old_ort . '</s>
-				<span style="color:green;">' . $new_ort . '</span>
-			</li>';
-		}
-
-		return '<li>
-					<b>Kalender ID ' . ($new_entry->kalender_id ?? '-') . '</b>
-					<ul>' . $changes . '</ul>
-				</li>';
-	}
-
-	private function _buildMailDeleted($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li style="color:red;">
-					<b><s>Kalender ID ' . ($entry->kalender_id ?? '-') . '</s></b>
-					<ul>
-						<li><s>' . $von . ' - ' . $bis . '</s></li>
-						<li><s>' . ($entry->ort_kurzbz ?? '-') . '</s></li>
-					</ul>
-				</li>';
-	}
-}

application/libraries/LektorLib.php

@@ -17,7 +17,12 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+
 		$this->_ci->load->library('PhrasesLib', array('lehre'));
+		$this->_ci->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -78,10 +83,13 @@ class LektorLib
 
 	public function updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $new_data)
 	{
+		$old_uid = $mitarbeiter_uid;
+		$new_uid = isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid;
+
 		$this->_ci->LehreinheitmitarbeiterModel->addSelect('lehre.tbl_lehreinheitmitarbeiter.*, lehre.tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.studiengang_kz');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
 
 		if (isError($lehreinheit_result)) return $lehreinheit_result;
 
@@ -89,27 +97,47 @@ class LektorLib
 
 		$lehreinheit = getData($lehreinheit_result)[0];
 
+		$semesterstunden_alt = $lehreinheit->semesterstunden;
+		$semesterstunden_neu = isset($new_data['semesterstunden']) ? $new_data['semesterstunden'] : $semesterstunden_alt;
+		$bismelden_neu = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
+		$neue_stunden_eingerechnet = (bool)$bismelden_neu;
+		$alte_stunden_eingerechnet = (bool)$lehreinheit->bismelden;
+		$stundenplan_update = false;
 
-		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
-		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
+		if ($old_uid !== $new_uid)
 		{
-			$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
-			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
-			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
-			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
-			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
-
-			if (hasData($verplant))
-				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
-
-			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
+			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_uid, 'lehreinheit_id' => $lehreinheit_id));
 
 			if (hasData($lehreinheit_data))
 				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
 
+			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
+
+			if (hasData($verplant))
+			{
+				$kollision = $this->hasKollision(getData($verplant), $new_uid);
+
+				$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
+
+				if ($kollision === false || $ignore_kollision == 'true')
+				{
+					$stundenplan_update = true;
+				}
+				else if (is_array($kollision))
+				{
+					return error( "Änderung fehlgeschlagen! Die Änderung des Lektors führt zu ".count($kollision)." Kollision(en) im LV-Plan. Deaktivieren Sie die Kollisionspruefung oder wenden Sie sich an die LV-Planung!\n zB. $kollision[0]");
+				}
+				else
+				{
+					return error($kollision);
+				}
+			}
 		}
+
 		$warning = '';
-		if (isset($new_data['semesterstunden']))
+		if (($semesterstunden_neu !== '' && $semesterstunden_alt !== '') && (($semesterstunden_neu > $semesterstunden_alt) || $neue_stunden_eingerechnet))
 		{
 			$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $lehreinheit->studiengang_kz));
 			if (isError($studiengang_result)) return $studiengang_result;
@@ -120,7 +148,7 @@ class LektorLib
 			if (isError($studiensemester_result)) return $studiensemester_result;
 			$studiensemester = getData($studiensemester_result)[0];
 
-			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($new_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
 
 			$echter_dv = false;
 
@@ -129,83 +157,78 @@ class LektorLib
 				$echter_dv = true;
 			}
 
-			$neue_stunden_eingerechnet = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
-			$alte_stunden_eingerechnet = $lehreinheit->bismelden;
+			$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
+			if (isError($stundengrenze_result)) return $stundengrenze_result;
 
-			if (($new_data['semesterstunden'] > $lehreinheit->semesterstunden) || $neue_stunden_eingerechnet)
+			$stundengrenze = getData($stundengrenze_result)[0];
+
+			$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
+			$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
+
+			if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)}) as summe");
+			else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt)) as summe");
+			else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)})) as summe");
+			else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
+
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', $new_uid);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
+
+			if (count($oe_array) > 0)
 			{
-				$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
-				if (isError($stundengrenze_result)) return $stundengrenze_result;
-
-				$stundengrenze = getData($stundengrenze_result)[0];
-
-				$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
-				$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array('');
-
-				if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])}) as summe");
-				else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden)) as summe");
-				else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])})) as summe");
-				else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
-
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', (isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid));
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
-
 				$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
+			}
 
+			if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+				&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+				&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+			{
+				$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+			}
 
-				if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
-					&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
-					&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+			$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
+
+			if (isError($summe_result)) return $summe_result;
+
+			if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
+
+			$summe = getData($summe_result)[0]->summe;
+
+			if ($summe > $stundengrenze->stunden)
+			{
+				if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
 				{
-					$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+					if (!$this->LehrauftragAufFirma($new_uid))
+						return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
+				}
+				else
+				{
+					$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
 				}
 
-				$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
+				$stunden_limit_result = $this->getStundenInstitut($new_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
 
-				if (isError($summe_result)) return $summe_result;
-
-				if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
-
-				$summe = getData($summe_result)[0]->summe;
-
-				if ($summe > $stundengrenze->stunden)
+				if (hasData($stunden_limit_result))
 				{
-
-					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
+					$stunden_limit_array = getData($stunden_limit_result);
+					foreach ($stunden_limit_array as $stunden_limit)
 					{
-						if (!$this->LehrauftragAufFirma(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid))
-							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
-					}
-					else
-					{
-						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
-					}
-
-					$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
-
-					if (hasData($stunden_limit_result))
-					{
-						$stunden_limit_array = getData($stunden_limit_result);
-						foreach ($stunden_limit_array as $stunden_limit)
-						{
-							$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
-						}
+						$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
 					}
 				}
 			}
 		}
 
-		$benutzer_result = $this->_ci->BenutzerModel->load(array(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid));
+		$benutzer_result = $this->_ci->BenutzerModel->load(array($new_uid));
 
 		if (isError($benutzer_result)) return $benutzer_result;
 
@@ -227,12 +250,23 @@ class LektorLib
 			'bismelden'
 		);
 
+		$nullable_fields = array('stundensatz', 'semesterstunden', 'planstunden');
+
 		$updateData = array();
 		foreach ($updatableFields as $field)
 		{
-			$value = isset($new_data[$field]) ? $new_data[$field] : null;
+			if (!array_key_exists($field, $new_data))
+			{
+				continue;
+			}
 
-			if ($value !== null)
+			$value = $new_data[$field];
+
+			if (in_array($field, $nullable_fields))
+			{
+				$updateData[$field] = $value;
+			}
+			elseif ($value !== null)
 			{
 				$updateData[$field] = $value;
 			}
@@ -240,10 +274,24 @@ class LektorLib
 		$updateData['updatevon'] = getAuthUID();
 		$updateData['updateamum'] = date('Y-m-d H:i:s');
 
-		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid), $updateData);
+		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid), $updateData);
 
 		if (isError($result)) return $result;
 
+		if ($stundenplan_update)
+		{
+			$update_result = $this->_ci->StundenplandevModel->update([
+				'lehreinheit_id' => $lehreinheit_id,
+				'mitarbeiter_uid' => $old_uid,
+			], [
+				'mitarbeiter_uid' => $new_uid,
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => getAuthUID()
+			]);
+
+			if (isError($update_result)) return $update_result;
+		}
+
 		if ($warning !== '') return success(['warning' => $warning]);
 
 		return success('Erfolgreich geupdated');
@@ -347,4 +395,52 @@ class LektorLib
 		$this->_ci->LehreinheitmitarbeiterModel->addGroupBy('tbl_studiengang.bezeichnung');
 		return $this->_ci->LehreinheitmitarbeiterModel->load();
 	}
+
+	private function hasKollision($stunden, $mitarbeiter)
+	{
+		$kollision = array();
+
+		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
+		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
+
+		foreach ($stunden as $stunde)
+		{
+			$stundenplan_result = $this->_ci->StundenplandevModel->lektorHasStundenplandevEintrag($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+			if (isError($stundenplan_result))
+				return $stundenplan_result;
+
+			if (hasData($stundenplan_result))
+			{
+				$stundenplan_result = getData($stundenplan_result)[0];
+				$kollision[] = "Kollision stundenplandev: $stundenplan_result->stundenplandev_id|$stundenplan_result->lektor|$stundenplan_result->ort_kurzbz|$stundenplan_result->stg_kurzbz-$stundenplan_result->semester$stundenplan_result->verband$stundenplan_result->gruppe$stundenplan_result->gruppe_kurzbz - $stundenplan_result->datum/$stundenplan_result->stunde";
+			}
+			else
+			{
+				if ($ignore_zeitsperre == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
+				{
+					$zeitsperre_result = $this->_ci->ZeitsperreModel->checkIfZeitsperreExists($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+					if (hasData($zeitsperre_result))
+					{
+						$zeitsperre_result = getData($zeitsperre_result)[0];
+						$kollision[] = "Kollision (Zeitsperre): $zeitsperre_result->zeitsperre_id|$zeitsperre_result->mitarbeiter_uid|$zeitsperre_result->zeitsperretyp_kurzbz - $zeitsperre_result->vondatum/$zeitsperre_result->vonstunde|$zeitsperre_result->bisdatum/$zeitsperre_result->bisstunde";
+					}
+				}
+
+				if ($ignore_reservierung == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
+				{
+					$reservierung_result = $this->_ci->ReservierungModel->lektorHasReservierung($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+					if (hasData($reservierung_result))
+					{
+						$reservierung_result = getData($reservierung_result)[0];
+						$kollision[] = "Kollision (Reservierung): $reservierung_result->reservierung_id|$reservierung_result->uid|$reservierung_result->ort_kurzbz|$reservierung_result->stg_kurzbz-$reservierung_result->semester$reservierung_result->verband$reservierung_result->gruppe$reservierung_result->gruppe_kurzbz - $reservierung_result->datum/$reservierung_result->stunde";
+					}
+				}
+			}
+		}
+
+		return isEmptyArray($kollision) ? false : $kollision;
+	}
 }

application/libraries/StundenplanLib.php

@@ -181,6 +181,21 @@ class StundenplanLib
 		return success($stundenplan_data);
 	}
 
+	public function getEventsByLE($lehreinheit_id, $start, $end, $stundenplan)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		return $this->_ci->StundenplanModel->getStundenplanLE($lehreinheit_id, $start, $end, $stundenplan);
+	}
+
+	public function getEventsByLV($lehrveranstaltung_id, $start, $end, $stundenplan)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		return $this->_ci->StundenplanModel->getStundenplanLV($lehrveranstaltung_id, $start, $end, $stundenplan);
+	}
 	/**
 	 * Get stundenplan for a room
 	 *

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -1,234 +0,0 @@
-<?php
-
-class LectureCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'lecture';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$uids = $this->_getUids($data->kalender_id);
-
-		if (empty($uids)) return [];
-
-		$collisions = [];
-
-		$collisions = array_merge($collisions, $this->_checkLehreinheit($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkReservierung($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkZeitsperre($uids, $data));
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$grouped = [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter other_lehreinheithreinheit_ma', 'other_lehreinheithreinheit_ma.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit other_lehreinheit', 'other_lehreinheit.lehreinheit_id = other_lehreinheithreinheit_ma.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit other_kalender_le', 'other_kalender_le.lehreinheit_id = other_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_kalender_le.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer other_t', 'other_t.uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event other_e', 'other_e.kalender_id = other_t.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_e.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('campus.tbl_zeitsperre z',
-			"z.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid 
-			AND z.zeitsperretyp_kurzbz != 'ZVerfueg'");
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = z.vonstunde', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = z.bisstunde', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where('(z.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('(z.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$result = $this->_ci->KalenderModel->load();
-
-
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-
-		return $grouped;
-	}
-
-	private function _getUids($kalender_id)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->group_start();
-			$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-			$this->_ci->KalenderModel->db->or_where('mitarbeiter_uid IS NULL', null, false);
-		$this->_ci->KalenderModel->db->group_end();
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'tbl_kalender.kalender_id' => $kalender_id
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$data = getData($result);
-		$mitarbeiter_uids = array_filter(array_column($data, 'mitarbeiter_uid'));
-		$event_teilnehmer = array_filter(array_column($data, 'uid'));
-
-		return array_unique(array_merge($mitarbeiter_uids, $event_teilnehmer));
-	}
-
-	private function _checkLehreinheit($uids, $data)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('mitarbeiter_uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	private function _checkReservierung($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_reservierung') === 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender_event_teilnehmer.uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	private function _checkZeitsperre($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
-
-		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum, vonstunde_z.beginn as von_beginn, bisdatum, bisstunde_z.ende as bis_ende');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = tbl_zeitsperre.vonstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = tbl_zeitsperre.bisstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp <', $data->bis);
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $data->von);
-
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-		$result = $this->_ci->ZeitsperreModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->vondatum . ' ' . $row->von_beginn)) . ' - ' . date('d.m.Y H:i', strtotime($row->bisdatum . ' ' . $row->bis_ende)) . ')';		}, getData($result));
-	}
-
-}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -1,75 +0,0 @@
-<?php
-
-class RoomCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'room';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$this->_ci->KalenderModel->addSelect('kalender_id, ort_kurzbz, von, bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'kalender_id');
-
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-			'ort_kurzbz' => $data->ort_kurzbz,
-		));
-
-		if (isError($result)) return [];
-		if (!hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort current_ort', 'current_ort.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort other_ort', 'other_ort.ort_kurzbz = current_ort.ort_kurzbz');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_ort.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -1,238 +0,0 @@
-<?php
-
-class StudentCollisionCheck implements ICollisionCheck
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'student';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$placeholders = implode(',', array_fill(0, count($kollisionsfreie_user), '?'));
-
-
-		$dbModel = new DB_Model();
-
-		$qry1 = "
-			SELECT DISTINCT tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-			UNION ALL
-
-			SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-
-		";
-
-		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
-			[$data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result1) || !hasData($result1)) return [];
-
-		$curUids = array_flip(array_column(getData($result1), 'uid'));
-
-		$qry2 = "
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-
-			UNION ALL
-			
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-		";
-
-		$result2 = $dbModel->execReadOnlyQuery($qry2, array_merge(
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result2) || !hasData($result2)) return [];
-
-		$conflicts = [];
-		foreach (getData($result2) as $row) {
-			if (isset($curUids[$row->uid])) {
-				$conflicts[] = $this->_ci->phraseslib->t('ui', 'student_kollision')
-					. ': ' . $row->uid
-					. ' (' . date('d.m.Y H:i', strtotime($row->von))
-					. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		return $conflicts;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-
-		if (empty($kalender_ids)) return [];
-
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$dbModel = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT current_kalender.kalender_id, current_benutzergruppe.uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_gruppe.semester = current_lehreinheitgruppe.semester
-				AND current_gruppe.gruppe_kurzbz = current_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe current_benutzergruppe ON current_benutzergruppe.gruppe_kurzbz = current_gruppe.gruppe_kurzbz
-					AND current_benutzergruppe.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_gruppe.semester = other_lehreinheitgruppe.semester
-				AND other_gruppe.gruppe_kurzbz = other_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe other_benutzergruppe
-				ON other_benutzergruppe.gruppe_kurzbz = other_gruppe.gruppe_kurzbz
-				AND other_benutzergruppe.uid = current_benutzergruppe.uid
-				AND other_benutzergruppe.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-
-			UNION ALL
-
-			SELECT DISTINCT current_kalender.kalender_id, current_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband current_studentlehrverband
-				ON current_studentlehrverband.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_studentlehrverband.semester = current_lehreinheitgruppe.semester
-				AND current_studentlehrverband.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-				AND (current_lehreinheitgruppe.verband = current_studentlehrverband.verband OR current_lehreinheitgruppe.verband IS NULL OR btrim(current_lehreinheitgruppe.verband::text) = '' OR current_studentlehrverband.verband IS NULL)
-				AND (current_lehreinheitgruppe.gruppe = current_studentlehrverband.gruppe OR current_lehreinheitgruppe.gruppe IS NULL OR btrim(current_lehreinheitgruppe.gruppe::text) = '' OR current_studentlehrverband.gruppe IS NULL)
-
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband other_slv
-				ON other_slv.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_slv.semester = other_lehreinheitgruppe.semester
-				AND other_slv.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-				AND other_slv.student_uid = current_studentlehrverband.student_uid
-				AND (other_lehreinheitgruppe.verband = other_slv.verband OR other_lehreinheitgruppe.verband IS NULL OR btrim(other_lehreinheitgruppe.verband::text) = '' OR other_slv.verband IS NULL)
-				AND (other_lehreinheitgruppe.gruppe = other_slv.gruppe OR other_lehreinheitgruppe.gruppe IS NULL OR btrim(other_lehreinheitgruppe.gruppe::text) = '' OR other_slv.gruppe IS NULL)
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, array_merge($kalender_ids, $kalender_ids));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -1,350 +0,0 @@
-<?php
-
-class VerbandCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'verband';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$kollision_student = $this->_ci->variablelib->getVar('kollision_student') === 'false';
-		$kollision_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung') === 'false';
-
-		if (!$kollision_student && !$kollision_reservierung) return [];
-
-		$dbModel = new DB_Model();
-		$collisions = [];
-
-		if ($kollision_student)
-		{
-			$union_event = "";
-
-			if ($kollision_reservierung)
-			{
-				$union_event = "
-					UNION
-					SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe, tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-					FROM lehre.tbl_kalender_event_teilnehmer
-					WHERE tbl_kalender_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				";
-			}
-
-			$sql_gruppen = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_lehreinheitguppe.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_lehreinheitguppe.semester ||
-						COALESCE(other_lehreinheitguppe.verband::text, '') ||
-						COALESCE(other_lehreinheitguppe.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender current_kalender
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != current_kalender.kalender_id
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-
-				WHERE current_kalender.kalender_id = ?
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-				AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-				AND (
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND (
-							current_lehreinheitguppe.verband IS NULL
-							OR (
-								current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-								AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_gruppen, [
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-					$collisions[] = $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		if ($kollision_reservierung && !$kollision_student)
-		{
-			$sql_reservierung = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_event_teilnehmer.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_event_teilnehmer.semester ||
-						COALESCE(other_event_teilnehmer.verband::text, '') ||
-						COALESCE(other_event_teilnehmer.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender_event_teilnehmer current_event_teilnehmer
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_event_teilnehmer.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != ?
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN lehre.tbl_kalender_event_teilnehmer other_event_teilnehmer
-					ON other_event_teilnehmer.kalender_id = other_kalender.kalender_id
-					AND other_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_event_teilnehmer.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_event_teilnehmer.studiengang_kz
-
-				WHERE current_event_teilnehmer.kalender_id = ?
-				AND current_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_event_teilnehmer.studiengang_kz = other_event_teilnehmer.studiengang_kz
-				AND current_event_teilnehmer.semester = other_event_teilnehmer.semester
-				AND (
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND (
-							current_event_teilnehmer.verband IS NULL
-							OR (
-								current_event_teilnehmer.verband = other_event_teilnehmer.verband
-								AND (current_event_teilnehmer.gruppe IS NULL OR other_event_teilnehmer.gruppe IS NULL OR current_event_teilnehmer.gruppe = other_event_teilnehmer.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_reservierung, [
-				$data->kalender_id,
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-					$collisions[] = $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$dbModel = new DB_Model();
-
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT ON (current_kalender.kalender_id) current_kalender.kalender_id
-			FROM lehre.tbl_kalender current_kalender
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-	
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-	
-			WHERE current_kalender.kalender_id IN ({$placeholders})
-			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-			AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-			AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-			AND (
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND (
-						current_lehreinheitguppe.verband IS NULL
-						OR (
-							current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-							AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-						)
-					)
-				)
-				OR
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND current_gruppe.direktinskription IS NOT TRUE
-					AND other_gruppe.direktinskription IS NOT TRUE
-				)
-				OR
-				(
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-					)
-				)
-			)
-			AND other_kalender.kalender_id NOT IN (
-				SELECT vorgaenger_kalender_id
-				FROM lehre.tbl_kalender
-				WHERE vorgaenger_kalender_id IS NOT NULL
-			)
-			
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, $kalender_ids);
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-
-}

application/models/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 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 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
+			  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

@@ -314,6 +314,28 @@ EOSQL;
 		return $this->execQuery($query, $params);
 	}
 
+	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 getOes($lehreinheit_id)
 	{

application/models/education/Lehreinheitgruppe_model.php

@@ -341,7 +341,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$this->db->where('lehreinheit_id', $lehreinheit_id);
 		$this->db->where('studiengang_kz', $gruppen_array->studiengang_kz);
 
-		if (!isEmptyString($gruppen_array->semester))
+		if (!isEmptyString((string)$gruppen_array->semester))
 		{
 			$this->db->where('semester', $gruppen_array->semester);
 		}
@@ -444,30 +444,37 @@ class Lehreinheitgruppe_model extends DB_Model
 										) 
 									ELSE tbl_gruppe.beschreibung
 								END AS beschreibung");
-		$this->addSelect("CASE 
-									WHEN tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL THEN 
-										(
-											SELECT EXISTS (
-												SELECT 1 
-												FROM lehre.tbl_stundenplandev
-												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
-													AND studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-													AND semester = tbl_lehreinheitgruppe.semester
-													AND TRIM(COALESCE(verband, '')) = TRIM(tbl_lehreinheitgruppe.verband)
-													AND TRIM(COALESCE(gruppe, '')) = TRIM(tbl_lehreinheitgruppe.gruppe)
-													AND (gruppe_kurzbz IS NULL OR gruppe_kurzbz = '')
-											)
-										)
-									ELSE 
+		$this->addSelect("
+									CASE
+										WHEN trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')) = '' THEN
 										(
 											SELECT EXISTS (
 												SELECT 1
-												FROM lehre.tbl_stundenplandev
-												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
-													AND gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+												FROM lehre.tbl_stundenplandev sp
+												WHERE sp.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND sp.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+													AND sp.semester = tbl_lehreinheitgruppe.semester
+													AND trim(COALESCE(sp.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+													AND trim(COALESCE(sp.gruppe, ''))  = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+													AND trim(COALESCE(sp.gruppe_kurzbz, '')) = ''
 											)
 										)
-								END AS verplant");
+									ELSE
+										(
+											SELECT EXISTS (
+												SELECT 1
+												FROM lehre.tbl_stundenplandev sp
+												WHERE sp.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND sp.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+													AND sp.semester = tbl_lehreinheitgruppe.semester
+													AND trim(COALESCE(sp.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+													AND trim(COALESCE(sp.gruppe, ''))  = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+													AND trim(COALESCE(sp.gruppe_kurzbz, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, ''))
+											)
+										)
+										END AS verplant
+									");
+
 		$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
 

application/models/education/Lehrveranstaltung_model.php

@@ -317,7 +317,9 @@ 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)
@@ -402,14 +404,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1
@@ -1051,6 +1056,26 @@ 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_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
+			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));
+	}
+
 	public function getLvsByOrganization($oe_kurzbz)
 	{
 		$qry="
@@ -1242,7 +1267,7 @@ class Lehrveranstaltung_model extends DB_Model
 	{
 		return "
 		SELECT
-				lehrveranstaltung_id, tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
+				distinct on (lehrveranstaltung_id) lehrveranstaltung_id, tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
 				tbl_studienplan_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
 				ects as lv_ects, semesterstunden, anmerkung, lehre, lehreverzeichnis as lv_lehreverzeichnis, tbl_lehrveranstaltung.aktiv,
 				planfaktor as lv_planfaktor, planlektoren as lv_planlektoren, planpersonalkosten as lv_planpersonalkosten,

application/models/education/Lvgesamtnote_model.php

@@ -29,10 +29,14 @@ class Lvgesamtnote_model extends DB_Model
 		$this->addSelect("lv.bezeichnung AS lehrveranstaltung_bezeichnung");
 		$this->addSelect("lv.studiengang_kz");
 		$this->addSelect("UPPER(stg.typ || stg.kurzbz) AS studiengang");
+		$this->addSelect("person.vorname");
+		$this->addSelect("person.nachname");
 
 		$this->addJoin("lehre.tbl_note n", "note");
 		$this->addJoin("lehre.tbl_lehrveranstaltung lv", "lehrveranstaltung_id");
 		$this->addJoin("public.tbl_studiengang stg", "studiengang_kz");
+		$this->addJoin("public.tbl_benutzer benutzer", "uid = student_uid", "LEFT");
+		$this->addJoin("public.tbl_person person", "person_id", "LEFT");
 
 		$this->db->where($this->dbTable . ".freigabedatum <", "NOW()", false);
 

application/models/education/Projektarbeit_model.php

@@ -149,6 +149,8 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.abstract as abstract,
 			lehre.tbl_projektarbeit.abstract_en as abstract_en,
 			lehre.tbl_projektarbeit.insertamum as insertamum,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
 		
 		FROM lehre.tbl_projektarbeit
@@ -167,7 +169,7 @@ class Projektarbeit_model extends DB_Model
 			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
 		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')) as base
 		ORDER BY insertamum DESC";
-				
+
 		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
 	}
 
@@ -216,13 +218,16 @@ class Projektarbeit_model extends DB_Model
 	}
 
 	public function getProjektbetreuerAnrede($bperson_id) {
-		$qry_betr="SELECT DISTINCT ON(public.tbl_person.person_id) trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first, anrede
-			FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
-			WHERE public.tbl_person.person_id= ?";
+		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
+						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
+						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE public.tbl_person.person_id= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
 	}
-	
+
 	public function getProjektbetreuerEmail($projektarbeit_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -244,7 +249,7 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
-	
+
 	public function getProjektbetreuerEmailByPersonID($person_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -338,8 +343,8 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
-	
-	
+
+
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
 		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
        		FROM(
@@ -499,20 +504,137 @@ class Projektarbeit_model extends DB_Model
 				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
 				     )
 				 AND public.tbl_studiengang.studiengang_kz = ?";
-		
+
 			     if($benotet == 0) {
 					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
 				 } else if ($benotet == 1) {
 					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
 				 }
-				 
+
 			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
-		
+
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
 	}
-	
+
 	/**
+	 * Prüft ob Projektarbeit aktuell ist (also zurzeit online bewertet wird).
+	 * @param $projektarbeit_id
+	 * @return boolean
+	 */
+	public function projektarbeitIsCurrent($projektarbeit_id) {
+		$version = $this->getVersion($projektarbeit_id);
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		return $version === null ? null : $version->isCurrent;
+	}
+
+	/**
+	 * Holt sich Version der Projektarbeit.
+	 * Liefert auch mit, ob die Version die aktuellste ist.
+	 * z.B.: Masterarbeiten waren ab der Änderung zur Gewichtung der Punkte aktuell,
+	 * Bachelorarbeiten waren ab dem Umstieg auf das Online Beurteilungsformular aktuell.
+	 * @param $projektarbeit_id
+	 * @return objekt mit Versionsinfo, null im Fehlerfall
+	 */
+	private function getVersion($projektarbeit_id) {
+		$_versions_query = array(
+			'Diplom' => array(
+				'SS2025',
+				'SS2023',
+				'SS2022'
+			),
+			'Others' => array(
+				'SS2025',
+				'SS2022',
+			)
+		);
+
+		$_versions_check = array(
+			'Diplom' => array(
+				'SS2025' => 3,
+				'SS2023' => 2,
+				'SS2022' => 1
+			),
+			'Others' => array(
+				'SS2025' => 2,
+				'SS2022' => 1
+			)
+		);
+
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		$qry="
+			SELECT
+				CASE
+					WHEN semesters_diplom.studiensemester_kurzbz IS NOT NULL
+					THEN semesters_diplom.studiensemester_kurzbz
+					ELSE semesters.studiensemester_kurzbz 
+				END AS version_studiensemester_kurzbz,
+				pa.projekttyp_kurzbz
+			FROM
+				lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters ON sem.start >= semesters.start AND pa.projekttyp_kurzbz <> 'Diplom'
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters_diplom ON sem.start >= semesters_diplom.start AND pa.projekttyp_kurzbz = 'Diplom'
+			WHERE
+				projektarbeit_id = ?
+			ORDER BY
+				semesters.start DESC, semesters_diplom.start DESC
+			LIMIT 1";
+
+		$resultociniBambini = $this->execReadOnlyQuery($qry, array($_versions_query['Others'], $_versions_query['Diplom'], $projektarbeit_id));
+
+		if(hasData($resultociniBambini)) {
+			$data =	getData($resultociniBambini);
+			if(count($data) > 0) {
+				$row = $data[0];
+
+				// known project types
+				if (isset($_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]
+						== max($_versions_check[$row->projekttyp_kurzbz]);
+
+				}
+				elseif (isset($_versions_check['Others'][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check['Others'][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check['Others'][$row->version_studiensemester_kurzbz]
+						== max($_versions_check['Others']);
+				}
+				else
+				{
+					$row->isCurrent = false;
+					$row->versionNumber = 0;
+				}
+				return $row;
+
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	/*
 	 *
 	 * @param
 	 * @return object success or error

application/models/education/Pruefung_model.php

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

application/models/education/Zeugnisnote_model.php

@@ -148,7 +148,7 @@ class Zeugnisnote_model extends DB_Model
 	 *
 	 * @return object
 	 */
-	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz)
+	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz, $lehrveranstaltung_id = null)
 	{
 		$params = array();
 		$where='';
@@ -163,6 +163,11 @@ class Zeugnisnote_model extends DB_Model
 			$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz= ?";
 			$params[] = $studiensemester_kurzbz;
 		}
+		if($lehrveranstaltung_id != null)
+		{
+			$where .= " AND vw_student_lehrveranstaltung.lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
 
 		$where2='';
 
@@ -176,6 +181,11 @@ class Zeugnisnote_model extends DB_Model
 			$where2 .= " AND studiensemester_kurzbz= ?";
 			$params[] = $studiensemester_kurzbz;
 		}
+		if($lehrveranstaltung_id != null)
+		{
+			$where2 .=" AND lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
 
 		$qry = "SELECT
 			a.*,
@@ -188,7 +198,10 @@ class Zeugnisnote_model extends DB_Model
 			lv.semester AS semester_lv,
 			lv.ects AS ects_lv,
 			lv.zeugnis,
-			lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english
+			lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english,
+			s.verband,
+			person.vorname,
+			person.nachname
 		FROM (
 			SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
 				   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
@@ -231,6 +244,8 @@ class Zeugnisnote_model extends DB_Model
 			ORDER BY sort
 		) a
 		LEFT JOIN public.tbl_student s ON (a.uid = s.student_uid)
+		LEFT JOIN public.tbl_benutzer benutzer ON benutzer.uid = s.student_uid
+		LEFT JOIN public.tbl_person person ON benutzer.person_id = person.person_id
 		LEFT JOIN public.tbl_studiengang stg1 ON (s.studiengang_kz = stg1.studiengang_kz)
 		LEFT JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
 		LEFT JOIN public.tbl_studiengang stg2 ON (lv.studiengang_kz = stg2.studiengang_kz)";

application/models/organisation/Gruppe_model.php

@@ -11,26 +11,4 @@ class Gruppe_model extends DB_Model
 		$this->dbTable = 'public.tbl_gruppe';
 		$this->pk = 'gruppe_kurzbz';
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-
-		return $this->load();
-	}
 }

application/models/organisation/Lehrverband_model.php

@@ -41,29 +41,4 @@ class Lehrverband_model extends DB_Model
 
 		return $result;
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->addOrder('verband');
-		$this->addOrder('gruppe');
-		$this->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-		return $this->load();
-	}
 }

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

@@ -261,6 +261,42 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
+	/**
+	 * Get active Kompetenzfeldleitung bei UID.
+	 *
+	 * @param $uid
+	 * @return array|stdClass|null
+	 */
+	public function getKFLByUID($uid)
+	{
+		$query = '
+            SELECT
+			  	bf.uid,
+				bf.oe_kurzbz,
+  				oe.organisationseinheittyp_kurzbz
+            FROM
+			  	public.tbl_benutzerfunktion bf
+				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+  				JOIN public.tbl_benutzer b USING (uid)
+            WHERE
+                b.uid = ?
+              	AND b.aktiv = TRUE
+                AND funktion_kurzbz = \'Leitung\'
+               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
+              	AND (datum_von IS NULL OR datum_von <= now())
+              	AND (datum_bis IS NULL OR datum_bis >= now())
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		return $this->execQuery($query, $parameters_array);
+	}
+
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/person/Notiz_model.php

@@ -206,6 +206,7 @@ class Notiz_model extends DB_Model
 					person_bearbeiter.vorname, person_bearbeiter.nachname
 			";
 
+
 		return $this->execQuery($qry, array($type, $id));
 	}
 

application/models/ressource/Kalender_Event_Rolle_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_Rolle_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_rolle';
-		$this->pk = array('rolle_kurzbz');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_Teilnehmer_model.php

@@ -1,16 +0,0 @@
-<?php
-class
-Kalender_Event_Teilnehmer_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_teilnehmer';
-		$this->pk = array('kalender_event_teilnehmer_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event';
-		$this->pk = array('kalender_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Lehreinheit_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Lehreinheit_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_lehreinheit';
-		$this->pk = array('kalender_id','lehreinheit_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Ort_model.php

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

application/models/ressource/Kalender_model.php

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

application/models/ressource/Kalenderstatus_model.php

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

application/models/ressource/Reservierung_Kalender_model.php

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

application/models/ressource/Reservierung_model.php

@@ -135,4 +135,15 @@ class Reservierung_model extends DB_Model
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
+	public function lektorHasReservierung($uid, $datum, $stunde)
+	{
+		$qry = "SELECT reservierung_id, uid, stg_kurzbz, ort_kurzbz, semester, verband, gruppe, gruppe_kurzbz, datum, stunde
+				FROM lehre.vw_reservierung
+				WHERE uid = ?
+					AND datum = ?
+					AND stunde = ?";
+
+		return $this->execReadOnlyQuery($qry, [$uid, $datum, $stunde]);
+	}
+
 }

application/models/ressource/Stundenplan_model.php

@@ -333,6 +333,68 @@ class Stundenplan_model extends DB_Model
 		", [$start_date, $end_date, $lv_id]);
 	}
 
+	public function getStundenplanLE($lehreinheit, $start_date, $end_date, $stundenplan)
+	{
+		$qry = "
+			WITH lehreinheiten AS (
+				SELECT lehreinheit_id FROM lehre.tbl_lehreinheit WHERE lehreinheit_id = ?
+			), " . $this->getStundenplanCTE($stundenplan) . "
+			SELECT *
+			FROM stundenplanentries
+		";
+
+		return $this->execReadOnlyQuery($qry, array($lehreinheit, $start_date, $end_date));
+	}
+
+	public function getStundenplanLV($lehrveranstaltung_id, $start_date, $end_date, $stundenplan)
+	{
+		$qry = "
+			WITH lehreinheiten AS (
+				SELECT lehreinheit_id 
+				FROM lehre.tbl_lehreinheit 
+					JOIN tbl_studiensemester USING(studiensemester_kurzbz)
+				WHERE lehrveranstaltung_id = ?
+					AND tbl_studiensemester.start >= ? AND tbl_studiensemester.ende <= ?
+			), " . $this->getStundenplanCTE($stundenplan) . "
+			SELECT *
+			FROM stundenplanentries
+		";
+
+		return $this->execReadOnlyQuery($qry, array($lehrveranstaltung_id, $start_date, $end_date, $start_date, $end_date));
+	}
+
+	private function getStundenplanCTE($stundenplan)
+	{
+		return "entries AS (
+					SELECT
+						datum, min(stunde) as stunde_beginn, max(stunde) as stunde_ende,
+						array_agg(DISTINCT(
+								CASE WHEN gruppe_kurzbz is not null THEN gruppe_kurzbz
+										ELSE (UPPER(stg_typ || stg_kurzbz) || COALESCE(semester,'0') || COALESCE(verband,'') || COALESCE(gruppe,''))
+								END)) as gruppen_kuerzel,
+						array_agg(DISTINCT CONCAT(vorname || ' ' || nachname)) as lektorname,
+						array_agg(DISTINCT stundenplan.ort_kurzbz) as ort_kurzbz,
+						array_agg(DISTINCT titel) as titel,
+						lehrfach_bez, stundenplan.lehreinheit_id, lehrveranstaltung_id
+					FROM lehre.vw_$stundenplan as stundenplan
+						JOIN public.tbl_mitarbeiter ON stundenplan.uid = tbl_mitarbeiter.mitarbeiter_uid
+						JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid
+						JOIN tbl_person USING(person_id)
+						JOIN lehreinheiten ON stundenplan.lehreinheit_id = lehreinheiten.lehreinheit_id
+					WHERE datum >= ? AND datum <= ?
+					GROUP BY datum, unr, stundenplan.lehreinheit_id, lehrveranstaltung_id, lehrfach_bez, lehrfach_bez
+					ORDER BY datum, min(stunde), unr, lehreinheit_id
+				),
+				stundenplanentries AS (
+					SELECT
+						entries.*,
+						stundeb.beginn AS beginn,
+						stundee.ende AS ende
+					FROM entries
+						JOIN lehre.tbl_stunde stundeb ON stundeb.stunde = entries.stunde_beginn
+						JOIN lehre.tbl_stunde stundee ON stundee.stunde = entries.stunde_ende
+				)";
+	}
 	/**
 	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *

application/models/ressource/Stundenplandev_Kalender_model.php

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

application/models/ressource/Stundenplandev_model.php

@@ -241,4 +241,15 @@ class Stundenplandev_model extends DB_Model
 
 		return $this->delete(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 	}
+
+	public function lektorHasStundenplandevEintrag($uid, $datum, $stunde)
+	{
+		$qry = "SELECT stundenplandev_id, lektor, stg_kurzbz, ort_kurzbz, semester, verband, gruppe, gruppe_kurzbz, datum, stunde 
+				FROM lehre.vw_stundenplandev
+				WHERE uid = ?
+					AND datum = ?
+					AND stunde = ?";
+
+		return $this->execReadOnlyQuery($qry, [$uid, $datum, $stunde]);
+	}
 }

application/models/ressource/Zeitsperre_model.php

@@ -61,4 +61,40 @@ class Zeitsperre_model extends DB_Model
 
         return $this->execQuery($qry);
     }
+
+	public function checkIfZeitsperreExists($uid, $datum, $stunde)
+	{
+		$this->db->select("*");
+
+		$this->db->where('mitarbeiter_uid', $uid);
+		$this->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
+
+		$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->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->group_end();
+		$this->db->group_end();
+
+		return $this->load();
+
+	}
 }

application/views/CisRouterView/CisRouterView.php

@@ -11,6 +11,7 @@ $includesArray = array(
 	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
+		'vendor/vuejs/vuedatepicker_css/main.css',
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
@@ -32,14 +33,17 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/moment/luxonjs/luxon.min.js',
+		'vendor/npm-asset/primevue/password/password.min.js',
+		'vendor/npm-asset/primevue/multiselect/multiselect.min.js',
 		'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/tieredmenu/tieredmenu.js',
-		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js',
+		'vendor/olifolkerd/tabulator5/src/js/modules/ColumnCalcs/ColumnCalcs.js'
 	),
 
 );

application/views/LVVerwaltung.php

@@ -31,6 +31,8 @@
 		lv-root="<?= site_url('LVVerwaltung'); ?>"
 		:permissions="<?= htmlspecialchars(json_encode($permissions));?>"
 		:config="<?=  htmlspecialchars(json_encode($configs)); ?>"
+		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
+		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 	>
 	</router-view>
 

application/views/Tempus.php

@@ -1,50 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'Tempus',
-		'axios027' => true,
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3' => true,
-		'primevue3' => true,
-		'tabulator5' => true,
-		'vuedatepicker11' => true,
-		'phrases' => array(
-			'global',
-			'ui',
-			'notiz',
-		),
-		'customCSSs' => [
-			'public/css/components/vue-datepicker.css',
-			'public/css/components/primevue.css',
-			'public/css/components/calendar.css',
-			'public/css/Tempus.css',
-			'public/css/Studentenverwaltung.css',
-			'public/css/components/function.css'
-		],
-		'customJSs' => [
-			#'vendor/npm-asset/primevue/tree/tree.min.js',
-			#'vendor/npm-asset/primevue/toast/toast.min.js'
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => [
-			'public/js/apps/Tempus.js'
-		]
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-	<div id="main">
-		<router-view
-			default-semester="<?= $variables['semester_aktuell']; ?>"
-			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
-			tempus-root="<?= site_url('Tempus'); ?>"
-			cis-root="<?= CIS_ROOT; ?>"
-			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
-			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
-			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
-			:config="<?=  htmlspecialchars(json_encode($variables)); ?>"
-			>
-		</router-view>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/system/infocenter/infocenterData.php

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

application/views/system/infocenter/onboardingData.php

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

cis/menu.php

@@ -41,11 +41,11 @@ ob_start();
 <link href="../skin/style.css.php" rel="stylesheet" type="text/css">
 <title>Menu</title>
 <link href="../skin/flexcrollstyles.css" rel="stylesheet" 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 type="text/javascript">
 	function treemenu(obj)

cis/testtool/frage.php

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

cis/testtool/login.php

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

include/pruefling.class.php

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

locale/de-AT/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='Sie sind für den Reihungstest nicht registriert';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
@@ -35,6 +36,8 @@ $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfra
 $this->phrasen['testtool/einleitung']='Einleitung';
 $this->phrasen['testtool/blaettern']='Blättern';
 $this->phrasen['testtool/demo']='Demobeispiel ansehen';
+$this->phrasen['testtool/abbrechen']='Abbrechen';
+$this->phrasen['testtool/startGebiet']='Gebiet starten';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Klicken Sie OK um dieses Gebiet zu starten. \nSie haben für die Bearbeitung ein Zeitlimit von';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Bitte zuerst anmelden!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Fehler beim generieren des Fragenpools';

locale/en-US/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='You are not registered for the placement test.';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
@@ -35,6 +36,8 @@ $this->phrasen['testtool/spracheDerTestfragen']='Desired language of questions';
 $this->phrasen['testtool/einleitung']='Introduction';
 $this->phrasen['testtool/blaettern']='Browse';
 $this->phrasen['testtool/demo']='See an example';
+$this->phrasen['testtool/abbrechen']='Cancel';
+$this->phrasen['testtool/startGebiet']='Start the section';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Click OK to start this section. \nYou have a timelimit of';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Please log in first!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Error in generating the pool of questions.';

public/css/Cis4/Cis.css

@@ -407,6 +407,7 @@ html {
   background-color: var(--fhc-background);
   border-color: var(--fhc-border);
   padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
+  min-width: 0; /* fix flex-grow with tabulator exceeding width */
 }
 
 #cis-main .fa-arrow-up-right-from-square {
@@ -856,8 +857,25 @@ html {
 	
 }
 
+/* styling for editable dropdown column of notenvorschläge in benotungstool*/
+#notentable .tabulator-tableholder .tabulator-editable {
+	position: relative;
+	background-color: rgba(255, 255, 157, 0.73);
+	cursor: pointer;
+}
+
+#notentable .tabulator-tableholder .tabulator-editable::after {
+	content: "▾";
+	position: absolute;
+	right: 6px;
+	color: rgba(176, 176, 106, 0.73);;
+	font-size: x-large;
+	bottom: 6px;
+	pointer-events: none;
+}
+
 .bordered-modal {
 	border: 1px solid rgba(0, 0, 0, 0.15);
 	border-radius: 0.5rem;
 	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
-}
+}

public/css/Cis4/CoreCalendarEvents.css

@@ -97,15 +97,3 @@
 	display: none;
 }
 
-.weekPageContainer .calendar-event-collisions
-{
-	display: grid;
-	grid-template-columns: auto 1fr;
-	background: repeating-linear-gradient(
-			135deg,
-			transparent,
-			transparent 16px,
-			rgba(0, 0, 0, 0.3) 16px,
-			rgba(0, 0, 0, 0.3) 32px
-	);
-}

public/css/Lvverwaltung.css

@@ -38,3 +38,9 @@ textarea[name="anmerkung"] {
 {
 	border-color: black;
 }
+
+.node-verband {
+	user-select: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+}

public/css/Tempus.css

@@ -1,187 +0,0 @@
-@import './Fhc.css';
-@import './components/searchbar/searchbar.css';
-@import './components/verticalsplit.css';
-@import './components/FilterComponent.css';
-@import './components/Tabs.css';
-@import './components/Notiz.css';
-
-html {
-  font-size: .875em;
-  height: 100%;
-}
-
-body {
-	/*display: flex;*/
-	 height: 100%;
-}
-.heightfull {
-		 height: 95%;
-}
-.navbar-dark .navbar-brand:focus {
-	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
-	z-index: 3;
-}
-#main {
-	height: 100%;
-}
-.tempus {
-	height: 100%;
-}
-.searchbar {
-	margin-right: 0!important;
-}
-.searchbar > .input-group {
-	margin-right: 0!important;
-}
-.searchbar > .input-group > * {
-	border-radius: 0!important;
-}
-
-#sidebarMenu {
-	width: 0%;
-}
-
-.tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
-	color: var(--gray-400);
-}
-.tabulator-row.disabled.tabulator-row-even .tabulator-cell {
-	color: var(--gray-500);
-}
-
-/* Dropdown Toolbar Interessent, submenu */
-.dropend .dropdown-toggle.d-flex::after {
-	height: 0;
-}
-
-@media (min-width: 768px) {
-	#sidebarMenu {
-		visibility: visible!important;
-		transform: none;
-		position: inherit;
-		z-index: 1;
-	}
-}
-
-.toast.toast-success {
-	color: #0f5132;
-	background-color: #d1e7dd!important;
-	border-color: #badbcc!important;
-}
-.toast.toast-danger {
-	color: #842029;
-	background-color: #f8d7da!important;
-	border-color: #f5c2c7!important;
-}
-
-.has-filter .fa-filter {
-	color: var(--bs-success);
-}
-
-
-
-
-#parkingslot {
-	border: 1px dashed;
-	min-height: 5vh;
-	max-height: 15vh;
-	color: #AAAAAA;
-	text-align: center;
-	font-size: large;
-	margin-top: 1.25rem;
-	overflow-y: auto;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-wrap: wrap;
-}
-
-.course-picker {
-	border: 1px dashed #AAAAAA;
-	display: flex;
-	flex-direction: column;
-	flex: 1 1 0;
-	min-height: 0;
-}
-
-.course-picker-row {
-	padding: 0.5rem;
-	margin-bottom: 0.5rem;
-	border: 1px solid var(--bs-border-color);
-	background-color: var(--event-bg);
-}
-
-.parkingevent {
-	border: 1px dashed !important;
-	border-color: #AAAAAA;
-	padding: 0.5rem;
-	margin-bottom: 0.5rem;
-	margin-left: 0.5rem;
-	margin-right: 0.5rem;
-}
-
-:root{
-	--fhc-calendar-pane-height: calc(100vh - 120px);
-}
-
-.eckerltest {
-		box-shadow: 3px 3px 3px #ccc;
-}
-
-.verband-selection {
-	border: 1px dashed #AAAAAA;
-	margin-bottom: 0.5rem;
-	max-height: 450px;
-	overflow-y: auto;
-	display: flex;
-	flex-direction: column;
-}
-
-.lecture-selection {
-	border: 1px dashed #AAAAAA;
-	margin-bottom: 0.5rem;
-	max-height: 20vh;
-	overflow-y: auto;
-	display: flex;
-	flex-direction: column;
-}
-
-.room-selection {
-	border: 1px dashed #AAAAAA;
-	margin-bottom: 0.5rem;
-	padding: 0.5rem 0 0.5rem 0.5rem;
-}
-
-.btn-link.text-danger {
-	text-decoration: none;
-	font-weight: 600;
-}
-
-.btn-link.text-danger:hover {
-	color: #dc3545;
-	transform: scale(1.1);
-}
-
-
-
-.bg-lecturer-wish {
-	opacity: .15;
-}
-.bg-lecturer-block {
-	background: rgba(255, 0, 0, 0.15);
-}
-
-
-.wish-w--2 {
-	background-color: #FF2200;
-}
-.wish-w--1 {
-	background-color: #FF9922;
-}
-.wish-w-1 {
-	background-color: #CCFFCC;
-}
-.wish-w-2 {
-	background-color: #48FA66;
-}
-
-

public/css/components/calendar/events.css

@@ -2,10 +2,6 @@
 	cursor: pointer;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
-.event--parked {
-	opacity: 0.45 !important;
-}
-
 .fhc-calendar-mode-day .fhc-calendar-base-grid-line,
 .fhc-calendar-mode-week .fhc-calendar-base-grid-line {
 	padding: 0 var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
@@ -73,36 +69,3 @@
 .fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
 }
-
-.fhc-resize-bar {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	height: 15px;
-	flex: 0 0 12px;
-	cursor: ns-resize;
-	position: relative;
-	visibility: hidden;
-	pointer-events: none;
-	background-color: transparent !important;
-	border: none !important;
-}
-
-.fhc-resize-bar--top {
-	margin-bottom: -16px;
-}
-.fhc-resize-bar--bottom {
-	margin-top: -16px;
-}
-
-.fhc-calendar-base-grid-line-event:hover > .fhc-resize-bar {
-	visibility: visible;
-	pointer-events: auto;
-}
-.fhc-calendar-base-grid-line-event.event:hover {
-	z-index: 50;
-}
-.fhc-resize-bar {
-	z-index: 2;
-}
-

public/js/api/factory/lehre.js

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

public/js/api/factory/noten.js

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

public/js/api/factory/renderers.js

@@ -9,12 +9,4 @@ export default {
 			}
 		};
 	},
-	loadTempusRenderers() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/RendererLoader/GetTempusRenderers',
-			params: {
-			}
-		};
-	},
 }

public/js/api/factory/studiensemester.js

@@ -16,6 +16,12 @@
  */
 
 export default {
+	getStudiensemester() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Studiensemester/getStudiensemester'
+		};
+	},
 	getAllStudiensemesterAndAktOrNext() {
 		return {
 			method: 'get',

public/js/api/factory/stv/coursedates.js

@@ -16,16 +16,20 @@
  */
 
 export default {
-	getCourselist(params) {
+	getCourselist(student_uid,  start_date, end_date, stundenplan) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + params.student_uid + '/'
-				+ params.start_date + '/'
-				+ params.end_date + '/'
-				+ params.group_consecutiveHours + '/'
-				+ params.dbStundenplanTable
+			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + encodeURIComponent(student_uid) + '/'
+				+ encodeURIComponent(start_date) + '/'
+				+ encodeURIComponent(end_date) + '/'
+				+ encodeURIComponent(stundenplan) + '/'
+				+ encodeURIComponent(true)
 		};
 	},
+	exportCalendar(student_uid, stundenplan)
+	{
+		return FHC_JS_DATA_STORAGE_OBJECT.app_root +  'content/statistik/termine.xls.php?student_uid=' + encodeURIComponent(student_uid) + '&db_stpl_table='+encodeURIComponent(stundenplan);
+	},
 	getStudiensemester(){
 		return {
 			method: 'get',

public/js/api/factory/tempus/config.js

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

public/js/api/factory/tempus/coursepicker.js

@@ -1,17 +0,0 @@
-export default {
-	search(query) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/tempus/coursepicker/search',
-			params: { query }
-		};
-	},
-	getByStg(stg, studiensemester_kurzbz) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/tempus/coursepicker/getByStg',
-			params: { stg, studiensemester_kurzbz }
-		};
-	},
-
-};

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

@@ -1,108 +0,0 @@
-
-export default {
-	getPlan(filter, start_date, end_date)
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getPlan',
-			params: { ...filter, start_date, end_date }
-		};
-	},
-	getPlanLecturer(start_date, end_date)
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getPlanLecturer',
-			params: { start_date, end_date }
-		};
-	},
-	getPlanStudent(start_date, end_date)
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getPlanStudent',
-			params: { start_date, end_date }
-		};
-	},
-
-	syncToLecturer(kalender_id)
-	{
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/syncToLecturer',
-			params: { kalender_id }
-		};
-	},
-	syncToStudent(kalender_id)
-	{
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/syncToStudent',
-			params: { kalender_id }
-		};
-	},
-	sync()
-	{
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/sync',
-		};
-	},
-	getLektorZeitsperren(emp, start_date, end_date) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getZeitsperren',
-			params: { emp, start_date, end_date }
-		};
-	},
-	getLektorZeitwuensche(emp, start_date, end_date) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getZeitwuensche',
-			params: { emp, start_date, end_date }
-		};
-	},
-	getStunden() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getStunden',
-		};
-	},
-	updateKalenderEvent(kalender_id, updatedInfos) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/updateKalenderEvent',
-			params: { kalender_id, updatedInfos}
-		};
-	},
-	addKalenderEvent(lehreinheit_id, ort_kurzbz, start_date, end_date) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/addKalenderEvent',
-			params: { lehreinheit_id, ort_kurzbz, start_date, end_date}
-		};
-	},
-	getRaumvorschlag(start_date, end_date, lehreinheit_id) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getRaumvorschlag',
-			params: { start_date, end_date, lehreinheit_id}
-		};
-	},
-
-	getHistory(kalender_id) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Kalender/getHistory',
-			params: { kalender_id }
-		};
-	},
-	deleteEntry(kalender_id) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Kalender/deleteEntry',
-			params: { kalender_id }
-		};
-	},
-
-};

public/js/api/factory/tempus/reservierung.js

@@ -1,59 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	getInformation() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Reservierung/getInformation',
-		};
-	},
-	searchTeilnehmer(query)
-	{
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/tempus/Reservierung/getLektor?query=${encodeURIComponent(query)}`
-		};
-	},
-	searchGroup(query)
-	{
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/tempus/Reservierung/searchGroup?query=${encodeURIComponent(query)}`
-		};
-	},
-	getGruppen(query) {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/tempus/Reservierung/getGruppen?query=${encodeURIComponent(query)}`
-		};
-	},
-	getRollen() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/tempus/Reservierung/getRollen',
-		};
-	},
-	addReservierung(titel, beschreibung, ort_kurzbz, start_date, end_date, teilnehmer, specialFinalGroups, specialGroups, groups) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/tempus/Reservierung/addReservierung',
-			params: { titel, beschreibung, ort_kurzbz, start_date, end_date, teilnehmer, specialFinalGroups, specialGroups, groups}
-		};
-	},
-
-};

public/js/api/lehrveranstaltung/config.js

@@ -0,0 +1,15 @@
+export default {
+	get() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/config/get'
+		};
+	},
+	set(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/lv/config/set',
+			params
+		};
+	}
+};

public/js/api/lehrveranstaltung/gruppe.js

@@ -18,6 +18,14 @@ export default {
 			params: newData
 		};
 	},
+	getGruppe(gruppe)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/gruppe/getGruppe/',
+			params: gruppe
+		};
+	},
 	getByLehreinheit(lehreinheit_id)
 	{
 		return {

public/js/api/lehrveranstaltung/letermine.js

@@ -0,0 +1,19 @@
+export default {
+	getCourselist(le_id, start_date, end_date, stundenplan)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/getLeEvents/' + encodeURIComponent(le_id) + "/" + encodeURIComponent(start_date) + "/" + encodeURIComponent(end_date) + "/" + encodeURIComponent(stundenplan),
+		};
+	},
+	exportCalendar(le_id, stundenplan)
+	{
+		return FHC_JS_DATA_STORAGE_OBJECT.app_root +  'content/statistik/termine.xls.php?lehreinheit_id=' + encodeURIComponent(le_id) + '&db_stpl_table='+encodeURIComponent(stundenplan);
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getStudiensemester/'
+		};
+	},
+};

public/js/api/lehrveranstaltung/lvtermine.js

@@ -0,0 +1,19 @@
+export default {
+	getCourselist(lv_id, start_date, end_date, stundenplan)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/getLvEvents/' + encodeURIComponent(lv_id) + "/" + encodeURIComponent(start_date) + "/" + encodeURIComponent(end_date) + "/" + encodeURIComponent(stundenplan),
+		};
+	},
+	exportCalendar(lv_id, stundenplan)
+	{
+		return FHC_JS_DATA_STORAGE_OBJECT.app_root +  'content/statistik/termine.xls.php?lehrveranstaltung_id=' + encodeURIComponent(lv_id) + '&db_stpl_table='+encodeURIComponent(stundenplan);
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getStudiensemester/'
+		};
+	},
+};

public/js/api/lehrveranstaltung/noten.js

@@ -0,0 +1,25 @@
+import Grades from '../factory/stv/grades.js';
+
+export default {
+	...Grades,
+	getCertificate(lv_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/lv/noten/getCertificate/' + encodeURIComponent(lv_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return {
+			method: 'get',
+			url: url
+		};
+	},
+	getTeacherProposal(lv_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/lv/noten/getTeacherProposal/' + encodeURIComponent(lv_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return {
+			method: 'get',
+			url: url
+		};
+	},
+};

public/js/api/lehrveranstaltung/setup.js

@@ -1,9 +1,16 @@
 export default {
-	getTabs()
+	getLETabs()
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/setup/getTabs/'
+			url: '/api/frontend/v1/lv/setup/getLETabs/'
+		};
+	},
+	getLVTabs()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getLVTabs/'
 		};
 	},
 }

public/js/apps/Dashboard/Fhc.js

@@ -20,6 +20,7 @@ import Studium from "../../components/Cis/Studium/Studium.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
+import Benotungstool from "../../components/Cis/Benotungstool/Benotungstool.js";
 import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
@@ -75,6 +76,12 @@ const router = VueRouter.createRouter({
 			component: Raumsuche,
 			props: true
 		},
+		{
+			path: `/Cis/Benotungstool/:lv_id/:sem_kurzbz`,
+			name: 'Benotungstool',
+			component: Benotungstool,
+			props: true
+		},
 		// Redirect old links to new format
 		{
 			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",

public/js/apps/Tempus.js

@@ -1,45 +0,0 @@
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import FhcTempus from "../components/Tempus/Tempus.js";
-
-import Phrasen from "../plugins/Phrasen.js";
-import {capitalize} from "../helpers/StringHelpers.js";
-
-
-const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-
-const router = VueRouter.createRouter({
-	history: VueRouter.createWebHistory(),
-	routes: [
-		{ path: `/${ciPath}/Tempus`, component: FhcTempus },
-	]
-});
-
-const app = Vue.createApp();
-
-app.config.globalProperties.$capitalize = capitalize;
-app
-	.use(router)
-	.use(primevue.config.default, {
-		zIndex: {
-			overlay: 1100
-		}
-	})
-	.use(Phrasen)
-	.directive('tooltip', primevue.tooltip)
-	.mount('#main');

public/js/components/Calendar/Base.js

@@ -1,31 +1,23 @@
+import BaseDraganddrop from './Base/DragAndDrop.js';
 import BaseHeader from './Base/Header.js';
 import BaseSlider from './Base/Slider.js';
 import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
-import DragClick from '../../directives/dragClick.js';
-import Draggable from '../../directives/draggable.js';
-import Drop from '../../directives/drop.js';
 
 export default {
 	name: "CalendarBase",
 	components: {
+		BaseDraganddrop,
 		BaseHeader,
 		BaseSlider,
 		BsModal
 	},
 	directives: {
-		CalClick,
-		DragClick,
-		Draggable,
-		Drop
+		CalClick
 	},
 	provide() {
 		return {
-			events: Vue.computed(() => this.convertedEvents),
-			backgrounds: Vue.computed(() => this.convertedBackgrounds),
-			dropAllowed: Vue.computed(() => !!this.onDrop),
-			onDrop: Vue.computed(() => this.onDrop || null),
 			locale: Vue.computed(() => this.locale),
 			timezone: Vue.computed(() => this.timezone),
 			timeGrid: Vue.computed(() => this.timeGrid),
@@ -51,20 +43,8 @@ export default {
 
 				return () => true;
 			}),
-			resizableEvents: Vue.computed(() => {
-				if (!this.resizableEvents)
-					return () => false;
-
-				if (Array.isArray(this.resizableEvents))
-					return event => this.resizableEvents.includes(event.type);
-				if (this.resizableEvents instanceof Function)
-					return this.resizableEvents;
-
-				return () => true;
-			}),
 			hasDragoverFunc: Vue.computed(() => this.onDragover),
-			mode: Vue.computed(() => this.mode),
-			onResize: Vue.computed(() => this.onResize || null),
+			mode: Vue.computed(() => this.mode)
 		};
 	},
 	props: {
@@ -113,17 +93,11 @@ export default {
 			type: Boolean,
 			default: undefined
 		},
-		btnTableList: {
-			type: Boolean,
-			default: undefined
-		},
 		timeGrid: Array,
 		draggableEvents: [Boolean, Array, Function],
 		dropableEvents: [Boolean, Array, Function],
-		resizableEvents: [Boolean, Array, Function],
 		onDragover: Function,
-		onDrop: Function,
-		onResize: Function
+		onDrop: Function
 	},
 	emits: [
 		"click:next",
@@ -214,7 +188,7 @@ export default {
 	},
 	watch: {
 		sDate(n, o) {
-			if (this.sDate.isValid && (!this.internalDate || !this.sDate.hasSame(this.internalDate, 'day')))
+			if (this.sDate.isValid && !this.sDate.hasSame(this.internalDate, 'day'))
 				this.internalDate = this.sDate;
 		},
 		sMode() {
@@ -266,7 +240,9 @@ export default {
 				break;
 			}
 		},
-
+		onDropItem(evt, start, end) {
+			this.$emit('drop', evt, start, end);
+		},
 		showEventModal(eventObj) {
 			this.modalEvent = eventObj;
 			this.$refs.modal.show();
@@ -287,7 +263,11 @@ export default {
 	},
 	template: /* html */`
 	<div class="fhc-calendar-base h-100">
-		<div class="card h-100"
+		<base-draganddrop
+			class="card h-100"
+			:events="convertedEvents"
+			:backgrounds="convertedBackgrounds"
+			@drop="onDropItem"
 			v-cal-click:container
 			@cal-click-default.capture="handleClickDefaults"
 		>
@@ -302,7 +282,6 @@ export default {
 				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
 				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
 				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
-				:btn-table-list="!!modes['tableList'] && (btnTableList || (showBtns && btnTableList !== false))"
 				:mode-options="modeOptions ? modeOptions[cMode] : undefined"
 			>
 				<slot name="actions" />
@@ -314,12 +293,11 @@ export default {
 				@update:range="$emit('update:range', $event)"
 				@request-modal-open="showEventModal"
 				@request-modal-close="hideEventModal"
-				@drop="$emit('drop', $event)"
 				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
 			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</component>
-		</div>
+		</base-draganddrop>
 		<bs-modal ref="modal" dialog-class="modal-lg" body-class="" @hidden-bs-modal="onModalHidden">
 			<template #title>
 				<slot v-if="modalEvent" v-bind="{mode: 'eventheader', event: modalEvent.event}" />

public/js/components/Calendar/Base/DragAndDrop.js

@@ -0,0 +1,165 @@
+import DragAndDrop from '../../../helpers/DragAndDrop.js';
+
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+
+/**
+ * TODO(chris): this needs serious rework!
+ */
+
+export default {
+	name: "CalendarDragAndDrop",
+	directives: {
+		CalDnd
+	},
+	provide() {
+		return {
+			events: Vue.computed(() => this.correctedEvents),
+			backgrounds: Vue.computed(() => this.backgrounds),
+			dropAllowed: Vue.computed(() => this.dragging && this.dropAllowed)
+		};
+	},
+	inject: {
+		mode: "mode",
+		dropableEvents: "dropableEvents"
+	},
+	props: {
+		events: Array,
+		backgrounds: Array
+	},
+	emits: [
+		"drop"
+	],
+	data() {
+		return {
+			dragging: false,
+			allowed: false,
+			draggedInternalEvent: null,
+			draggedExternalEvent: null,
+			targetTimestamp: 0,
+			targetGridEnds: null,
+			dropAllowed: false,
+
+			shadowPreview: false // TODO(chris): IMPLEMENT! (use background instead of event as preview)
+		};
+	},
+	computed: {
+		correctedEvents() {
+			if (this.dragging) {
+				if (this.draggedInternalEvent) {
+					const index = this.events.findIndex(e => e.id == this.draggedInternalEvent.id);
+					if (this.previewEvent && !this.shadowPreview)
+						return this.events.toSpliced(index, 1, this.previewEvent);
+					else
+						return this.events.toSpliced(index, 1);
+				}
+				if (this.previewEvent && !this.shadowPreview)
+					return [...this.events, this.previewEvent];
+			}
+
+			return this.events;
+		},
+		correctedBackgrounds() {
+			if (this.dragging) {
+				if (this.shadowPreview) {
+					// TODO(chris): how to get the length
+					return [...this.backgrounds, {
+						start: new Date(this.targetTimestamp),
+						class: 'shadow-preview'
+					}];
+				}
+			}
+
+			return this.backgrounds;
+		},
+		previewEvent() {
+			if (!this.dragging || !this.dropAllowed)
+				return null;
+			if (!this.targetTimestamp)
+				return null;
+
+			const event = this.draggedInternalEvent || this.draggedExternalEvent;
+
+			if (!event)
+				return null;
+			
+			// TODO(chris): calculate length correctly from orig
+			let length = event.end - event.start;
+			if (this.targetGridEnds)
+				length = this.targetGridEnds.find(end => end >= this.targetTimestamp + length) - this.targetTimestamp;
+			
+			return {
+				orig: event.orig,
+				start: this.targetTimestamp,
+				end: this.targetTimestamp + length
+			};
+		}
+	},
+	methods: {
+		onDragstart(evt) {
+			const data = DragAndDrop.convertToTransferData(evt.detail.item.orig);
+			if (DragAndDrop.isValidDragObject(data)) {
+				DragAndDrop.setTransferData(evt.detail.originalEvent, data);
+				this.draggedInternalEvent = evt.detail.item;
+			}
+		},
+		onDragend() {
+			this.draggedInternalEvent = null;
+			this.dragging = false;
+		},
+		onDragenter(evt) {
+			this.dragging = true;
+
+			if (!this.draggedInternalEvent) {
+				const event = DragAndDrop.getValidTransferData(evt.detail.originalEvent);
+				if (event) {
+					this.draggedExternalEvent = {
+						id: event.id,
+						type: event.type,
+						start: event.isostart
+							? luxon.DateTime.fromISO(event.isostart).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						end: event.isoend
+							? luxon.DateTime.fromISO(event.isoend).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						orig: event
+					};
+				} else {
+					this.draggedExternalEvent = null;
+				}
+				this.dropAllowed = this.dropableEvents(event, this.mode);
+			} else {
+				this.dropAllowed = this.dropableEvents(this.draggedInternalEvent, this.mode);
+			}
+		},
+		onDragleave() {
+			this.dragging = false;
+		},
+		onDragchange(evt) {
+			this.targetTimestamp = evt.detail.timestamp;
+			
+			this.targetGridEnds = evt.detail.ends || null;
+		},
+		onDrop(evt) {
+			if (!this.dragging || !this.dropAllowed)
+				return;
+
+			this.$emit('drop', evt, this.previewEvent.start, this.previewEvent.end);
+			this.dropAllowed = false;
+			this.dragging = false;
+		}
+	},
+	template: `
+	<div
+		class="fhc-calendar-base-draganddrop"
+		@calendar-dragstart="onDragstart"
+		@calendar-dragend="onDragend"
+		v-cal-dnd:dropcage
+		@calendar-dragenter="onDragenter"
+		@calendar-dragleave="onDragleave"
+		@calendar-dragchange="onDragchange"
+		@drop="onDrop"
+	>
+		<slot />
+	</div>
+	`
+}

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

@@ -1,8 +1,7 @@
 import GridLine from './Grid/Line.js';
 import GridLineEvent from './Grid/Line/Event.js';
 
-import drop from '../../../directives/drop.js';
-import { useResizeHandler } from '../../../helpers/Tempus/ResizeHandler.js';
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
 
 export default {
 	name: "CalendarGrid",
@@ -11,18 +10,12 @@ export default {
 		GridLineEvent
 	},
 	directives: {
-		drop
+		CalDnd
 	},
 	inject: {
 		originalEvents: "events",
 		originalBackgrounds: "backgrounds",
-		dropAllowed: "dropAllowed",
-		onDrop: "onDrop",
-		onResize: "onResize",
-		timeGrid: {
-			from: "timeGrid",
-			default: () => []
-		}
+		dropAllowed: "dropAllowed"
 	},
 	provide() {
 		return {
@@ -64,10 +57,10 @@ export default {
 	},
 	data() {
 		return {
+			dragging: false,
 			resizeObserver: null,
 			mutationObserver: null,
-			userScroll: true,
-			isDragging: false
+			userScroll: true
 		};
 	},
 	computed: {
@@ -259,27 +252,17 @@ export default {
 				pageLeft += this.getPageLeft(el.offsetParent);
 			return pageLeft;
 		},
-		getTimestampFromMouse(evt, dayTimestamp)
-		{
+		getTimestampFromMouse(evt, dayTimestamp) {
 			let mouse, mouseFrac;
-
-			const grabOffsetY = parseFloat(evt.dataTransfer.getData('fhc-grab-offset-y')) || 0;
-			const grabOffsetX = parseFloat(evt.dataTransfer.getData('fhc-grab-offset-x')) || 0;
-
-			if (this.flipAxis)
-			{
-				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.scroller.scrollLeft - grabOffsetX;
+			if (this.flipAxis) {
+				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.main.scrollLeft;
 				mouseFrac = mouse / this.$refs.body.offsetWidth;
-			}
-			else
-			{
-				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.scroller.scrollTop - grabOffsetY;
+			} else {
+				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.main.scrollTop;
 				mouseFrac = mouse / this.$refs.body.offsetHeight;
 			}
 
-			let rawTimestamp = dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
-			let fiveMinutes = 5 * 60 * 1000;
-			return Math.round(rawTimestamp / fiveMinutes) * fiveMinutes;
+			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
 		},
 
 		/* SCROLLING */
@@ -325,151 +308,7 @@ export default {
 			} else {
 				this.$refs.scroller.scrollTo(0, 0);
 			}
-		},
-		calculateNettoDuration(start, end) {
-			const startDay = start.startOf('day');
-			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
-
-			let nettoDuration = luxon.Duration.fromMillis(0);
-
-			for (const block of blocks)
-			{
-				const blockStart = startDay.plus(block.start);
-				const blockEnd = startDay.plus(block.end);
-
-				const overlapStart = blockStart > start ? blockStart : start;
-				const overlapEnd = blockEnd < end ? blockEnd : end;
-
-				if (overlapStart < overlapEnd) {
-					nettoDuration = nettoDuration.plus(overlapEnd.diff(overlapStart));
-				}
-			}
-
-			return nettoDuration;
-		},
-
-		calculateDropEnd(dropStart, durationMs) {
-			const duration = luxon.Duration.fromMillis(durationMs);
-			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
-			let accumulated = luxon.Duration.fromMillis(0);
-
-			for (const block of blocks)
-			{
-				const blockStart = dropStart.startOf('day').plus(block.start);
-				const blockEnd = dropStart.startOf('day').plus(block.end);
-
-				if (blockEnd <= dropStart) continue;
-
-				const relevantStart = blockStart > dropStart ? blockStart : dropStart;
-				const relevantDuration = blockEnd.diff(relevantStart);
-
-				accumulated = accumulated.plus(relevantDuration);
-
-				if (accumulated >= duration)
-				{
-					const overflow = accumulated.minus(duration);
-					return blockEnd.minus(overflow);
-				}
-			}
-
-			const lastBlock = blocks[blocks.length - 1];
-			return dropStart.startOf('day').plus(lastBlock.end);
-		},
-
-		onDropSnap(evt, items, date, part) {
-			let obj = items;
-			if (!obj?.orig) return;
-
-			const dayStr = evt?.currentTarget?.dataset?.day;
-			const dropDay = dayStr ? luxon.DateTime.fromISO(dayStr) : date;
-
-			const rawTimestamp = this.getTimestampFromMouse(evt, dropDay.toMillis());
-			const grabTime = luxon.DateTime.fromMillis(rawTimestamp);
-
-			const blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
-			const grabOffset = grabTime.diff(dropDay);
-
-			const snappedPart = blocks.find(b => grabOffset >= b.start && grabOffset < b.end) || part;
-			const dropStart = dropDay.plus(snappedPart.start);
-
-			let nettoDuration = this._getNettoDurationForDrop(obj);
-			let dropEnd = this.calculateDropEnd(dropStart, nettoDuration);
-
-			this.onDrop?.({
-				item: [obj],
-				start: dropStart.toISO(),
-				end: dropEnd.toISO()
-			});
-		},
-
-		_getNettoDurationForDrop(obj) {
-			if (obj.orig?.isostart && obj.orig?.isoend)
-			{
-				const s = luxon.DateTime.fromISO(obj.orig.isostart);
-				const e = luxon.DateTime.fromISO(obj.orig.isoend);
-				if (s.isValid && e.isValid)
-					return this.calculateNettoDuration(s, e);
-			}
-
-			if (obj.stundenblockung)
-			{
-				let blocks = this.axisPartsWithBreaks.filter(p => p.index !== undefined);
-				let firstBlock = blocks[0];
-				let blockMinutes = luxon.Duration.fromISO(firstBlock.end).minus(luxon.Duration.fromISO(firstBlock.start)).as('minutes');
-				if (!Number.isFinite(blockMinutes) || blockMinutes <= 0) blockMinutes = 45;
-				return luxon.Duration.fromObject({ minutes: obj.stundenblockung * blockMinutes });
-			}
-
-			return luxon.Duration.fromObject({ minutes: 45 });
-		},
-		onDropFree(evt, items, date)
-		{
-			let obj = items;
-			if (!obj?.orig)
-				return;
-
-			const timestamp = this.getTimestampFromMouse(evt, date);
-			const dropStart = luxon.DateTime.fromMillis(timestamp);
-
-			let nettoDuration = this._getNettoDurationForDrop(obj);
-			let dropEnd = this.calculateDropEnd(dropStart, nettoDuration);
-
-			this.onDrop?.({
-				item: [obj],
-				start: dropStart.toISO(),
-				end: dropEnd.toISO()
-			});
-		},
-		handleResizeStart({ edge, evt, el, event })
-		{
-			const gridEl = this.$refs.body;
-
-			if (!gridEl)
-				return;
-
-			this.resizeHandler.startResize(edge, evt, {
-				el,
-				gridEl,
-				event,
-				timeGrid: this.timeGrid,
-				onEnd: ({ event, newStart, newEnd }) => {
-					const orig = event?.orig;
-					if (!orig || !newStart || !newEnd)
-						return;
-
-					this.onResize?.({
-						item: [{ type: 'kalender', id: orig.kalender_id, orig }],
-						start: newStart,
-						end: newEnd
-					});
-				}
-			});
-		},
-	},
-	setup()
-	{
-		const resizeHandler = useResizeHandler();
-		return { resizeHandler };
+		}
 	},
 	beforeUnmount() {
 		this.disableAutoScroll();
@@ -543,11 +382,11 @@ export default {
 					ref="body"
 					class="grid-body"
 					style="display:grid;grid-template-rows:subgrid;grid-template-columns:subgrid"
-					@dragenter="isDragging = true"
-					@dragleave.self="isDragging = false"
-					@dragend="isDragging = false"
-					@drop="isDragging = false"
 					:style="'grid-' + axisCol + ':2/-1;grid-' + axisRow + ':1/-1'"
+					v-cal-dnd:dropcage
+					@calendar-dragenter="dragging = true"
+					@calendar-dragleave="dragging = false"
+					@dragover="dropAllowed ? $event.preventDefault() : null"
 				>
 					<template
 						v-for="(date, index) in axisMain"
@@ -562,11 +401,9 @@ export default {
 						>
 							<slot name="part-body" v-bind="{ index, part }" />
 							<div
-								v-if="snapToGrid"
-								style="position:absolute;inset:0"
-								:style="{ zIndex: isDragging ? 10 : 1 }"
-								:data-day="date.toFormat('yyyy-MM-dd')"
-								v-drop:move.lehreinheit.kalender.reservierung="(evt, item) => onDropSnap(evt, item, date, part)"
+								v-if="snapToGrid && dragging"
+								style="position:absolute;inset:0;z-index:1"
+								v-cal-dnd:dropzone.once="{date: date.plus(part.start || part), ends: ends.slice(ends.findIndex(end => end > date))}"
 							></div>
 						</div>
 						<grid-line
@@ -576,7 +413,6 @@ export default {
 							:events="eventsNormal[index]"
 							:backgrounds="backgrounds[index]"
 							style="position:relative"
-							@resize-start="handleResizeStart"
 							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
 						>
 							<template #event="slot">
@@ -584,10 +420,9 @@ export default {
 							</template>
 							<template #dropzone>
 								<div
-									v-if="!snapToGrid"
-									style="position:absolute;inset:0"
-									:style="{ zIndex: isDragging ? 10 : 1 }"
-									v-drop:move.lehreinheit.kalender.reservierung="(evt, item) => onDropFree(evt, item, date)"
+									v-if="!snapToGrid && dragging"
+									style="position:absolute;inset:0;z-index:1"
+									v-cal-dnd:dropzone="evt => getTimestampFromMouse(evt, date)"
 								></div>
 							</template>
 						</grid-line>
@@ -597,4 +432,4 @@ export default {
 		</div>
 	</div>
 	`
-}
+}

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

@@ -74,7 +74,6 @@ export default {
 			:key="i"
 			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
 			:event="event"
-			@resize-start="$emit('resize-start', $event)"
 		>
 			<template v-slot="slot">
 				<slot name="event" v-bind="slot" />

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

@@ -1,35 +1,15 @@
-import draggable from '../../../../../directives/draggable.js';
+import CalDnd from '../../../../../directives/Calendar/DragAndDrop.js';
 import CalClick from '../../../../../directives/Calendar/Click.js';
 
 export default {
 	name: "GridLineEvent",
 	directives: {
-		draggable,
+		CalDnd,
 		CalClick
 	},
-	emits: [
-		'resize-start'
-	],
-	data() {
-		return {
-			contextMenu: {
-				show: false,
-				x: 0,
-				y: 0
-			}
-		};
-	},
 	inject: {
 		draggableEvents: "draggableEvents",
-		resizableEvents: {
-			from: "resizableEvents",
-			default: () => () => false
-		},
-		mode: "mode",
-		contextMenuActions: {
-			from: "contextMenuActions",
-			default: () => ({})
-		}
+		mode: "mode"
 	},
 	props: {
 		event: {
@@ -47,9 +27,6 @@ export default {
 		draggable() {
 			return !this.isHeaderOrFooter && this.draggableEvents(this.event.orig, this.mode);
 		},
-		resizable() {
-			return !this.isHeaderOrFooter && this.resizableEvents(this.event.orig, this.mode);
-		},
 		classes() {
 			const classes = [];
 			if (this.isHeaderOrFooter) {
@@ -60,102 +37,21 @@ export default {
 				if (this.event.endsHere)
 					classes.push('event-end');
 			}
-			return classes;
-		},
-		dragKalenderCollection() {
-			const orig = this.event.orig;
-			return {
-				type: 'kalender',
-				id: orig?.kalender_id ?? null,
-				orig,
-			};
-		},
-		activeContextActions() {
-			if (this.isHeaderOrFooter) return [];
-			const type = this.event.orig?.type ?? 'lehreinheit';
-			return this.contextMenuActions[type] ?? this.contextMenuActions['default'] ?? [];
+			return classes
 		}
 	},
-	methods: {
-		onResizeStart(edge, evt) {
-			this.$emit('resize-start', {
-				edge,
-				evt,
-				el: this.$refs.eventEl,
-				event: this.event
-			});
-		},
-		onRightClick(evt) {
-			this.contextMenu.show = true;
-			this.contextMenu.x = evt.clientX;
-			this.contextMenu.y = evt.clientY;
-		},
-		onContextAction(action) {
-			this.contextMenu.show = false;
-			action(this.event.orig);
-		},
-		closeContextMenu() {
-			this.contextMenu.show = false;
-		},
-		onDragStart(evt) {
-			const rect = this.$refs.eventEl.getBoundingClientRect();
-			evt.dataTransfer.setData('fhc-grab-offset-y', evt.clientY - rect.top);
-			evt.dataTransfer.setData('fhc-grab-offset-x', evt.clientX - rect.left);
-		},
-	},
-	template:`
+	template: /* html */`
 	<div
 		class="fhc-calendar-base-grid-line-event event"
 		:class="classes"
-		style="z-index: 2"
+		style="z-index: 1"
 		:draggable="draggable"
-		ref="eventEl"
-		@dragstart="onDragStart"
-		v-draggable:move.noimage="draggable ? dragKalenderCollection : {}"
+		v-cal-dnd:draggable="event"
 		v-cal-click:event="isHeaderOrFooter ? event : event.orig"
-		@contextmenu.prevent="onRightClick"
 	>
-		<div
-			v-if="resizable"
-			class="fhc-resize-bar fhc-resize-bar--top"
-			@pointerdown.prevent.stop="onResizeStart('start', $event)"
-			@click.stop
-		>
-			<i class="fa-solid fa-grip-lines text-muted"></i>
-		</div>
 		<slot :event="isHeaderOrFooter ? event : event.orig">
 			{{ event.orig }}
 		</slot>
-		<div
-			v-if="resizable"
-			class="fhc-resize-bar fhc-resize-bar--bottom"
-			@pointerdown.prevent.stop="onResizeStart('end', $event)"
-			@click.stop
-		>
-			<i class="fa-solid fa-grip-lines text-muted"></i>
-		</div>
-
-	
-		<teleport to="body">
-			<div
-				v-if="contextMenu.show"
-				style="position:fixed; inset:0; z-index:9998"
-				@click="closeContextMenu"
-				@contextmenu.prevent="closeContextMenu"
-			/>
-			<ul
-				v-if="contextMenu.show"
-				class="dropdown-menu show"
-				:style="{ position: 'fixed', top: contextMenu.y + 'px', left: contextMenu.x + 'px', zIndex: 9999 }"
-			>
-				<li v-for="action in activeContextActions" :key="action.label">
-					<button class="dropdown-item" type="button" @click.stop="onContextAction(action.action)">
-						<i v-if="action.icon" :class="action.icon + ' me-2'"></i>
-						{{ action.label }}
-					</button>
-				</li>
-			</ul>
-		</teleport>
 	</div>
 	`
-}
+}

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

@@ -1,32 +0,0 @@
-import draggable from '../../../../../directives/draggable.js';
-
-export default {
-	name: 'EventCard',
-	directives: {
-		draggable,
-	},
-	props: {
-		event: { type: Object, required: true },
-		parked: Boolean
-	},
-	computed: {
-		dragKalenderCollection() {
-			return this.event
-		},
-	},
-	template: `
-	<div
-		class="fhc-calendar-base-grid-line-event event"
-		v-draggable:move.noimage="dragKalenderCollection"
-		style="border:1px"
-	>
-		<div class="title">
-			{{ event.orig.topic || event.orig.titel || event.orig.lehrfach }}
-		</div>
-		<div>
-			{{ event.orig.datum }} {{ event.orig.beginn }}–{{ event.orig.ende }}
-			<span v-if="event.ort_kurzbz">· {{ event.orig.ort_kurzbz }}</span>
-		</div>
-	</div>
-`
-};