phrasen dashboard

add editor.setContent to function getReplyData
readd loadReplyData and use v-show for visibleDiv for mode inSamePage

application/config/routes.php

@@ -63,7 +63,6 @@ $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/controllers/Cis/Auth.php

@@ -40,7 +40,7 @@ class Auth extends FHC_Controller
 
 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
+			redirect($this->authlib->getLandingPage('/Cis4'));
 		}
 		else
 		{

application/controllers/Cis/Benotungstool.php

@@ -1,51 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Benotungstool extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => self::PERM_LOGGED
-		]);
-
-		$this->_ci =& get_instance();
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-
-		
-		// 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/CisVue/Dashboard.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Dashboard extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'dashboard/benutzer:r'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-
-		$this->load->model('person/Person_model','PersonModel');
-		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
-
-		$viewData = array(
-			'uid' => getAuthUID(),
-			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
-
-	}
-}

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

@@ -41,9 +41,7 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'getLeEvents' => self::PERM_LOGGED,
-			'getLvEvents' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);
 
         $this->load->library('LogLib');
@@ -56,12 +54,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
-		$this->load->library('PhrasesLib');
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -153,38 +145,6 @@ 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

@@ -1,929 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-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/Studiensemester.php

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

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -40,11 +40,32 @@ class Board extends FHCAPI_Controller
 
 	public function list()
 	{
+		$this->DashboardModel->addSelect('dashboard_id');
+		$this->DashboardModel->addSelect('dashboard_kurzbz');
+		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
+		$this->DashboardModel->addSelect("(
+			SELECT json_agg(w.*) 
+			FROM dashboard.tbl_widget w 
+			JOIN dashboard.tbl_dashboard_widget dw 
+			USING(widget_id) 
+			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
+		) AS \"widgetSetup\"");
+
 		$result = $this->DashboardModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$data = array_map(function ($dashboard) {
+			$tmpSetups = json_decode($dashboard->widgetSetup);
+			$tmpSetups = array_map(function ($widget) {
+				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
+				return $widget;
+			}, $tmpSetups);
+			$dashboard->widgetSetup = $tmpSetups;
+			return $dashboard;
+		}, $data);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	public function create()
@@ -82,7 +103,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function delete()
@@ -116,6 +137,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 }

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -120,10 +120,7 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
+				$result[$funktion] = $preset;
 			} else {
 				$result[$funktion] = [];
 			}
@@ -154,7 +151,7 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
+		$preset_decoded[$widget['widgetid']] = $widget;
 
 		$preset->preset = json_encode($preset_decoded);
 
@@ -186,8 +183,10 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 
-		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		if (!isset($preset_decoded[$widgetid]))
 			show_404();
+		
+		unset($preset_decoded[$widgetid]);
 
 		$preset->preset = json_encode($preset_decoded);
 

application/controllers/api/frontend/v1/dashboard/User.php

@@ -48,25 +48,9 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;
 
-		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
 
-		$this->terminateWithSuccess([
-			'general' => call_user_func_array(
-				'array_merge_recursive',
-				$mergedconfig
-			)
-		]);*/
-		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
-		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
-
-		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
-		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
-
-		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
-
-		$this->terminateWithSuccess([
-			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
-		]);
+		$this->terminateWithSuccess($mergedconfig);
 	}
 
 	public function addWidget()
@@ -86,26 +70,15 @@ class User extends FHCAPI_Controller
 		if (!isset($widget['widgetid']))
 			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
 
+		if (isset($widget['source']))
+			unset($widget['source']);
+
 		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
+
 		$override_decoded = json_decode($override->override, true);
 
-		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
-			$override_decoded['general'] = [];
+		$override_decoded[$widget['widgetid']] = $widget;
 
-		 if (!isset($override_decoded['general']['widgets']))
-				$override_decoded['general']['widgets'] = [];
-
-		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
-
-		// NOTE(chris): remove doubles in other funktionen
-		foreach ($override_decoded as $funktion => $array) {
-			if ($funktion == 'general')
-				continue;
-			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
-				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
-		}
-		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -135,18 +108,10 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		foreach (array_keys($override_decoded) as $k) {
-			if (!isset($override_decoded[$k]["widgets"])) {
-				unset($override_decoded[$k]);
-				continue;
-			}
-			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
-				unset($override_decoded[$k]["widgets"][$widget_id]);
-			}
-			if (!$override_decoded[$k]["widgets"]) {
-				unset($override_decoded[$k]);
-			}
-		}
+		if (!isset($override_decoded[$widget_id]))
+			show_404();
+		
+		unset($override_decoded[$widget_id]);
 
 		$override->override = json_encode($override_decoded);
 				

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

@@ -1,86 +0,0 @@
-<?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,7 +15,6 @@ 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();
@@ -68,7 +67,7 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->checkPermission($lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, $lehrverband === true || $lehrverband === 'true');
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
 
 		if (isError($result))
 			$this->terminateWithError(getError($result));
@@ -76,71 +75,6 @@ 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))

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

@@ -134,14 +134,9 @@ class Lektor extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nullable_fields = array('semesterstunden', 'stundensatz', 'planstunden');
-
-		foreach ($nullable_fields as $nullable_field)
+		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
 		{
-			if (isset($formData[$nullable_field]) && (!is_numeric($formData[$nullable_field]) || $formData[$nullable_field] === ''))
-			{
-				$formData[$nullable_field] = null;
-			}
+			$formData['semesterstunden'] = null;
 		}
 
 		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
@@ -149,9 +144,6 @@ 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));
@@ -162,7 +154,7 @@ class Lektor extends FHCAPI_Controller
 	{
 		$value = str_replace(',', '.', $value);
 
-		if (!is_numeric($value) && $value !== "")
+		if (!is_numeric($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

@@ -1,84 +0,0 @@
-<?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,8 +27,7 @@ class Setup extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLETabs' => ['admin:r', 'assistenz:r'],
-			'getLVTabs' => ['admin:r', 'assistenz:r'],
+			'getTabs' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
@@ -42,10 +41,9 @@ 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 getLETabs()
+	public function getTabs()
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
@@ -62,11 +60,6 @@ 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'),
@@ -75,28 +68,6 @@ 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,25 +25,7 @@ class StgTree extends FHCAPI_Controller
 			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
 		}
 
-		$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]);
-		}
-
-
-
+		return $this->getStudiengang($method);
 		show_404();
 	}
 
@@ -82,27 +64,16 @@ class StgTree extends FHCAPI_Controller
 		$this->terminateWithSuccess($list);
 	}
 
-	protected function getStudiengang($studiengang_kz, $org_form = null)
+	protected function getStudiengang($studiengang_kz)
 	{
 		$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("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('semester');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
@@ -140,115 +111,6 @@ 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/messages/Messages.php

@@ -42,14 +42,22 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size, $page)
+	public function getMessages($id, $type_id, $size=null, $page=null)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		$offset = $size * ($page - 1);
-		$limit = $size;
+		if(!(is_null($size) && is_null($page)))
+		{
+			$offset = $size * ($page - 1);
+			$limit = $size;
+		}
+		else
+		{
+			$offset = null;
+			$limit = null;
+		}
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 

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

@@ -301,7 +301,6 @@ class Config extends FHCAPI_Controller
 
 	public function student()
 	{
-		$this->load->helper('hlp_document');
 		$result = [];
 		$config = $this->config->item('tabs');
 
@@ -377,9 +376,9 @@ class Config extends FHCAPI_Controller
 			'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()
+				'delete' => 'both', // Possible values: both|header|inline
+				'documents' => 'both', // Possible values: both|header|inline
+				'documentslist' => $this->gradesDocumentsList()
 			]
 		];
 
@@ -623,6 +622,188 @@ 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, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
 	{
 		$student_uid = $uid;
 		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
@@ -80,6 +80,13 @@ 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/helpers/hlp_document_helper.php

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

@@ -17,12 +17,7 @@ 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)
@@ -83,13 +78,10 @@ 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' => $old_uid));
+		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 
 		if (isError($lehreinheit_result)) return $lehreinheit_result;
 
@@ -97,47 +89,27 @@ 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;
 
-		if ($old_uid !== $new_uid)
+		//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)
 		{
-			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_uid, 'lehreinheit_id' => $lehreinheit_id));
+			$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));
 
 			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 (($semesterstunden_neu !== '' && $semesterstunden_alt !== '') && (($semesterstunden_neu > $semesterstunden_alt) || $neue_stunden_eingerechnet))
+		if (isset($new_data['semesterstunden']))
 		{
 			$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $lehreinheit->studiengang_kz));
 			if (isError($studiengang_result)) return $studiengang_result;
@@ -148,7 +120,7 @@ class LektorLib
 			if (isError($studiensemester_result)) return $studiensemester_result;
 			$studiensemester = getData($studiensemester_result)[0];
 
-			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($new_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
 
 			$echter_dv = false;
 
@@ -157,78 +129,83 @@ class LektorLib
 				$echter_dv = true;
 			}
 
-			$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
-			if (isError($stundengrenze_result)) return $stundengrenze_result;
+			$neue_stunden_eingerechnet = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
+			$alte_stunden_eingerechnet = $lehreinheit->bismelden;
 
-			$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)
+			if (($new_data['semesterstunden'] > $lehreinheit->semesterstunden) || $neue_stunden_eingerechnet)
 			{
+				$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);
-			}
 
-			$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')))
+				if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+					&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+					&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
 				{
-					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";
+					$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
 				}
 
-				$stunden_limit_result = $this->getStundenInstitut($new_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
+				$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
 
-				if (hasData($stunden_limit_result))
+				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)
 				{
-					$stunden_limit_array = getData($stunden_limit_result);
-					foreach ($stunden_limit_array as $stunden_limit)
+
+					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
 					{
-						$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
+						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";
+						}
 					}
 				}
 			}
 		}
 
-		$benutzer_result = $this->_ci->BenutzerModel->load(array($new_uid));
+		$benutzer_result = $this->_ci->BenutzerModel->load(array(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid));
 
 		if (isError($benutzer_result)) return $benutzer_result;
 
@@ -250,23 +227,12 @@ class LektorLib
 			'bismelden'
 		);
 
-		$nullable_fields = array('stundensatz', 'semesterstunden', 'planstunden');
-
 		$updateData = array();
 		foreach ($updatableFields as $field)
 		{
-			if (!array_key_exists($field, $new_data))
-			{
-				continue;
-			}
+			$value = isset($new_data[$field]) ? $new_data[$field] : null;
 
-			$value = $new_data[$field];
-
-			if (in_array($field, $nullable_fields))
-			{
-				$updateData[$field] = $value;
-			}
-			elseif ($value !== null)
+			if ($value !== null)
 			{
 				$updateData[$field] = $value;
 			}
@@ -274,24 +240,10 @@ 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' => $old_uid), $updateData);
+		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_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');
@@ -395,52 +347,4 @@ 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,21 +181,6 @@ 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/dashboard/DashboardLib.php

@@ -37,7 +37,9 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+		$result = $this->_ci->DashboardModel->loadWhere([
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
 
 		if (hasData($result))
 		{
@@ -47,17 +49,21 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedConfig($dashboard_id, $uid)
+	public function getMergedUserConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id);
-		$userconfig = $this->getUserConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
+		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
 		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+		$sourceconfig = array_map(function ($value) {
+			return ['source' => $value['source']];
+		}, $defaultconfig);
+		
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
 		
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id)
+	protected function getUserBaseConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -87,7 +93,11 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
+					$preset = array_map(function ($value) use ($presetobj) {
+						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+						return $value;
+					}, $preset);
+					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -95,7 +105,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	public function getUserConfig($dashboard_id, $uid)
+	protected function getUserOverrideConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -124,7 +134,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
+		$emptyoverride->override = '[]';
 		
 		return $emptyoverride;
 	}
@@ -143,8 +153,7 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
+		$emptypreset->preset = '[]';
 		
 		return $emptypreset;
 	}
@@ -209,44 +218,4 @@ class DashboardLib
 		
 		return $result;
 	}
-
-	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
-	{
-		foreach ($addwigets as $widget)
-		{
-			if(!isset($widget['widgetid']))
-			{
-				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
-			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
-		}
-	}
-	
-	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
-	{
-		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
-		{
-			$widgets[$section] = array();
-			$widgets[$section]["widgets"] = array();
-		}
-		
-		$widgets[$section]["widgets"][$widgetid] = $widget;
-	}
-	
-	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
-	{
-		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
-		{
-			unset($widgets[$section]["widgets"][$widgetid]);
-			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
-				unset($widgets[$section]);
-			}
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
 }

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,6 +3,7 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -22,6 +23,7 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
+	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -69,6 +71,11 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
+
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$vertragsbestandteil = new VertragsbestandteilLohnguide();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -127,6 +134,12 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
+					'VertragsbestandteilLohnguide_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
+				break;
+
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -10,6 +10,7 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -0,0 +1,155 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilLohnguide extends Vertragsbestandteil
+{
+	protected $stellenbezeichnung;
+	protected $vordienstzeit;
+	protected $fachrichtung_kurzbz;
+	protected $modellstelle_kurzbz;
+	protected $kommentar_person;
+	protected $kommentar_modellstelle;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+
+	public function getStellenbezeichnung()
+	{
+		return $this->stellenbezeichnung;
+	}
+
+	public function setStellenbezeichnung($stellenbezeichnung): self
+	{
+		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
+		$this->stellenbezeichnung = $stellenbezeichnung;
+		return $this;
+	}
+
+	public function getVordienstzeit()
+	{
+		return $this->vordienstzeit;
+	}
+
+	public function setVordienstzeit($vordienstzeit): self
+	{
+		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
+		$this->vordienstzeit = $vordienstzeit;
+		return $this;
+	}
+
+	public function getFachrichtung_kurzbz()
+	{
+		return $this->fachrichtung_kurzbz;
+	}
+
+	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
+	{
+		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
+		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
+		return $this;
+	}
+
+	public function getModellstelle_kurzbz()
+	{
+		return $this->modellstelle_kurzbz;
+	}
+
+	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
+	{
+		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
+		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
+		return $this;
+	}
+
+	public function getKommentar_person()
+	{
+		return $this->kommentar_person;
+	}
+
+	public function setKommentar_person($kommentar_person): self
+	{
+		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
+		$this->kommentar_person = $kommentar_person;
+		return $this;
+	}
+
+	public function getKommentar_modellstelle()
+	{
+		return $this->kommentar_modellstelle;
+	}
+
+	public function setKommentar_modellstelle($kommentar_modellstelle): self
+	{
+		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
+		$this->kommentar_modellstelle = $kommentar_modellstelle;
+		return $this;
+	}
+
+	
+	
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
+		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
+		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
+		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
+		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
+		$this->fromdb = false;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'vordienstzeit' => $this->getVordienstzeit(),
+			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
+			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
+			'kommentar_person' => $this->getKommentar_person(),
+			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	/* public function validate()
+	{
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		}
+		
+		return parent::validate();
+	} */
+}

application/models/dashboard/Dashboard_model.php

@@ -11,15 +11,4 @@ class Dashboard_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard';
 		$this->pk = 'dashboard_id';
 	}
-
-
-	/**
-	 * Get Dashboard by kurzbz.
-	 * @param string dashboard_kurzbz
-	 * @return array
-	 */
-	public function getDashboardByKurzbz($dashboard_kurzbz)
-	{
-		return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
-	}
 }

application/models/education/LePruefung_model.php

@@ -52,53 +52,4 @@ class LePruefung_model extends DB_Model
 			'student_uid' => $student_uid
 		]);
 	}
-
-	public function getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz) {
-		$qry = "SELECT 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,28 +314,6 @@ 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((string)$gruppen_array->semester))
+		if (!isEmptyString($gruppen_array->semester))
 		{
 			$this->db->where('semester', $gruppen_array->semester);
 		}
@@ -444,37 +444,30 @@ class Lehreinheitgruppe_model extends DB_Model
 										) 
 									ELSE tbl_gruppe.beschreibung
 								END AS beschreibung");
-		$this->addSelect("
-									CASE
-										WHEN trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')) = '' THEN
+		$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 
 										(
 											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, '')) = ''
+												FROM lehre.tbl_stundenplandev
+												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
 											)
 										)
-									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
-									");
-
+								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,9 +317,7 @@ class Lehrveranstaltung_model extends DB_Model
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
 			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
-			tbl_student.prestudent_id,
-			campus.vw_student_lehrveranstaltung.lehreinheit_id
-
+			tbl_student.prestudent_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -1056,26 +1054,6 @@ 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="
@@ -1267,7 +1245,7 @@ class Lehrveranstaltung_model extends DB_Model
 	{
 		return "
 		SELECT
-				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,
+				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,14 +29,10 @@ 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,8 +149,6 @@ 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
@@ -169,7 +167,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));
 	}
 
@@ -218,16 +216,13 @@ class Projektarbeit_model extends DB_Model
 	}
 
 	public function getProjektbetreuerAnrede($bperson_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= ?";
+		$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= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
 	}
-
+	
 	public function getProjektbetreuerEmail($projektarbeit_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -249,7 +244,7 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
-
+	
 	public function getProjektbetreuerEmailByPersonID($person_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -343,8 +338,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(
@@ -504,137 +499,20 @@ 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,5 +306,4 @@ 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, $lehrveranstaltung_id = null)
+	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz)
 	{
 		$params = array();
 		$where='';
@@ -163,11 +163,6 @@ 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='';
 
@@ -181,11 +176,6 @@ 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.*,
@@ -198,10 +188,7 @@ 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,
-			s.verband,
-			person.vorname,
-			person.nachname
+			lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english
 		FROM (
 			SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
 				   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
@@ -244,8 +231,6 @@ 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/Studiengang_model.php

@@ -594,7 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/organisation/Studienplan_model.php

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

application/models/person/Notiz_model.php

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

application/models/ressource/Reservierung_model.php

@@ -135,15 +135,4 @@ 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,68 +333,6 @@ 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_model.php

@@ -241,15 +241,4 @@ 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,40 +61,4 @@ 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/models/system/Message_model.php

@@ -242,6 +242,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
+		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
 		$sql = <<<EOSQL
 			with filtered_messages as (
 				select
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;
 
-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -0,0 +1,11 @@
+<?php
+
+class VertragsbestandteilLohnguide_model extends DB_Model
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
+		$this->pk = 'vertragsbestandteil_id';
+	}
+}

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

@@ -37,7 +37,8 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

application/views/CisRouterView/CisRouterView.php

@@ -11,7 +11,6 @@ $includesArray = array(
 	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
-		'vendor/vuejs/vuedatepicker_css/main.css',
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
@@ -33,17 +32,14 @@ $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'
+		'public/js/apps/Cis.js',
 	),
 
 );

application/views/LVVerwaltung.php

@@ -31,8 +31,6 @@
 		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/system/infocenter/infocenterData.php

@@ -315,15 +315,22 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
+				SELECT
 					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)
-				WHERE tbl_rueckstellung.datum_bis >= NOW()
-				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
+				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
+				)
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,15 +24,22 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
+				SELECT
 					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)
-				WHERE tbl_rueckstellung.datum_bis >= NOW()
-				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
+					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
+				)
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

application/views/templates/CISVUE-Footer.php

@@ -6,7 +6,7 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
+		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'

application/views/templates/CISVUE-Header.php

@@ -8,7 +8,7 @@ $includesArray = array(
 	'axios027' => true,
 	'primevue3' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
+		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',

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,17 +80,9 @@ 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[
@@ -139,78 +131,22 @@ echo '
 		}
 	}
 
-	function GebietStarten(bezeichnung, stunde, minute, sekunde, gebiet_id)
+	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
 	{
-		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>'
-			);
+		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;
 		}
-
-		$('#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()
 	{
-		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;
+		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
+		return true;
 	}
 
 	$(document).ready(function () {
@@ -711,7 +647,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=\"return letzteFrage()\"":"").">";
+	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
 	echo '
 		<div class="row text-center">
 			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">

cis/testtool/login.php

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

composer.json

@@ -70,6 +70,18 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "drag-drop-touch-js/dragdroptouch",
+				"version": "2.0.3",
+				"source": {
+					"url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -452,6 +464,8 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
+		"drag-drop-touch-js/dragdroptouch": "*",
+
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -804,6 +804,16 @@
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
+        {
+            "name": "drag-drop-touch-js/dragdroptouch",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
+                "reference": "master"
+            },
+            "type": "library"
+        },
         {
             "name": "easyrdf/easyrdf",
             "version": "0.9.1",

include/pruefling.class.php

@@ -584,32 +584,6 @@ 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,7 +17,6 @@ $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';
@@ -36,8 +35,6 @@ $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,7 +17,6 @@ $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';
@@ -36,8 +35,6 @@ $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,7 +407,6 @@ 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 {
@@ -857,25 +856,8 @@ 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/Lvverwaltung.css

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

public/css/components/dashboard.css

@@ -2,7 +2,7 @@
 @import './dashboard/news.css';
 @import './dashboard/LvPlan.css';
 
-:root{
+:root {
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
 	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
@@ -17,22 +17,16 @@
 	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
-@media(max-width: 577px) {
-	:root {
-		--fhc-dashboard-grid-size: 1;
-	}
-}
-
-.core-dashboard a{
+.core-dashboard a {
 	color: var(--fhc-dashboard-link);
 }
 
-@media (max-width: 576px){
+@media (max-width: 576px) {
 	.widget-icon {
 		max-height: 250px;
 		object-fit: cover;
 	}
-	.widget-icon-container{
+	.widget-icon-container {
 		max-width: 250px;
 		margin-left: auto;
 		margin-right: auto;
@@ -46,27 +40,36 @@
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: cover;
-	cursor:pointer;
+	cursor: pointer;
 }
 
-.dashboard-section > .newGridRow{
-	position:absolute;
-	width:20px;
-	height:20px;
-	padding:0;
-	bottom:0;
-	left:50%;
-	transform:translate(-50%, 50%);
+.dashboard-section.edit-active {
+	/**
+	 * replaces margin for extra row
+	 * 10% equals 0.1 of 100%
+	 * 1rem equals the padding of pb-3 that is overwritten here
+	 */
+	padding-bottom: calc(10% / var(--fhc-dashboard-grid-size) + 1rem) !important;
+}
+
+.dashboard-section > .newGridRow {
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	padding: 0;
+	bottom: 0;
+	left: 50%;
+	transform: translate(-50%, 50%);
 	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
-	color:white;
+	color: white;
 	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .empty-tile-hover:hover {
-		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
 
 .alert-danger .form-check-input:checked {
@@ -74,16 +77,6 @@
 	background-color: var(--fhc-dashboard-danger);
 }
 
-:root {
-	--fhc-dashboard-grid-size: 4;
-}
-
-@media(max-width: 1400px) {
-	:root {
-		--fhc-dashboard-grid-size: 4;
-	}
-}
-
 @media(max-width: 1200px) {
 	:root {
 		--fhc-dashboard-grid-size: 3;
@@ -105,6 +98,7 @@
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
+		--fhc-dg-item-py: .75rem;
 	}
 }
 
@@ -132,50 +126,64 @@
 	cursor: move !important;
 }
 
-.draggedItem {
+.drop-grid-item-resize > .dashboard-item,
+.drop-grid-item-move > .dashboard-item {
 	height: 100%;
 	width: 100%;
 	background-color: var(--fhc-dashboard-draggeditem-background);
 	position: relative;
 }
 
-.dashboard-item-overlay{
+.drop-grid-item-resize > .dashboard-item > *,
+.drop-grid-item-move > .dashboard-item > * {
+	display: none;
+}
+
+.drop-grid-item-sizechanged > .dashboard-item,
+.drop-grid-item-move > .dashboard-item {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
-.dashboard-item-overlay::before{
-	position:absolute;
-	content:"";
-	top:0.25rem;
-	left:0.25rem;
-	right:0.25rem;
-	bottom:0.25rem;
-	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
-	opacity: 0.5;
+.drop-grid-item-sizechanged > .dashboard-item::before,
+.drop-grid-item-move > .dashboard-item::before {
+	position: absolute;
+	content: "";
+	top: .25rem;
+	left: .25rem;
+	right: .25rem;
+	bottom: .25rem;
+	border: 4px dashed var(--fhc-dashboard-item-overly-border-color);
+	opacity: .5;
 }
 
-#deleteBookmark i{
+.drop-grid-item-oversized > .dashboard-item {
+	/* Bootstrap: border-danger */
+	--bs-border-opacity: 1;
+	border-color: rgba(var(--bs-danger-rgb), var(--bs-border-opacity)) !important;
+}
+
+#deleteBookmark i {
 	color: var(--fhc-dashboard-danger);
 }
 
-.pin:hover{
+.pin:hover {
 	cursor: pointer;
 }
 
-.pin[pinned]:hover{
+.pin[pinned]:hover {
 	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
-.section-info{
+.section-info {
 	color: var(--fhc-dashboard-section-info-color);
-	cursor:pointer;
+	cursor: pointer;
 }
 
 .section-info:hover {
 	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
-.denied-dragging-animation {
+.drop-grid-item-blocker [pinned='true'] {
 	animation: wiggle 0.5s linear;
 	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
@@ -204,13 +212,13 @@
 
 }
 
-.hiddenWidget{
+.hidden-widget {
 	background: var(--fhc-disabled-background);
 	opacity: 40%;
 }
 
-.hiddenWidget .card,
-.hiddenWidget .card-body,
-.hiddenWidget .card-body *{
+.hidden-widget .card,
+.hidden-widget .card-body,
+.hidden-widget .card-body * {
 	background: inherit !important;
 }

public/js/api/factory/lehre.js

@@ -35,19 +35,5 @@ 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/messages/messages.js

@@ -17,13 +17,16 @@
 
 export default {
 	getMessages(params) {
+		let url = 'api/frontend/v1/messages/messages/getMessages'
+				+ '/' + params.id
+				+ '/' + params.type;
+			if(params.size && params.page) {
+				url += '/' + params.size
+				+ '/' + params.page;
+			}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getMessages/'
-				+ params.id + '/'
-				+ params.type + '/'
-				+ params.size + '/'
-				+ params.page
+			url: url
 		};
 	},
 	getVorlagen(){

public/js/api/factory/noten.js

@@ -1,74 +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 {
-	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/studiensemester.js

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

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

@@ -16,20 +16,16 @@
  */
 
 export default {
-	getCourselist(student_uid,  start_date, end_date, stundenplan) {
+	getCourselist(params) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + encodeURIComponent(student_uid) + '/'
-				+ encodeURIComponent(start_date) + '/'
-				+ encodeURIComponent(end_date) + '/'
-				+ encodeURIComponent(stundenplan) + '/'
-				+ encodeURIComponent(true)
+			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + params.student_uid + '/'
+				+ params.start_date + '/'
+				+ params.end_date + '/'
+				+ params.group_consecutiveHours + '/'
+				+ params.dbStundenplanTable
 		};
 	},
-	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/lehrveranstaltung/config.js

@@ -1,15 +0,0 @@
-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,14 +18,6 @@ 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

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

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

@@ -1,25 +0,0 @@
-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,16 +1,9 @@
 export default {
-	getLETabs()
+	getTabs()
 	{
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/lv/setup/getLETabs/'
-		};
-	},
-	getLVTabs()
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/lv/setup/getLVTabs/'
+			url: '/api/frontend/v1/lv/setup/getTabs/'
 		};
 	},
 }

public/js/apps/Cis.js

@@ -1,156 +1,313 @@
-import FhcSearchbar from "../components/searchbar/searchbar.js";
-import CisMenu from "../components/Cis/Menu.js";
+import FhcDashboard from '../components/Dashboard/Dashboard.js';
 import PluginsPhrasen from '../plugins/Phrasen.js';
-import ApiSearchbar from '../api/factory/searchbar.js';
-import Theme from "../plugins/Theme.js";
+import Theme from '../plugins/Theme.js';
+import contrast from '../directives/contrast.js';
+import {setScrollbarWidth} from "../helpers/CssVarCalcHelpers.js";
+import LvPlan from "../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../components/Cis/LvPlan/Personal.js";
+import MylvStudent from "../components/Cis/Mylv/Student.js";
+import Profil from "../components/Cis/Profil/Profil.js";
+import Raumsuche from "../components/Cis/Raumsuche/Raumsuche.js";
+import CmsNews from "../components/Cis/Cms/News.js";
+import CmsContent from "../components/Cis/Cms/Content.js";
+import Info from "../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../components/Cis/Mylv/RoomInformation.js";
+import AbgabetoolStudent from "../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
+import DeadlineOverview from "../components/Cis/Abgabetool/DeadlineOverview.js";
+import Studium from "../components/Cis/Studium/Studium.js";
+
+import ApiRouteInfo from '../api/factory/routeinfo.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(`/${ciPath}`),
+	routes: [
+		{
+			path: `/Cis/Studium`,
+			name: 'Studium',
+			component: Studium,
+			props: true
+		},
+		{
+			path: `/Cis/Profil/View/:uid`,
+			name: 'ProfilView',
+			component: Profil,
+			props: true
+		},
+		{
+			path: `/Cis/Profil`,
+			name: 'Profil',
+			component: Profil,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
+			name: 'AbgabetoolStudent',
+			component: AbgabetoolStudent,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Mitarbeiter`,
+			name: 'AbgabetoolMitarbeiter',
+			component: AbgabetoolMitarbeiter,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Assistenz/:stg_kz_prop?`,
+			name: 'AbgabetoolAssistenz',
+			component: AbgabetoolAssistenz,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
+			name: 'DeadlineOverview',
+			component: DeadlineOverview,
+			props: true
+		},
+		{
+			path: `/Cis/Raumsuche`,
+			name: 'Raumsuche',
+			component: Raumsuche,
+			props: true
+		},
+		// Redirect old links to new format
+		{
+			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
+			name: "RoomInformationOld",
+			component: RoomInformation,
+			redirect: (to) => {
+				return { // redirect to longer Rauminfo url and map params
+					name: "RoomInformation",
+					params: { // in this case always populate other params since they are not optional
+						ort_kurzbz: to.params.ort_kurzbz,
+						mode: DEFAULT_MODE_RAUMINFO,
+						focus_date: new Date().toISOString().split("T")[0]
+					},
+				};
+			},
+		},
+		{
+			path: `/CisVue/Cms/getRoomInformation/:mode/:focus_date/:ort_kurzbz`,
+			name: 'RoomInformation',
+			component: RoomInformation,
+			props: (route) => { // validate and set mode/focus date if for some reason missing
+				const validModes = ["Month", "Week", "Day"];
+
+				// check mode string
+				const mode = route.params.mode &&
+				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
+					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
+					: DEFAULT_MODE_RAUMINFO;
+
+				// default to today date if not provided
+				const d = new Date(route.params.focus_date)
+				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
+
+				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
+				// existing viewData declaration written from codeigniter 3 into routerview tag
+				return {
+					propsViewData: {
+						mode,
+						focus_date,
+						ort_kurzbz: route.params.ort_kurzbz
+					}
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				//  missing mode or focus_date -> set defaults
+				if (!to.params.mode || !to.params.focus_date) {
+					next({
+						name: "RoomInformation",
+						params: {
+							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
+							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
+							ort_kurzbz: route.params.ort_kurzbz
+						}
+					});
+				} else {
+					next();
+				}
+			}
+		},
+		{
+			path: `/CisVue/Cms/Content/:content_id`,
+			name: 'Content',
+			component: CmsContent,
+			props: true
+		},
+		{
+			path: `/CisVue/Cms/News`,
+			name: 'News',
+			component: CmsNews,
+			props: true
+		},
+		{
+			path: `/Cis/MyLv/:studiensemester?`,
+			name: 'MyLv',
+			component: MylvStudent,
+			props: true,
+		},
+		{
+			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,
+			name: 'LvInfo',
+			component: Info,
+			props: true
+		},
+		// Redirect old links to new format
+		{
+			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
+			path: "/Cis/LvPlan/:lv_id(\\d+)", 
+			name: "LvPlanOld",
+			component: LvPlan,
+			redirect(to) {
+				const route = Vue.unref(router.currentRoute);
+				const { mode, focus_date } = route.params; // keep mode and focus_date if available
+				return { // redirect to longer LvPlan url and map params
+					name: "LvPlan",
+					params: {
+						mode,
+						focus_date,
+						lv_id: to.params.lv_id
+					},
+				};
+			},
+		},
+		{
+			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
+			name: 'LvPlan',
+			component: LvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
+			name: 'MyLvPlan',
+			component: MyLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis4`,
+			name: 'Cis4',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+		},
+		{
+			path: `/`,
+			name: 'FhcDashboard',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+		},
+		{
+			path: '/:pathMatch(.*)*',
+			name: 'Fallback',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+			redirect: () => {
+				return {
+					name: "Cis4",
+					params: {
+						dashboard: 'CIS'
+					},
+				};
+			},
+		},
+	]
+})
 
 const app = Vue.createApp({
-    name: 'CisApp',
-    components: {
-        FhcSearchbar,
-        CisMenu
-    },
-    data: function() {
-        return {
-            searchbaroptions: {
-				origin: "cis",
-				cssclass: "",
-				calcheightonly: true,
-				types: {
-					employee: Vue.computed(() => this.$p.t("search/type_employee")),
-					student: Vue.computed(() => this.$p.t("search/type_student")),
-					room: Vue.computed(() => this.$p.t("search/type_room")),
-					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
-					cms: Vue.computed(() => this.$p.t("search/type_cms")),
-					dms: Vue.computed(() => this.$p.t("search/type_dms"))
-				},
-                actions: {
-                    employee: {
-                        defaultaction: {
-                            type: "link",
-                            action: function(data) {
-									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-										"/Cis/Profil/View/"+data.uid;
-							}
-						},
-                        childactions: []
-					},
-					student: {
-						defaultaction: {
-							type: "link",
-							action: function (data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									"/Cis/Profil/View/" + data.uid;
+	name: 'CisApp',
+	data: () => ({
+		appSideMenuEntries: {}
+	}),
+	components: {},
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		}	
+	},
+	provide() {
+		return { // provide injectable & watchable language property
+			language: Vue.computed(() => this.$p.user_language),
+			isMobile: this.isMobile
+		}	
+	},
+	methods: {
+		isInternalRoute(href) {
+			const internalBase = window.location.origin
+			return href.startsWith(internalBase);
+		},
+		handleClick(event) {
+			const target = event.target.closest('a');
 
-							}
-						},
-						childactions: []
-					},
-                    room: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.content_id === null){
-									return false;
-								}
-								return true;
-							},
-                            action: function(data) { 
-								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
-								return link;
-                            }
-                        },
-                        childactions: [
-                            {
-                                label: "LV-Plan",
-                                icon: "fas fa-bookmark",
-                                type: "link",
-                                action: function(data) {
-									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/getRoomInformation/' + data.ort_kurzbz;
-									return link;
-                                }
-                            },
-                            {
-                                label: "Rauminformation",
-                                icon: "fas fa-info-circle",
-                                type: "link",
-                                renderif: function(data) {
-									if(data.content_id === null){
-										return false;
-									}
-									return true;
-                                },
-                                action: function(data) {
-									const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/content/' + data.content_id;
-									return link;
-                                }
-                            },
-                        ]
-                    },
-                    organisationunit: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.mailgroup) {
-									return true;
-								}
-								return false;
-							},
-                            action: function(data) {
-                                const link = 'mailto:' + data.mailgroup;
-								return link;
-                            }
-                        },
-                        childactions: []
-                    },
-					cms: {
-						defaultaction: {
-							type: "link",
-							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
-								return link;
-							}
-						},
-						childactions: []
-					},
-					dms: {
-						defaultaction: {
-							type: "link",
-							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									'cms/dms.php?id=' + data.dms_id;
-								return link;
-							}
-						},
-						childactions: []
-					}
-                }
-            }
-        };
-    },
-    methods: {
-        searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
-        }
-    }
+			if(target?.id == 'skiplink') return
+			if (target && this.isInternalRoute(target.href)) {
+				const url = new URL(target.href)
+				
+				const path = url.pathname
+				const base = this.$router.options.history.base
+				const route = path.replace(base, '') || '/'
+
+				// let click event propagate normally if we dont route internally
+				const res = this.$router.resolve(route)
+				if(!res?.matched?.length || res.name === 'Fallback') return
+				
+				event.preventDefault(); // Prevent browser navigation
+				
+				if(this.isMobile) { // toggle the menu
+					const navMain = document.getElementById('nav-main');
+					// fix unwanted toggle from off to on for some links on mobile
+					if(navMain.classList.contains('show')){
+						document.getElementById('nav-main-btn').click();
+					} 
+				}
+				
+				this.$router.push(route);
+				
+			}
+		}
+	},
+	mounted() {
+		document.addEventListener('click', this.handleClick);
+		
+	},
+	beforeUnmount() {
+		document.removeEventListener('click', this.handleClick);
+	},
 });
 
+// kind of a bandaid for bad css on some pages to avoid horizontal scroll
+setScrollbarWidth();
+app.config.globalProperties.$capitalize = capitalize;
+
+FhcApps.router.makeExtendable(router);
 FhcApps.makeExtendable(app);
 
+app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
 		tooltip: 8000
 	}
 })
+app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.use(Theme);
-app.mount('#cis-header');
+app.directive('contrast', contrast);
+app.mount('#fhccontent');
+
+router.afterEach((to, from, failure) => {
+	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
+});

public/js/apps/Cis/Menu.js

@@ -0,0 +1,156 @@
+import FhcSearchbar from "../../components/searchbar/searchbar.js";
+import CisMenu from "../../components/Cis/Menu.js";
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+import ApiSearchbar from '../../api/factory/searchbar.js';
+import Theme from "../../plugins/Theme.js";
+
+const app = Vue.createApp({
+    name: 'CisMenuApp',
+    components: {
+        FhcSearchbar,
+        CisMenu
+    },
+    data: function() {
+        return {
+            searchbaroptions: {
+				origin: "cis",
+				cssclass: "",
+				calcheightonly: true,
+				types: {
+					employee: Vue.computed(() => this.$p.t("search/type_employee")),
+					student: Vue.computed(() => this.$p.t("search/type_student")),
+					room: Vue.computed(() => this.$p.t("search/type_room")),
+					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					cms: Vue.computed(() => this.$p.t("search/type_cms")),
+					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+				},
+                actions: {
+                    employee: {
+                        defaultaction: {
+                            type: "link",
+                            action: function(data) {
+									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+										"/Cis/Profil/View/"+data.uid;
+							}
+						},
+                        childactions: []
+					},
+					student: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" + data.uid;
+
+							}
+						},
+						childactions: []
+					},
+                    room: {
+                        defaultaction: {
+                            type: "link",
+							renderif: function(data) {
+								if(data.content_id === null){
+									return false;
+								}
+								return true;
+							},
+                            action: function(data) { 
+								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									'/CisVue/Cms/content/' + data.content_id;
+								return link;
+                            }
+                        },
+                        childactions: [
+                            {
+                                label: "LV-Plan",
+                                icon: "fas fa-bookmark",
+                                type: "link",
+                                action: function(data) {
+									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/CisVue/Cms/getRoomInformation/' + data.ort_kurzbz;
+									return link;
+                                }
+                            },
+                            {
+                                label: "Rauminformation",
+                                icon: "fas fa-info-circle",
+                                type: "link",
+                                renderif: function(data) {
+									if(data.content_id === null){
+										return false;
+									}
+									return true;
+                                },
+                                action: function(data) {
+									const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/CisVue/Cms/content/' + data.content_id;
+									return link;
+                                }
+                            },
+                        ]
+                    },
+                    organisationunit: {
+                        defaultaction: {
+                            type: "link",
+							renderif: function(data) {
+								if(data.mailgroup) {
+									return true;
+								}
+								return false;
+							},
+                            action: function(data) {
+                                const link = 'mailto:' + data.mailgroup;
+								return link;
+                            }
+                        },
+                        childactions: []
+                    },
+					cms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									'/CisVue/Cms/content/' + data.content_id;
+								return link;
+							}
+						},
+						childactions: []
+					},
+					dms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									'cms/dms.php?id=' + data.dms_id;
+								return link;
+							}
+						},
+						childactions: []
+					}
+                }
+            }
+        };
+    },
+    methods: {
+        searchfunction: function(searchsettings) {
+        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
+        }
+    }
+});
+
+FhcApps.makeExtendable(app);
+
+app.use(primevue.config.default, {
+	zIndex: {
+		overlay: 9000,
+		tooltip: 8000
+	}
+})
+app.use(PluginsPhrasen);
+app.use(Theme);
+app.mount('#cis-header');

public/js/apps/Dashboard/Admin.js

@@ -3,13 +3,10 @@ import DashboardAdmin from '../../components/Dashboard/Admin.js';
 
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
-import ApiRenderers from '../../api/factory/renderers.js';
-
 const app = Vue.createApp({
 	name: 'DashboardAdminApp',
 	data: () => ({
-		appSideMenuEntries: {},
-		renderers: null
+		appSideMenuEntries: {}
 	}),
 	components: {
 		CoreNavigationCmpt,
@@ -17,49 +14,8 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return {
-			// TODO(chris): move those two into the components that need it
-			renderers: Vue.computed(() => this.renderers),
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
 		};
-	},
-	created() {
-		this.$api
-			.call(ApiRenderers.loadRenderers())
-			.then(res => {
-				for (let rendertype of Object.keys(res.data)) {
-					let modalTitle = null;
-					let modalContent = null;
-					let calendarEvent = null;
-					if (res.data[rendertype].modalTitle)
-						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
-					if (res.data[rendertype].modalContent) 	
-						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
-					if (res.data[rendertype].calendarEvent) 	
-						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
-
-					if (res.data[rendertype].calendarEventStyles) {
-						var head = document.head;
-						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = res.data[rendertype].calendarEventStyles;
-							head.appendChild(link);
-						}
-					}
-
-					if (this.renderers === null) {
-						this.renderers = {};
-					}
-					if (!this.renderers[rendertype]) {
-						this.renderers[rendertype] = {}
-					}
-					this.renderers[rendertype].modalTitle = modalTitle;
-					this.renderers[rendertype].modalContent = modalContent;
-					this.renderers[rendertype].calendarEvent = calendarEvent;
-				}
-			})
-			.catch(this.$fhcAlert.handleSystemErrors);
 	}
 });
 app.use(PluginsPhrasen);

public/js/apps/Dashboard/Fhc.js

@@ -1,363 +0,0 @@
-import FhcDashboard from '../../components/Dashboard/Dashboard.js';
-import PluginsPhrasen from '../../plugins/Phrasen.js';
-import Theme from '../../plugins/Theme.js';
-import contrast from '../../directives/contrast.js';
-import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
-import MylvStudent from "../../components/Cis/Mylv/Student.js";
-import Profil from "../../components/Cis/Profil/Profil.js";
-import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
-import CmsNews from "../../components/Cis/Cms/News.js";
-import CmsContent from "../../components/Cis/Cms/Content.js";
-import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
-import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
-import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
-import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
-import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
-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;
-
-const router = VueRouter.createRouter({
-	history: VueRouter.createWebHistory(`/${ciPath}`),
-	routes: [
-		{
-			path: `/Cis/Studium`,
-			name: 'Studium',
-			component: Studium,
-			props: true
-		},
-		{
-			path: `/Cis/Profil/View/:uid`,
-			name: 'ProfilView',
-			component: Profil,
-			props: true
-		},
-		{
-			path: `/Cis/Profil`,
-			name: 'Profil',
-			component: Profil,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
-			name: 'AbgabetoolStudent',
-			component: AbgabetoolStudent,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Mitarbeiter`,
-			name: 'AbgabetoolMitarbeiter',
-			component: AbgabetoolMitarbeiter,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Assistenz/:stg_kz_prop?`,
-			name: 'AbgabetoolAssistenz',
-			component: AbgabetoolAssistenz,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
-			name: 'DeadlineOverview',
-			component: DeadlineOverview,
-			props: true
-		},
-		{
-			path: `/Cis/Raumsuche`,
-			name: 'Raumsuche',
-			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",
-			name: "RoomInformationOld",
-			component: RoomInformation,
-			redirect: (to) => {
-				return { // redirect to longer Rauminfo url and map params
-					name: "RoomInformation",
-					params: { // in this case always populate other params since they are not optional
-						ort_kurzbz: to.params.ort_kurzbz,
-						mode: DEFAULT_MODE_RAUMINFO,
-						focus_date: new Date().toISOString().split("T")[0]
-					},
-				};
-			},
-		},
-		{
-			path: `/CisVue/Cms/getRoomInformation/:mode/:focus_date/:ort_kurzbz`,
-			name: 'RoomInformation',
-			component: RoomInformation,
-			props: (route) => { // validate and set mode/focus date if for some reason missing
-				const validModes = ["Month", "Week", "Day"];
-
-				// check mode string
-				const mode = route.params.mode &&
-				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
-					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-					: DEFAULT_MODE_RAUMINFO;
-
-				// default to today date if not provided
-				const d = new Date(route.params.focus_date)
-				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
-
-				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
-				// existing viewData declaration written from codeigniter 3 into routerview tag
-				return {
-					propsViewData: {
-						mode,
-						focus_date,
-						ort_kurzbz: route.params.ort_kurzbz
-					}
-				};
-			},
-			beforeEnter: (to, from, next) => {
-				//  missing mode or focus_date -> set defaults
-				if (!to.params.mode || !to.params.focus_date) {
-					next({
-						name: "RoomInformation",
-						params: {
-							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
-							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
-							ort_kurzbz: route.params.ort_kurzbz
-						}
-					});
-				} else {
-					next();
-				}
-			}
-		},
-		{
-			path: `/CisVue/Cms/Content/:content_id`,
-			name: 'Content',
-			component: CmsContent,
-			props: true
-		},
-		{
-			path: `/CisVue/Cms/News`,
-			name: 'News',
-			component: CmsNews,
-			props: true
-		},
-		{
-			path: `/Cis/MyLv/:studiensemester?`,
-			name: 'MyLv',
-			component: MylvStudent,
-			props: true,
-		},
-		{
-			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,
-			name: 'LvInfo',
-			component: Info,
-			props: true
-		},
-		// Redirect old links to new format
-		{
-			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
-			path: "/Cis/LvPlan/:lv_id(\\d+)", 
-			name: "LvPlanOld",
-			component: LvPlan,
-			redirect(to) {
-				const route = Vue.unref(router.currentRoute);
-				const { mode, focus_date } = route.params; // keep mode and focus_date if available
-				return { // redirect to longer LvPlan url and map params
-					name: "LvPlan",
-					params: {
-						mode,
-						focus_date,
-						lv_id: to.params.lv_id
-					},
-				};
-			},
-		},
-		{
-			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
-			name: 'LvPlan',
-			component: LvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
-		{
-			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
-			name: 'MyLvPlan',
-			component: MyLvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
-		{
-			path: `/Cis4`,
-			name: 'Cis4',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-		},
-		{
-			path: `/`,
-			name: 'FhcDashboard',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-		},
-		{
-			path: '/:pathMatch(.*)*',
-			name: 'Fallback',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-			redirect: () => {
-				return {
-					name: "Cis4",
-					params: {
-						dashboard: 'CIS'
-					},
-				};
-			},
-		},
-	]
-})
-
-const app = Vue.createApp({
-	name: 'FhcApp',
-	data: () => ({
-		appSideMenuEntries: {},
-		renderers: null,
-	}),
-	components: {},
-	computed: {
-		isMobile() {
-			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
-			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
-			return smallScreen;// && touchCapable;
-		}	
-	},
-	provide() {
-		return { // provide injectable & watchable language property
-			language: Vue.computed(() => this.$p.user_language),
-			renderers: Vue.computed(() => this.renderers),
-			isMobile: this.isMobile
-		}	
-	},
-	methods: {
-		isInternalRoute(href) {
-			const internalBase = window.location.origin
-			return href.startsWith(internalBase);
-		},
-		handleClick(event) {
-			const target = event.target.closest('a');
-
-			if(target?.id == 'skiplink') return
-			if (target && this.isInternalRoute(target.href)) {
-				const url = new URL(target.href)
-				
-				const path = url.pathname
-				const base = this.$router.options.history.base
-				const route = path.replace(base, '') || '/'
-
-				// let click event propagate normally if we dont route internally
-				const res = this.$router.resolve(route)
-				if(!res?.matched?.length || res.name === 'Fallback') return
-				
-				event.preventDefault(); // Prevent browser navigation
-				
-				if(this.isMobile) { // toggle the menu
-					const navMain = document.getElementById('nav-main');
-					// fix unwanted toggle from off to on for some links on mobile
-					if(navMain.classList.contains('show')){
-						document.getElementById('nav-main-btn').click();
-					} 
-				}
-				
-				this.$router.push(route);
-				
-			}
-		}
-	},
-	async created(){
-		
-		await this.$api
-			.call(ApiRenderers.loadRenderers())
-			.then(res => res.data)
-			.then(data => {
-				for (let rendertype of Object.keys(data)) {
-					let modalTitle = null;
-					let modalContent = null;
-					let calendarEvent = null;
-					if (data[rendertype].modalTitle)
-						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
-					if (data[rendertype].modalContent) 	
-						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
-					if (data[rendertype].calendarEvent) 	
-						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
-
-					if (data[rendertype].calendarEventStyles){
-						var head = document.head;
-						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = data[rendertype].calendarEventStyles;
-							head.appendChild(link);
-						}
-					}
-
-					if(this.renderers === null) {
-						this.renderers = {};
-					}
-					if (!this.renderers[rendertype]) {
-						this.renderers[rendertype] = {}
-					}
-					this.renderers[rendertype].modalTitle = modalTitle;
-					this.renderers[rendertype].modalContent = modalContent;
-					this.renderers[rendertype].calendarEvent = calendarEvent;
-				}
-			});
-	},
-	mounted() {
-		document.addEventListener('click', this.handleClick);
-		
-	},
-	beforeUnmount() {
-		document.removeEventListener('click', this.handleClick);
-	},
-});
-
-// kind of a bandaid for bad css on some pages to avoid horizontal scroll
-setScrollbarWidth();
-app.config.globalProperties.$capitalize = capitalize;
-
-FhcApps.router.makeExtendable(router);
-FhcApps.makeExtendable(app);
-
-app.use(router);
-app.use(primevue.config.default, {
-	zIndex: {
-		overlay: 9000,
-		tooltip: 8000
-	}
-})
-app.directive('tooltip', primevue.tooltip);
-app.use(PluginsPhrasen);
-app.use(Theme);
-app.directive('contrast', contrast);
-app.mount('#fhccontent');
-
-router.afterEach((to, from, failure) => {
-	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
-});

public/js/apps/DashboardAdmin_DEPR.js

@@ -1,16 +0,0 @@
-import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
-import DashboardAdmin from '../components/Dashboard/Admin.js';
-import Phrases from "../plugin/Phrasen.js"
-
-Vue.createApp({
-  name: 'DashboardAdminApp',
-  data: () => ({
-      appSideMenuEntries: {}
-    }),
-  components: {
-    CoreNavigationCmpt,
-    DashboardAdmin
-  },
-  mounted() {
-  }
-}).use(Phrases).mount('#main');

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

@@ -20,7 +20,8 @@ export default {
 	},
 	inject: {
 		mode: "mode",
-		dropableEvents: "dropableEvents"
+		dropableEvents: "dropableEvents",
+		timezone: "timezone"
 	},
 	props: {
 		events: Array,

public/js/components/Calendar/LvPlan.js

@@ -3,6 +3,7 @@ import FhcCalendar from "./Base.js";
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeDay from './Mode/Day.js';
 import ModeWeek from './Mode/Week.js';
@@ -13,14 +14,7 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
-		timezone: {
-			type: String,
-			required: true
-		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
 			default: luxon.DateTime.local()
@@ -41,6 +35,7 @@ export default {
 	],
 	data() {
 		return {
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 			modes: {
 				day: Vue.markRaw(ModeDay),
 				week: Vue.markRaw(ModeWeek),
@@ -99,10 +94,13 @@ export default {
 			context.emit('update:lv', newValue);
 		});
 
+		const { renderers } = useRenderers();
+
 		return {
 			rangeInterval,
 			events,
-			lv
+			lv,
+			renderers
 		};
 	},
 	created() {

public/js/components/Calendar/Widget.js

@@ -1,6 +1,7 @@
 import FhcCalendar from "./Base.js";
 
 import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeList from '../Calendar/Mode/List.js';
 
@@ -9,22 +10,17 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
-		timezone: {
-			type: String,
-			required: true
-		},
 		getPromiseFunc: {
 			type: Function,
 			required: true
 		}
 	},
 	data() {
+		const timezone = FHC_JS_DATA_STORAGE_OBJECT.timezone;
 		return {
-			now: luxon.DateTime.now().setZone(this.timezone),
+			timezone,
+			now: luxon.DateTime.now().setZone(timezone),
 			modes: {
 				list: Vue.markRaw(ModeList)
 			},
@@ -59,10 +55,12 @@ export default {
 		const rangeInterval = Vue.ref(null);
 		
 		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { renderers } = useRenderers();
 
 		return {
 			rangeInterval,
-			events
+			events,
+			renderers
 		};
 	},
 	template: /* html */`

public/js/components/Cis/LvPlan/Lehrveranstaltung.js

@@ -22,7 +22,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -95,7 +95,6 @@ export default {
 		<fhc-calendar
 			v-else-if="lv"
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/LvPlan.js

@@ -15,7 +15,6 @@ export default {
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
@@ -26,7 +25,7 @@ export default {
 	},
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
@@ -35,7 +34,7 @@ export default {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -115,7 +114,6 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/Personal.js

@@ -27,7 +27,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -47,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -124,7 +124,6 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/Mylv/RoomInformation.js

@@ -15,7 +15,7 @@ export default {
 	},
 	computed: {
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
@@ -51,7 +51,6 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Dashboard/Admin.js

@@ -4,7 +4,6 @@ import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
 import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
-import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
 	name: 'DashboardAdmin',
@@ -16,7 +15,7 @@ export default {
 	provide() {
 		return {
 			adminMode: true,
-			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
+			widgetsSetup: Vue.computed(() => this.dashboard ? this.dashboard.widgetSetup : null)
 		};
 	},
 	data() {
@@ -34,33 +33,32 @@ export default {
 	methods: {
 		dashboardAdd() {
 			let _name = '';
-			BsPrompt.popup('New Dashboard name').then(
-				name => {
-					_name = name;
+			BsPrompt
+				.popup('New Dashboard name')
+				.then(dashboard_kurzbz => {
 					const params = {
-						dashboard_kurzbz: name
+						dashboard_kurzbz
 					};
 					return this.$api
 						.call(ApiDashboardBoard.add(params))
-						.then(response =>{
+						.then(response => {
 							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 							let newDashboard = {
 								dashboard_id: response.data,
-								dashboard_kurzbz: _name,
+								dashboard_kurzbz,
 								beschreibung: ''
 							};
 							this.dashboards.push(newDashboard);
 							this.current = newDashboard.dashboard_id;
 						})
 						.catch(this.$fhcAlert.handleSystemError);
-					});
+				});
 		},
 		dashboardUpdate(dashboard) {
-			return this.$api
+			this.$api
 				.call(ApiDashboardBoard.update(dashboard))
-				.then(response =>{
-
+				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
@@ -70,73 +68,122 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			return this.$api
+			this.$api
 				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
 					this.current = -1;
 					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
-			/*while (this.widgets.length)
-				this.widgets.pop();
-			for (var i in widgets)
-				this.widgets.push(widgets[i]);*/
 		}
 	},
 	created() {
 		this.$api
 			.call(ApiDashboardBoard.list())
 			.then(result => {
-				this.dashboards = result.data.retval;
-				for (const dashboard of this.dashboards) {
-					this.$api
-						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
-						.then(res => {
-							dashboard.widgetSetup = res.data;
-						})
-						.catch(this.$fhcAlert.handleSystemError);
-				}
+				this.dashboards = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `<div class="dashboard-admin">
-
+	template: /* html */`
+	<div class="dashboard-admin">
 		<div class="input-group">
-			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
-			<select id="dashboard-select" class="form-select" v-model="current">
-				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
+			<label for="dashboard-select" class="input-group-text">
+				Dashboard:
+			</label>
+			<select id="dashboard-select" v-model="current" class="form-select">
+				<option
+					v-for="dashboard in dashboards"
+					:key="dashboard.dashboard_id"
+					:value="dashboard.dashboard_id"
+				>{{ dashboard.dashboard_kurzbz }}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
+			<button
+				class="btn btn-outline-secondary"
+				type="button"
+				@click="dashboardAdd"
+			><i class="fa-solid fa-plus"></i></button>
 		</div>
 
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
+					<button
+						id="edit-tab"
+						class="nav-link"
+						data-bs-toggle="tab"
+						data-bs-target="#edit"
+						type="button"
+						role="tab"
+						aria-controls="edit"
+						aria-selected="false"
+					>{{ this.$p.t('ui', 'bearbeiten') }}</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
+					<button
+						id="widgets-tab"
+						class="nav-link active"
+						data-bs-toggle="tab"
+						data-bs-target="#widgets"
+						type="button"
+						role="tab"
+						aria-controls="widgets"
+						aria-selected="true"
+					>Widgets</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="presets-tab" data-bs-toggle="tab" data-bs-target="#presets" type="button" role="tab" aria-controls="presets" aria-selected="false">Presets</button>
+					<button
+						class="nav-link"
+						id="presets-tab"
+						data-bs-toggle="tab"
+						data-bs-target="#presets"
+						type="button"
+						role="tab"
+						aria-controls="presets"
+						aria-selected="false"
+					>Presets</button>
 				</li>
 			</ul>
 			<div class="tab-content pt-3">
-				<div class="tab-pane fade" id="edit" role="tabpanel" aria-labelledby="edit-tab">
-					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
+				<div
+					id="edit"
+					class="tab-pane fade"
+					role="tabpanel"
+					aria-labelledby="edit-tab"
+				>
+					<dashboard-admin-edit
+						v-bind="dashboard"
+						@change="dashboardUpdate($event)"
+						@delete="dashboardDelete($event)"
+					></dashboard-admin-edit>
 				</div>
-				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
-					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+				<div
+					id="widgets"
+					class="tab-pane fade show active"
+					role="tabpanel"
+					aria-labelledby="widgets-tab"
+				>
+					<dashboard-admin-widgets
+						:dashboard_id="dashboard.dashboard_id"
+						:widgets="widgets"
+						@assign-widgets="assignWidgets"
+					></dashboard-admin-widgets>
 				</div>
-				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
-					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>
+				<div
+					id="presets"
+					class="tab-pane fade"
+					role="tabpanel"
+					aria-labelledby="presets-tab"
+				>
+					<dashboard-admin-presets
+						:dashboard="dashboard.dashboard_kurzbz"
+						:widgets="widgets"
+					></dashboard-admin-presets>
 				</div>
 			</div>
 		</div>

public/js/components/Dashboard/Admin/Edit.js

@@ -1,15 +1,15 @@
 import BsConfirm from '../../Bootstrap/Confirm.js';
 
 export default {
-	emits: [
-		"change",
-		"delete"
-	],
 	props: {
 		dashboard_id: Number,
 		dashboard_kurzbz: String,
 		beschreibung: String
 	},
+	emits: [
+		"change",
+		"delete"
+	],
 	data() {
 		return {
 			kurzbz: this.dashboard_kurzbz,
@@ -18,22 +18,43 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
-				.then(() => this.$emit('delete', this.dashboard_id)).catch();
+			BsConfirm
+				.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id))
+				.catch();
 		}
 	},
-	template: `<div class="dashboard-admin-edit px-3">
+	template: /* html */`
+	<div class="dashboard-admin-edit px-3">
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-kurzbz">Kurz Bezeichnung</label>
-			<input id="dashboard-admin-edit-kurzbz" type="text" class="form-control" v-model="kurzbz">
+			<label for="dashboard-admin-edit-kurzbz">{{ $p.t('dashboard/kurzbz') }}</label>
+			<input
+				id="dashboard-admin-edit-kurzbz"
+				v-model="kurzbz"
+				type="text"
+				class="form-control"
+			>
 		</div>
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-beschreibung">Beschreibung</label>
-			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
+			<label for="dashboard-admin-edit-beschreibung">{{ $p.t('global/beschreibung') }}</label>
+			<textarea
+				id="dashboard-admin-edit-beschreibung"
+				v-model="desc"
+				class="form-control"
+			></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
-			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
+			<button class="btn btn-danger" @click="sendDelete">
+				{{ this.$p.t('ui', 'loeschen') }}
+			</button>
+			<button
+				class="btn btn-primary"
+				@click="$emit('change', {
+					dashboard_id,
+					dashboard_kurzbz: kurzbz,
+					beschreibung: desc
+				})"
+			>{{ this.$p.t('ui', 'btnAktualisieren') }}</button>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Admin/Presets.js

@@ -12,18 +12,27 @@ export default {
 		dashboard: String,
 		widgets: Array
 	},
-	data: () => ({
-		funktionen: {},
-		sections: [],
-		tmpLoading: ''
-	}),
+	data() {
+		return {
+			funktionen: {},
+			sections: [],
+			selectedFunktionen: [],
+			abortController: null
+		};
+	},
 	computed: {
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
 	},
+	watch: {
+		dashboard() {
+			this.loadSections();
+			this.loadFunktionen();
+		}
+	},
 	methods: {
-		widgetAdd(section_name, widget) {
+		widgetAdd(widget, section_name) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
 				widget.id = 'loading_' + String((new Date()).valueOf());
@@ -64,22 +73,26 @@ export default {
 			})
 			.catch(() => {});
 		},
-		widgetUpdate(section_name, payload) {
-			payload = payload[section_name];
+		widgetUpdate(payload, section_name) {
 			for (var k in payload) {
 				const section = this.sections.find(section => section.name == section_name);
 				for (var wid in section.widgets) {
 					if (section.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'custom'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
+				if (payload[k].place) {
+					Object.values(payload[k].place).forEach(place => {
+						if (place.pinned === false)
+							delete place.pinned;
+					});
+				}
 				payload[k].widgetid = k;
-				delete payload[k].custom;
 			}
 			this.$api
 				.call(Object.entries(payload).map(([key, widget]) => [
@@ -106,7 +119,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(section_name, id) {
+		widgetRemove(id, section_name) {
 			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
@@ -122,21 +135,22 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadSections(evt) {
-			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
-			this.sections = [];
-			this.tmpLoading = funktionen.join('###');
-
+		loadSections() {
 			const params = {
 				db: this.dashboard,
-				funktionen
+				funktionen: this.selectedFunktionen
 			};
 
+			if (this.abortController)
+				this.abortController.abort();
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.sections = [];
+			
 			return this.$api
-				.call(ApiDashboardPreset.getBatch(params))
+				.call(ApiDashboardPreset.getBatch(params), { signal })
 				.then(result => {
-					if (this.tmpLoading !== funktionen.join('###'))
-						return; // NOTE(chris): prevent race condition
 					for (var section in result.data) {
 						let widgets = [];
 						for (var wid in result.data[section]) {
@@ -151,7 +165,6 @@ export default {
 					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-
 		},
 		loadFunktionen() {
 			this.$api
@@ -165,17 +178,17 @@ export default {
 	created() {
 		this.loadFunktionen();
 	},
-	watch: {
-		dashboard() {
-			// TODO(chris): this should be done without a watcher
-			this.loadSections({target:this.$refs.funktionenList});
-			this.loadFunktionen();
-		}
-	},
-	template: `<div class="dashboard-admin-presets">
+	template: /* html */`
+	<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
-				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
+				<select
+					v-model="selectedFunktionen"
+					class="form-control"
+					style="height:30em"
+					multiple
+					@change="loadSections"
+				>
 					<option
 						v-for="funktion in funktionen"
 						:key="funktion.funktion_kurzbz"
@@ -185,9 +198,20 @@ export default {
 				</select>
 			</div>
 			<div class="col-9">
-				<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
+				<dashboard-section
+					v-for="section in sections"
+					:key="section.name"
+					:name="section.name"
+					:widgets="section.widgets"
+					@widget-add="widgetAdd"
+					@widget-update="widgetUpdate"
+					@widget-remove="widgetRemove"
+				></dashboard-section>
 			</div>
 		</div>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="pickerWidgets"></dashboard-widget-picker>
+		<dashboard-widget-picker
+			ref="widgetpicker"
+			:widgets="pickerWidgets"
+		></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Admin/Widgets.js

@@ -1,14 +1,14 @@
 import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
 
 export default {
-	emits: [
-		"change",
-		"assignWidgets"
-	],
 	props: {
 		dashboard_id: Number,
 		widgets: Array
 	},
+	emits: [
+		"change",
+		"assignWidgets"
+	],
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
@@ -29,11 +29,27 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="dashboard-admin-widgets">
-		<div v-for="widget in widgets" :key="widget.widget_id" class="form-check form-switch">
-			<input class="form-check-input" type="checkbox" role="switch" :id="'dashboard-admin-widgets-' + widget.widget_id" v-model="widget.allowed" @input.prevent="sendChange(widget.widget_id)">
-			<label class="form-check-label" :for="'dashboard-admin-widgets-' + widget.widget_id">{{(widget.setup && widget.setup.name) || widget.widget_kurzbz}}</label>
+		<div
+			v-for="widget in widgets"
+			:key="widget.widget_id"
+			class="form-check form-switch"
+		>
+			<input
+				:id="'dashboard-admin-widgets-' + widget.widget_id"
+				v-model="widget.allowed"
+				class="form-check-input"
+				type="checkbox"
+				role="switch"
+				@input.prevent="sendChange(widget.widget_id)"
+			>
+			<label
+				class="form-check-label"
+				:for="'dashboard-admin-widgets-' + widget.widget_id"
+			>
+				{{ (widget.setup && widget.setup.name) || widget.widget_kurzbz }}
+			</label>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Dashboard.js

@@ -21,7 +21,7 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name && value.timezone
+				return value && value.name
 			}
 		}
 	},
@@ -35,14 +35,12 @@ export default {
 	},
 	provide() {
 		return {
-			editMode: Vue.computed(()=>this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgetsSetup),
-			timezone: Vue.computed(() => this.viewData.timezone)
+			editMode: Vue.computed(() => this.editMode),
+			widgetsSetup: Vue.computed(() => this.widgetsSetup)
 		}
 	},
 	methods: {
-		widgetAdd(section_name, widget) {
-			// TODO(chris): remove section_name? (change order of params => get rid of it)
+		widgetAdd(widget) {
 			this.$refs.widgetpicker
 				.getWidget()
 				.then(widget_id => {
@@ -64,19 +62,24 @@ export default {
 				})
 				.catch(() => {});
 		},
-		widgetUpdate(section_name, payload) {
-			payload = payload[section_name];
+		widgetUpdate(payload) {
 			for (var k in payload) {
 				for (var wid in this.widgets) {
 					if (this.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'preset'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
+				if (payload[k].place) {
+					Object.values(payload[k].place).forEach(place => {
+						if (place.pinned === false)
+							delete place.pinned;
+					});
+				}
 				payload[k].widgetid = k;
 			}
 			this.$api
@@ -113,7 +116,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(section_name, id) {
+		widgetRemove(id) {
 			this.$api
 				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
 				.then(() => {
@@ -138,8 +141,8 @@ export default {
 				const widgets = [];
 				const remove = [];
 
-				for (var wid in res.data.general.widgets) {
-					let widget = res.data.general.widgets[wid];
+				for (var wid in res.data) {
+					let widget = res.data[wid];
 					widget.id = wid;
 					if (widget.custom || widget.preset) {
 						widgets.push(widget);
@@ -149,19 +152,33 @@ export default {
 					}
 				}
 
-				remove.forEach(wid => this.widgetRemove('general', wid));
+				remove.forEach(wid => this.widgetRemove(wid));
 
 				this.widgets = widgets;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="core-dashboard">
 		<h3>
 			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
-			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
+			<button
+				class="btn ms-2"
+				aria-label="edit dashboard"
+				v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/edit') }"
+				@click="editMode = !editMode"
+			><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
+		<dashboard-section
+			name="general"
+			:widgets="widgets"
+			@widget-add="widgetAdd"
+			@widget-update="widgetUpdate"
+			@widget-remove="widgetRemove"
+		></dashboard-section>
+		<dashboard-widget-picker
+			ref="widgetpicker"
+			:widgets="widgetsSetup"
+		></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Item.js

@@ -1,7 +1,13 @@
 import BsModal from "../Bootstrap/Modal.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
+import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
+
+if (!document.dragDropTouchActive) {
+	enableDragDropTouch();
+	document.dragDropTouchActive = true;
+}
+
 export default {
 	name: 'Item',
 	components: {
@@ -11,18 +17,14 @@ export default {
 	data: () => ({
 		component: "",
 		arguments: null,
-		target: false,
-		widget: null,
 		tmpConfig: {},
 		isLoading: false,
 		hasConfig: false,
-		sharedData: null,
+		sharedData: null
 	}),
 	emits: [
 		"change",
 		"remove",
-		"dragstart",
-		"resizestart",
 		"configOpened",
 		"configClosed",
 		"pinItem",
@@ -30,41 +32,85 @@ export default {
 	],
 	props: [
 		"id",
-		"widgetID",
 		"config",
 		"width",
 		"height",
 		"custom",
 		"hidden",
 		"editMode",
-		"loading",
+		"loading", // widget got added and is waiting for backend to save in db
 		"item_data",
 		"place",
-		"setup",
-		"dragstate",
-		"resizeOverlay",
-		"additionalRow"
+		"widgetTemplate",
+		"source"
 	],
 	computed: {
-		maxHeight(){
-			return this.setup?.height?.max;
-		},
-		maxWidth(){
-			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]"){
-				return this.setup?.width;
+		sourceInfoTooltip() {
+			switch (this.source) {
+				case null:
+					return '';
+				case 'general':
+					return this.$p.t('dashboard', 'widgetFromGeneralSection');
+				case 'custom':
+					return this.$p.t('dashboard', 'widgetFromCustomSection');
+				default:
+					return this.$p.t('dashboard', 'widgetFromFunktionSection', [this.source]);
 			}
-			return this.setup?.width?.max;
 		},
-		minHeight() {
-			return this.setup?.height?.min;
+		isResizeableHorizontal() {
+			if (this.widgetTemplate.setup.width === undefined)
+				return true;
+
+			if (Object.prototype.toString.call(this.widgetTemplate.setup.width) == "[object Number]")
+				return false;
+
+			if (this.widgetTemplate.setup.width.min === undefined) {
+				if (this.widgetTemplate.setup.width.max === undefined)
+					return true;
+				return this.widgetTemplate.setup.width.max > 1;
+			}
+
+			if (this.widgetTemplate.setup.width.max === undefined)
+				return true;
+
+			return this.widgetTemplate.setup.width.max > this.widgetTemplate.setup.width.min;
 		},
-		minWidth() {
-			return this.setup?.width?.min;
+		isResizeableVertical() {
+			if (this.widgetTemplate.setup.height === undefined)
+				return true;
+
+			if (Object.prototype.toString.call(this.widgetTemplate.setup.height) == "[object Number]")
+				return false;
+
+			if (this.widgetTemplate.setup.height.min === undefined) {
+				if (this.widgetTemplate.setup.height.max === undefined)
+					return true;
+				return this.widgetTemplate.setup.height.max > 1;
+			}
+
+			if (this.widgetTemplate.setup.height.max === undefined)
+				return true;
+
+			return this.widgetTemplate.setup.height.max > this.widgetTemplate.setup.height.min;
 		},
-		isResizeable(){
-			return this.maxWidth >1 || this.maxHeight >1;
+		isResizeable() {
+			return this.isResizeableVertical || this.isResizeableHorizontal;
 		},
-		isPinned(){
+		resizeClasses() {
+			const classes = {
+				icon: 'fa-up-right-and-down-left-from-center mirror-x',
+				button: 'cursor-nw-resize'
+			};
+			if (!this.isResizeableHorizontal) {
+				classes.icon = 'fa-up-down pe-2';
+				classes.button = 'cursor-ns-resize';
+			} else if (!this.isResizeableVertical) {
+				classes.icon = 'fa-left-right pe-2';
+				classes.button = 'cursor-ew-resize';
+			}
+			return classes;
+		},
+		isPinned() {
 			return this.place?.pinned ? true : false;
 		},
 		ready() {
@@ -80,16 +126,16 @@ export default {
 		}
 	},
 	methods: {
-		unpin(){
+		unpin() {
 			// Unpinning is only possible in edit mode
-			if(!this.editMode)
+			if (!this.editMode)
 				return;
-			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			let result = { item: this.item_data, pinned: false };
 			this.$emit('unPinItem', [result]);
 		},
-		pinItem(){
-			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y};
-			this.$emit('pinItem',[result]);
+		pinItem() {
+			let result = { item: this.item_data, pinned: true };
+			this.$emit('pinItem', [result]);
 		},
 		getWidgetC4Link(widget) {
 			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -101,22 +147,6 @@ export default {
 		handleHideBsModal() {
 			this.$emit('configClosed')
 		},
-		mouseDown(e) {
-			this.target = e.target;
-		},
-		startDrag(e) {
-			if (this.$refs.dragHandle.contains(this.target)) {
-				this.$emit("dragstart", e);
-			} else if (
-				this.isResizeable &&
-				this.$refs.resizeHandle.contains(this.target)
-			) {
-				if (this.isResizeable) this.$emit("resizestart", e);
-				else e.preventDefault();
-			} else {
-				e.preventDefault();
-			}
-		},
 		openConfig() {
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config.show();
@@ -135,110 +165,240 @@ export default {
 		},
 		sendChangeConfig(config) {
 			for (var k in config) {
-				if (this.widget.arguments[k] == config[k]) {
-				delete config[k];
+				if (this.widgetTemplate.arguments[k] == config[k]) {
+					delete config[k];
 				}
 			}
 			this.$emit("change", config);
 		},
+		async initializeComponent() {
+			if (
+				this.widgetTemplate
+				&& this.widgetTemplate.setup
+				&& this.widgetTemplate.widget_id
+				&& this.widgetTemplate.arguments
+			) {
+				let component = (await import(this.widgetTemplate.setup.file)).default;
+				this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
+				this.component = "widget" + this.widgetTemplate.widget_id;
+				this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
+				this.tmpConfig = { ...this.arguments };
+			}
+		}
 	},
 	watch: {
 		config() {
-			this.arguments = { ...this.widget?.arguments, ...this.config };
+			this.arguments = { ...this.widgetTemplate?.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
 		},
+		widgetTemplate() {
+			this.initializeComponent();
+		}
 	},
-	setup() {
-		const { actions } = useCachedWidgetLoader();
-		return {
-			loadWidget: actions.load
-		};
-	},
-	async created() {
-		this.widget = await this.loadWidget(this.id);
-		let component = (await import(this.widget.setup.file)).default;
-		this.$options.components["widget" + this.widget.widget_id] = component;
-		this.component = "widget" + this.widget.widget_id;
-		this.arguments = { ...this.widget.arguments, ...this.config };
-		this.tmpConfig = { ...this.arguments };
+	created() {
+		this.initializeComponent();
 	},
 	template: /*html*/ `
-	<div v-if="loading">
-		<div class="d-flex justify-content-center align-items-center h-100">
+	<article
+		v-if="!hidden || editMode"
+		class="dashboard-item card overflow-hidden h-100 position-relative"
+		:class="{
+			'hidden-widget': hidden,
+			[arguments?.className]: arguments && arguments.className
+		}"
+	>
+		<div v-if="loading" class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
-	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
-	<div v-show="!dragstate" class="h-100 card border-0">
-		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
-			<Transition>
-				<span type="button" v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move" aria-label="move widget" v-tooltip="{showDelay:1000, value:'move widget'}"><i class="fa-solid fa-grip-vertical" aria-hidden="true"></i></span>
-			</Transition>
-			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
-			<template v-if="isPinned">
-				<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
-					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
-				</div>
-				<div v-else class="col-auto me-2">
-					<i class="fa-solid fa-thumbtack "></i>
-				</div>
-			</template>
-			<template v-else>
-				<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
-					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
-				</div>
-			</template>
-			<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto ">
-          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
-          	</a>
-			<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
-			<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
-				<i class="fa-solid fa-trash" aria-hidden="true"></i>
-			</a>
-			<Transition>
-				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
-				</div>
-			</Transition>
-		</div>
-		<div v-if="ready" class="card-body overflow-hidden p-0">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
-		</div>
-		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
-			<template v-slot:title>
-				{{ widget ? 'Config for ' + widget.setup.name : '' }}
-			</template>
-			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-			</template>
-			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
-			</template>
-		</bs-modal>
-		<height-transition>
-			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
-				<template v-if="maxWidth < 2">
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ns-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i  class="fa-solid fa-up-down pe-2" aria-hidden="true"></i>
-					</span>
-				</template>
-				<template v-else-if="maxHeight < 2">
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ew-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i class="fa-solid fa-left-right pe-2" aria-hidden="true"></i>
+		<template v-else>
+			<header
+				v-if="widgetTemplate"
+				class="card-header d-flex ps-0 pe-2 align-items-center"
+			>
+				<!-- move handle -->
+				<Transition>
+					<span
+						v-if="editMode && !isPinned"
+						type="button"
+						drag-action="move"
+						class="col-auto mx-2 px-2 cursor-move"
+						draggable="true"
+						aria-hidden="true"
+						:aria-label="$p.t('dashboard/widget_move')"
+						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_move') }"
+					>
+						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
+				</Transition>
+				<!-- TITLE -->
+				<h4 class="col mb-0 mx-2 px-2 fs-6 lh-base">
+					{{ widgetTemplate.setup.name }}
+				</h4>
+				<!-- source info -->
+				<div
+					v-if="source"
+					class="col-auto me-2"
+					:aria-label="sourceInfoTooltip"
+					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
+				>
+					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
+				</div>
+				<!-- pin button -->
+				<template v-if="isPinned">
+					<div
+						v-if="editMode"
+						type="button"
+						role="button"
+						class="pin cursor-pointer col-auto me-2"
+						:title="$p.t('dashboard/widget_unpin')"
+						aria-hidden="true"
+						:aria-label="$p.t('dashboard/widget_unpin')"
+						pinned="true"
+						@click="unpin"
+					>
+						<i class="fa-solid fa-thumbtack" aria-hidden="true"></i>
+					</div>
+					<div v-else class="col-auto me-2" aria-hidden="true">
+						<i class="fa-solid fa-thumbtack"></i>
+					</div>
 				</template>
 				<template v-else>
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-nw-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x" aria-hidden="true"></i>
-					</span>
+					<div
+						v-if="editMode"
+						type="button"
+						role="button"
+						class="col-auto me-2 pin"
+						:title="$p.t('dashboard/widget_pin')"
+						aria-hidden="true"
+						:aria-label="$p.t('dashboard/widget_pin')"
+						@click="pinItem"
+					>
+						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
+					</div>
 				</template>
+				<!-- widget link -->
+				<a
+					v-if="widgetTemplate.setup.cis4link"
+					:href="getWidgetC4Link(widgetTemplate)"
+					class="col-auto ms-auto"
+					:aria-label="$p.t('dashboard/widget_link')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_link') }"
+				>
+					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
+				</a>
+				<!-- config button -->
+				<a
+					v-if="hasConfig"
+					href="#"
+					class="col-auto px-1"
+					:aria-label="$p.t('dashboard/widget_configure')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_configure') }"
+					@click.prevent="openConfig"
+				>
+					<i class="fa-solid fa-gear" aria-hidden="true"></i>
+				</a>
+				<!-- delete button -->
+				<a
+					v-if="custom && editMode"
+					href="#"
+					class="col-auto px-1"
+					:aria-label="$p.t('dashboard/widget_delete')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_delete') }"
+					@click.prevent="$emit('remove')"
+				>
+					<i class="fa-solid fa-trash" aria-hidden="true"></i>
+				</a>
+				<!-- hide button -->
+				<Transition>
+					<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
+						<input
+							type="checkbox"
+							role="switch"
+							v-model="visible"
+							class="form-check-input ms-0"
+							:value="true"
+							:aria-label="$p.t('dashboard/widget_toggle_visibility')"
+						>
+					</div>
+				</Transition>
+			</header>
+			<div v-if="ready" class="card-body overflow-hidden p-0">
+				<component
+					:is="component"
+					v-model:shared-data="sharedData"
+					:config="arguments"
+					:width="width"
+					:height="height"
+					@setConfig="setConfig"
+					@change="changeConfigManually"
+				></component>
 			</div>
-		</height-transition>
-		</div>
-	</div>`,
+			<div
+				v-else
+				class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"
+			>
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<bs-modal
+				v-if="hasConfig"
+				ref="config"
+				@hideBsModal="handleHideBsModal"
+				@showBsModal="handleShowBsModal"
+			>
+				<template v-slot:title>
+					{{ widgetTemplate ? $p.t('dashboard/widget_config_title', widgetTemplate.setup) : '' }}
+				</template>
+				<template v-slot:default>
+					<component
+						:is="component"
+						v-if="ready && !isLoading"
+						v-model:shared-data="sharedData"
+						:config="tmpConfig"
+						@change="changeConfig"
+						:configMode="true"
+					></component>
+					<div v-else class="text-center">
+						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+					</div>
+				</template>
+				<template v-if="!widgetTemplate?.setup?.hideFooter" v-slot:footer>
+					<button
+						type="button"
+						class="btn btn-secondary"
+						data-bs-dismiss="modal"
+					>{{ $p.t('ui/schliessen') }}</button>
+					<button
+						type="button"
+						class="btn btn-primary"
+						@click="changeConfig"
+					>{{ $p.t('ui/speichern') }}</button>
+				</template>
+			</bs-modal>
+			<height-transition>
+				<footer
+					v-if="editMode && isResizeable && !isPinned"
+					class="card-footer d-flex justify-content-end p-0"
+				>
+					<span
+						type="button"
+						drag-action="resize"
+						class="col-auto px-1"
+						:class="resizeClasses.button"
+						draggable="true"
+						aria-hidden="true"
+						:aria-label="$p.t('dashboard/widget_resize')"
+						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_resize') }"
+					>
+						<i
+							class="fa-solid"
+							:class="resizeClasses.icon"
+							aria-hidden="true"
+						></i>
+					</span>
+				</footer>
+			</height-transition>
+		</template>
+	</article>`,
 };

public/js/components/Dashboard/Section.js

@@ -1,9 +1,12 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
+import dragClick from '../../directives/dragClick.js';
+
+import ObjectUtils from "../../helpers/ObjectUtils.js";
+
 export default {
 	name: 'Section',
 	components: {
@@ -11,8 +14,11 @@ export default {
 		DashboardItem,
 		WidgetIcon,
 	},
+	directives: {
+		dragClick
+	},
 	inject: {
-		widgetsSetup:{
+		widgetsSetup: {
 			type: Array,
 			default: [],
 		},
@@ -39,9 +45,8 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
-			draggedItem:null,
-			additionalRow:false,
-		}
+			additionalRow: false
+		};
 	},
 	provide() {
 		return {
@@ -49,22 +54,40 @@ export default {
 				this.editModeIsActive
 			),	
 			sectionName: Vue.computed(() => this.name),	
-		}
+		};
 	},
 	computed: {
-		computedWidgetsSetup(){
-			if(!this.widgetsSetup) return {};
-			return this.widgetsSetup.reduce((acc, setup)=>{
-				acc[setup.widget_id] = setup.setup;
+		sectionNameTranslation() {
+			switch (this.name) {
+				case "general": 
+					return this.$p.t('dashboard', this.name); 
+				case "custom":
+					return this.$p.t('dashboard', this.name);
+				default:
+					return this.name;
+			}
+		},
+		showSectionInformation() {
+			switch (this.name) {
+				case "general": 
+					return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
+				case "custom":
+					return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
+				default:
+					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
+			}
+		},
+		indexedWidgetsTemplates() {
+			if (!this.widgetsSetup)
+				return {};
+			return this.widgetsSetup.reduce((acc, setup) => {
+				acc[setup.widget_id] = setup;
 				return acc;
-			},{})
+			}, {});
 		},
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
-		getSectionStyle() {
-			return 'margin-bottom: 8px;';
-		},
 		items() {
 			// reuses the nearest placement of the widget from another viewport 
 			/* const computeNearestPlace = (item, gridWidth) =>{
@@ -85,76 +108,55 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
+
+				let weight = 5;
+				if (!item.source)
+					weight = 6;
+				else if (item.source == 'general')
+					weight = 4;
+
+				let placement = item.place[this.gridWidth];
+				if (!placement) {
+					weight -= 3;
+					placement = {};
+				}
+
+				return { ...item, ...placement, weight };
 			});
-			return placedItems;
-			
-		},
-		
+
+			if (this.editModeIsActive)
+				return placedItems;
+			return placedItems.filter(item => !item.hidden);
+		}
+	},
+	watch: {
+		items() {
+			this.additionalRow = false;
+		}
 	},
 	methods: {
-		sectionNameTranslation(){
-			switch(this.name){
-				case "general": 
-					return this.$p.t('dashboard',this.name); 
-					break;
-				case "custom":
-					return this.$p.t('dashboard',this.name);
-					break;
-				default:
-					return this.name;
-					break;
-			}
-		},
-		showSectionInformation(){
-			if (this.name == "general"){
-				return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
-			}
-			else if(this.name == "custom"){
-				return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
-			}
-			else{
-				return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
-			}
-		},
 		handleConfigOpened() {
 			this.configOpened = true
 		},
 		handleConfigClosed() {
 			this.configOpened = false
 		},
-		checkResizeLimit(item, w, h) {
-			// NOTE(chris): widgets needs to be loaded for this to work
-			let widget = this.widgetState[item.widget];
-			if (widget) {
-				let minmaxW = { ...widget.setup.width };
-				if (minmaxW.max)
-					minmaxW.min = minmaxW.min || 1;
-				else
-					minmaxW = { min: minmaxW, max: minmaxW };
-				if (w < minmaxW.min)
-					w = minmaxW.min; 
-				if (w > minmaxW.max)
-					w = minmaxW.max;
-
-				let minmaxH = { ...widget.setup.height };
-				if (minmaxH.max)
-					minmaxH.min = minmaxH.min || 1;
-				else
-					minmaxH = { min: minmaxH, max: minmaxH };
-				if (h < minmaxH.min)
-					h = minmaxH.min;
-				if (h > minmaxH.max)
-					h = minmaxH.max;
-			}
-			return [w, h];
-		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
+				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', item.id, this.name));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
+				
+				if (!revert) {
+					// NOTE(chris): move to last line
+					update[item.id].place = [];
+					let y = this.gridHeight;
+					if (this.additionalRow)
+						y--;
+					update[item.id].place[this.gridWidth] = { x: 0, y };
+				}
+				
 				this.updatePreset(update);
 			}
 		},
@@ -163,49 +165,42 @@ export default {
 			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
-		updatePositions(updated, pinned=false) {
+		updatePositions(updated) {
 			let result = {};
 			updated.forEach(update => {
-				
-				let item = {...update.item};
-				if (!item.placeholder) {
-				if (!item.place[this.gridWidth])
-					item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
-				delete item.x;
-				delete item.y;
-				delete item.w;
-				delete item.h;
-				delete item.place[this.gridWidth].pinned;
-				if (update.x !== undefined)
-					item.place[this.gridWidth].x = update.x;
-				if (update.y !== undefined)
-					item.place[this.gridWidth].y = update.y;
-				if (update.w !== undefined)
-					item.place[this.gridWidth].w = update.w;
-				if (update.h !== undefined)
-					item.place[this.gridWidth].h = update.h;
-				if (pinned){
-					item.place[this.gridWidth].pinned = true;
-				}
+				let item = structuredClone(ObjectUtils.deepToRaw(update.item));
 
-				result[item.id] = item;
+				if (!item.placeholder) {
+					if (!item.place[this.gridWidth])
+						item.place[this.gridWidth] = { x: 0, y: 0, w: 1, h: 1 };
+					
+					delete item.x;
+					delete item.y;
+					delete item.w;
+					delete item.h;
+					delete item.pinned;
+					delete item.weight;
+
+					if (update.x !== undefined)
+						item.place[this.gridWidth].x = update.x;
+					if (update.y !== undefined)
+						item.place[this.gridWidth].y = update.y;
+					if (update.w !== undefined)
+						item.place[this.gridWidth].w = update.w;
+					if (update.h !== undefined)
+						item.place[this.gridWidth].h = update.h;
+					if (update.pinned !== undefined)
+						item.place[this.gridWidth].pinned = update.pinned;
+
+					result[item.id] = item;
 				}
 			});
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
-			let payload = {};
-			payload[this.name] = update;
-			this.$emit('widgetUpdate', this.name, payload);
+			this.$emit('widgetUpdate', update, this.name);
 		}
 	},
-	setup() {
-		const { state: widgetState } = useCachedWidgetLoader();
-
-		return {
-			widgetState
-		};
-	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
@@ -215,44 +210,62 @@ export default {
 			self.gridWidth = parseInt(window.getComputedStyle(cont).getPropertyValue('--fhc-dashboard-grid-size'));
 		});
 	},
-	template: `
-	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<h4 v-if="editModeIsActive" class=" mb-2">
-			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-			{{sectionNameTranslation()}}:
-		</h4>
-		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
-		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+	template: /* html */`
+	<section
+		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
+		ref="container"
+		:class="{ 'edit-active': editModeIsActive }"
+	>
+		<h3 v-if="adminMode" class="h4">
+			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
+			{{ sectionNameTranslation }}:
+		</h3>
+		<button
+			v-tooltip="$p.t('dashboard/addLine')"
+			v-if="!additionalRow && editModeIsActive"
+			class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center"
+			@click="additionalRow=true"
+			v-drag-click="() => additionalRow=true"
+		>+</button>
+		<drop-grid
+			v-model:cols="gridWidth"
+			:additional-row="additionalRow"
+			:items="items"
+			:items-setup="indexedWidgetsTemplates"
+			:active="editModeIsActive"
+			@rearrange-items="updatePositions"
+			@grid-height="gridHeight=$event"
+		>
 			<template #default="item">
-				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div
+					v-if="item.placeholder"
+					class="empty-tile-hover"
+					@click="$emit('widgetAdd', { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 }, name)"
+				></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
-					:dragstate="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)"
-					:resizeOverlay="item.resizeOverlay"
-					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
-					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
 					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
-					:setup="computedWidgetsSetup[item.widget]"
+					:widget-template="indexedWidgetsTemplates[item.widget]"
+					:source="adminMode ? null : item.source || 'custom'"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
 					@config-closed="handleConfigClosed"
-					@pinItem="updatePositions($event,true)"
-					@unPinItem="updatePositions">
-				</dashboard-item>
-				
+					@pin-item="updatePositions"
+					@un-pin-item="updatePositions"
+				></dashboard-item>
 			</template>
-			
 		</drop-grid>
-	</div>`
+	</section>`
 }
 
 /*

public/js/components/Dashboard/Widget/Picker.js

@@ -32,19 +32,31 @@ export default {
 		},
 		
 	},
-	template: `<div class="dashboard-widget-picker">
-		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
-			<template v-slot:title>Create new widget</template>
+	template: /* html */`
+	<div class="dashboard-widget-picker">
+		<bs-modal
+			ref="modal"
+			class="fade"
+			:dialog-class="{ 'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0 }"
+			@hiddenBsModal="close"
+		>
+			<template v-slot:title>{{ $p.t('dashboard/createWidget') }}</template>
 			<template v-slot:default>
 				<div v-if="widgets" class="row g-2">
 					<div v-if="!widgets.length">
-						No Widgets available
+						{{ $p.t('dashboard/noWidgetsAvailable') }}
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
-						<widget-icon @select="pick" :widget="widget" ></widget-icon>
+					<div
+						v-for="widget in widgets"
+						:key="widget.widget_id"
+						class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2"
+					>
+						<widget-icon @select="pick" :widget="widget"></widget-icon>
 					</div>
 				</div>
-				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+				<div v-else class="text-center">
+					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+				</div>
 			</template>
 		</bs-modal>
 	</div>`

public/js/components/DashboardWidget/LvPlan.js

@@ -11,9 +11,6 @@ export default {
 	mixins: [
 		AbstractWidget
 	],
-	inject: [
-		"timezone"
-	],
 	methods: {
 		getPromiseFunc(start, end) {
 			return [
@@ -27,6 +24,6 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<fhc-calendar :timezone="timezone" :get-promise-func="getPromiseFunc" />
+		<fhc-calendar :get-promise-func="getPromiseFunc" />
 	</div>`
 }

public/js/components/Drop/Grid/Item.js

@@ -1,88 +1,26 @@
 export default {
 	name:'GridItem',
-	components: {
-	},
-	inject: {
-	},
 	props: {
-		item: Object,
-		active: Boolean
+		item: Object
 	},
 	emits: [
-		"mouseDown",
-		"mouseUp",
 		"startMove",
-		"startResize",
-		"dragging",
-		"endDrag",
-		"dropDrag",
-		"item",
-		"touchStart",
-		"touchEnd",
+		"startResize"
 	],
-	data() {
-		return {
-			dragAction: '',
-			dragging: false
-		}
-	},
-	computed: {
-	},
 	methods: {
-		registerDragAction(evt) {
-			this.$emit('mouseDown', evt);
-			if (evt.target.hasAttribute('drag-action')) {
-				this.dragAction = evt.target.getAttribute('drag-action');
-			} else {
-				let parent = evt.target.closest('[drag-action]');
-				if (parent) {
-					this.dragAction = parent.getAttribute('drag-action');
-				} else {
-					this.dragAction = '';
-				}
-			}
-		},
-		tryDragStart(evt, item) {
-			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
+		tryDragStart(evt) {
+			let dragAction = evt.target.getAttribute('drag-action');
 			if (dragAction) {
-				this.dragging = true;
 				if (dragAction == 'move')
-					return this.$emit('startMove', evt, item);
+					return this.$emit('startMove', evt, this.item);
 				else if (dragAction == 'resize')
-					return this.$emit('startResize', evt, item);
-			}
-			//evt.preventDefault();
-		},
-		touchDragEnd(evt) {
-			if (!this.dragging)
-				return;
-			this.dragging = false;
-			this.$emit('touchEnd', evt);
-		},
-		touchStart(event){
-			this.$emit('touchStart', event); 
-			this.registerDragAction(event); 
-			this.tryDragStart(event, this.item);
-		},
-		touchMove(event){
-			if(this.dragging){
-				event.preventDefault();
-				this.$emit('dragging', event);
+					return this.$emit('startResize', evt, this.item);
 			}
 		}
 		
 	},
-	template: `
-	<div class="drop-grid-item"
-		@mousedown="registerDragAction"
-		@mouseup="$emit('mouseUp', $event)"
-		@touchstart="touchStart"
-		@touchend="touchDragEnd"
-		@dragstart="tryDragStart($event, item)"
-		@drag="$emit('dragging',$event)"
-		@touchmove="touchMove"
-		@dragend="$emit('endDrag', $event); dragging = false"
-		:draggable="active && !item.placeholder">
+	template: /* html */`
+	<li class="drop-grid-item" @dragstart="tryDragStart">
 		<slot v-bind="item"></slot>
-	</div>`
+	</li>`
 }

public/js/components/DropdownModes/LehreinheitenModule.js

@@ -1,71 +0,0 @@
-import ApiLehre from "../../api/factory/lehre.js";
-
-const options = Vue.ref([]);
-const params = Vue.ref({});
-let appContext = null;
-
-export function setupContext(globalProps) {
-	appContext = globalProps
-}
-
-// bind and watch api params via reference
-export function bindParams(paramsRef) {
-	Vue.watch(
-		paramsRef,
-		(newVal) => {
-			params.value = { ...newVal };
-			fetchLehreinheiten(newVal.lv_id, newVal.sem_kurzbz);
-		},
-		{ immediate: true, deep: true }
-	);
-}
-
-async function fetchLehreinheiten(lv_id, sem_kurzbz) {
-	appContext.$api.call(ApiLehre.getLeForLv(lv_id, sem_kurzbz)).then(res => {
-
-		const data =  []
-		// TODO: could be done on server in some shared function, copied from anw extension for now
-		res.data?.retval?.forEach(entry => {
-
-			const existing = data.find(e => e.lehreinheit_id === entry.lehreinheit_id)
-			if (existing) {
-				// supplement info
-				existing.infoString += ', '
-				if (entry.gruppe_kurzbz !== null && entry.direktinskription == false) {
-					existing.infoString += entry.gruppe_kurzbz
-				} else {
-					existing.infoString += entry.kurzbzlang + '-' + entry.semester
-						+ (entry.verband ? entry.verband : '')
-						+ (entry.gruppe ? entry.gruppe : '')
-				}
-			} else {
-				// entries are supposed to be fetched ordered by non null gruppe_kurzbz first
-				// so a new entry will always start with those groups, others are appended afterwards
-				entry.infoString = entry.kurzbz + ' - ' + entry.lehrform_kurzbz + ' - '
-				if (entry.gruppe_kurzbz !== null && entry.direktinskription == false) {
-					entry.infoString += entry.gruppe_kurzbz
-				} else {
-					entry.infoString += entry.kurzbzlang + '-' + entry.semester
-						+ (entry.verband ? entry.verband : '')
-						+ (entry.gruppe ? entry.gruppe : '')
-				}
-
-				data.push(entry)
-			}
-		})
-
-		options.value = [...data]
-
-	})
-}
-
-// export the module and relevant fields via reactive
-const LehreinheitenModule = Vue.reactive({
-	options,
-	optionLabel: 'infoString',
-	placeholder: Vue.computed(()=>appContext?.$p.t('lehre/lehreinheit')),
-	setupContext,
-	bindParams
-});
-
-export default LehreinheitenModule;

public/js/components/LVVerwaltung/Details/Gruppen.js

@@ -2,7 +2,6 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 import ApiGruppe from "../../../api/lehrveranstaltung/gruppe.js";
-import drop from '../../../directives/drop.js';
 export default{
 	name: "LVGruppen",
 	components: {
@@ -10,9 +9,6 @@ export default{
 		FormForm,
 		FormInput
 	},
-	directives: {
-		drop
-	},
 	props: {
 		lehreinheit_id: Number
 	},
@@ -191,48 +187,28 @@ export default{
 					this.reload();
 				})
 		},
-		onDropVerband(node, gruppe) {
-			this.$api.call(ApiGruppe.getGruppe(gruppe))
-				.then(result => result.data)
-				.then(result => {
-
-					let newData = {
-						'gid': result,
-						'lehreinheit_id': this.lehreinheit_id,
-						'lehrverband': gruppe.lehrverband,
-					}
-					this.$api.call(ApiGruppe.add(newData))
-						.then(result => {
-							this.reload()
-						})
-			});
-
-		},
-
 	},
 	template: `
-		<div v-drop:link-strict.verband="(evt, gruppe) => onDropVerband(node, gruppe)">
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				:reload=true
-				>
-				<template #search> <!--TODO (david) Slot prüfen -->
-					<form-input
-						type="autocomplete"
-						:suggestions="filteredGroups"
-						:placeholder="$p.t('lehre', 'addGroup')"
-						v-model="selectedGroup"
-						field="label"
-						@item-select="addGroup"
-						@complete="searchGroup"
-					></form-input>
-				</template>
-				
-			</core-filter-cmpt>
-		</div>
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			:reload=true
+			>
+			<template #search> <!--TODO (david) Slot prüfen -->
+				<form-input
+					type="autocomplete"
+					:suggestions="filteredGroups"
+					:placeholder="$p.t('lehre', 'addGroup')"
+					v-model="selectedGroup"
+					field="label"
+					@item-select="addGroup"
+					@complete="searchGroup"
+				></form-input>
+			</template>
+			
+		</core-filter-cmpt>
 		`
 };

public/js/components/LVVerwaltung/LVVerwaltung.js

@@ -8,10 +8,9 @@ import LvTabs from "./Setup/Tabs.js";
 
 import ApiDetails from "../../api/lehrveranstaltung/details.js";
 import ApiLektor from "../../api/lehrveranstaltung/lektor.js";
+import ApiGruppe from "../../api/lehrveranstaltung/gruppe.js";
 import ApiStudiengangTree from "../../api/lehrveranstaltung/studiengangtree.js";
 import ApiSearchbar from "../../api/factory/searchbar.js";
-import AppConfig from "../AppConfig.js";
-import ApiLvConfig from "../../api/lehrveranstaltung/config.js";
 
 
 export default {
@@ -24,7 +23,6 @@ export default {
 		StvStudiensemester,
 		LvTable,
 		LvTabs,
-		AppConfig
 	},
 	props: {
 		defaultSemester: String,
@@ -34,9 +32,7 @@ export default {
 		stg: { type: String, required: false },
 		semester: { type: [Number, String], required: false, default: null },
 		studiensemester_kurzbz: { type: String, required: false, default: null },
-		emp: { type: String, required: false, default: null },
-		avatarUrl: String,
-		logoutUrl: String,
+		emp: { type: String, required: false, default: null }
 	},
 
 	provide() {
@@ -48,6 +44,7 @@ export default {
 			lehreinheitAnmerkungDefault: (this.config.lehreinheitAnmerkungDefault || '').replace(/\\n/g, '\n'),
 			lehreinheitRaumtypDefault: this.config.lehreinheitRaumtypDefault,
 			lehreinheitRaumtypAlternativeDefault: this.config.lehreinheitRaumtypAlternativeDefault,
+
 			permissionLehrveranstaltung: this.permissions['lehre/lehrveranstaltung'],
 			permissionGruppenEntfernen: this.permissions['lv-plan/gruppenentfernen'],
 			permissionLektorEntfernen: this.permissions['lv-plan/lektorentfernen'],
@@ -75,8 +72,6 @@ export default {
 	},
 	data() {
 		return {
-			appconfig:{},
-			configEndpoints: ApiLvConfig,
 			selected: [],
 			studiengang: "",
 			filter: {},
@@ -274,51 +269,6 @@ export default {
 				<span class="fa-solid fa-table-list"></span>
 			</button>
 			<core-searchbar :searchoptions="searchbaroptions" :searchfunction=searchfunction class="searchbar w-100"></core-searchbar>
-			<div id="nav-user" class="dropdown">
-				<button
-					id="nav-user-btn"
-					class="btn btn-link rounded-0 py-0"
-					type="button"
-					data-bs-toggle="dropdown"
-					data-bs-target="#nav-user-menu"
-					aria-expanded="false"
-					aria-controls="nav-user-menu"
-				>
-					<img
-						:src="avatarUrl"
-						:alt="$p.t('profilUpdate/profilBild')"
-						class="bg-light avatar rounded-circle border border-light"
-					/>
-				</button>
-				<ul
-					ref="navUserDropdown"
-					class="dropdown-menu dropdown-menu-dark dropdown-menu-end rounded-0 text-center m-0"
-					aria-labelledby="nav-user-btn"
-				>
-					<li>
-						<button
-							type="button"
-							class="dropdown-item"
-							data-bs-toggle="modal"
-							data-bs-target="#configModal"
-						>
-							{{ $p.t('ui/settings') }}
-						</button>
-					</li>
-					<li><hr class="dropdown-divider m-0"/></li>
-					<li>
-						<nav-language
-							item-class="dropdown-item border-left-dark"
-						/>
-					</li>
-					<li><hr class="dropdown-divider m-0"/></li>
-					<li>
-						<a class="dropdown-item" :href="logoutUrl">
-							{{ $p.t('ui/logout') }}
-						</a>
-					</li>
-				</ul>
-			</div>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
@@ -335,7 +285,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband :preselectedKey="selectedStudiengang" :dragEnabled=true :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				
@@ -377,6 +327,5 @@ export default {
 				</main>
 			</div>
 		</div>
-		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>
 	</div>`
 };