use model-type for interessenten anlegen, listNew

application/config/Events.php

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

application/config/noten.php

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

application/config/routes.php

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

application/controllers/Cis/Benotungstool.php

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

application/controllers/Cis/Compat.php

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

application/controllers/Cis/ProjektabgabeUebersicht.php

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

application/controllers/Cis/Zeitsperren.php

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

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

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

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

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

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

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

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

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

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

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

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

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

application/controllers/components/Cis/Mylv.php

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

application/controllers/lehre/Pruefungsprotokoll.php

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

application/libraries/StundenplanLib.php

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

application/models/codex/Mobilitaet_model.php

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

application/models/education/Abschlusspruefung_model.php

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

application/models/education/LePruefung_model.php

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

application/models/education/Lehreinheit_model.php

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

application/models/education/Lehrveranstaltung_model.php

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

application/models/education/Lvgesamtnote_model.php

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

application/models/education/Note_model.php

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

application/models/education/Notenschluesselaufteilung_model.php

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

application/models/education/Paabgabe_model.php

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

application/models/education/Projektarbeit_model.php

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

application/models/education/Pruefung_model.php

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

application/models/organisation/Studienplan_model.php

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

application/models/organisation/Studiensemester_model.php

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

application/models/ressource/Reservierung_model.php

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

application/models/ressource/Zeitsperre_model.php

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

application/views/CisRouterView/CisRouterView.php

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

application/views/lehre/lehrauftrag/Dashboard.php

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

application/views/lehre/lehrauftrag/LehrendeUebersicht.php

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

application/views/lehre/lehrauftrag/acceptLehrauftrag.php

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

application/views/lehre/lehrauftrag/approveLehrauftrag.php

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

application/views/lehre/lehrauftrag/orderLehrauftrag.php

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

application/views/lehre/pruefungsprotokoll.php

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

application/views/lehre/pruefungsprotokollUebersicht.php

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

application/views/templates/CISVUE-Footer.php

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

application/views/templates/CISVUE-Header.php

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

application/views/widgets/navigationMenu.php

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

cis/private/lehre/notenliste.xls.php

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

public/css/Cis4/Benotungstool.css

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

public/css/Cis4/CoreCalendarEvents.css

@@ -97,17 +97,3 @@
 	display: none;
 }
 
-.fhc-calendar-empty-slot-plus {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%,-50%);
-	font-size: 18px;
-	opacity: 0;
-	pointer-events: none;
-	user-select: none;
-}
-
-.part-body:hover .fhc-calendar-empty-slot-plus {
-	opacity: 1;
-}

public/css/Cis4/Zeitsperren.css

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

public/css/components/MyLv.css

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

public/js/api/factory/addons.js

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

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

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

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

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

public/js/api/factory/lehre.js

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

public/js/api/factory/noten.js

@@ -1,87 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	getCisConfig(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getCisConfig'
-		};
-	},
-	getStudentenNoten(lv_id, sem_kurzbz) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getStudentenNoten',
-			params: { lv_id, sem_kurzbz }
-		};
-	},
-	getNoten(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Noten/getNoten'
-		};
-	},
-	saveStudentenNoten(password, noten, lv_id, sem_kurzbz) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveStudentenNoten',
-			params: { password, noten, lv_id, sem_kurzbz }
-		};
-	},
-	saveNotenvorschlag(lv_id, sem_kurzbz, student_uid, note, punkte = null) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveNotenvorschlag',
-			params: { lv_id, sem_kurzbz, student_uid, note, punkte }
-		};
-	},
-	saveStudentPruefung(student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id = null){
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveStudentPruefung',
-			params: { student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id }
-		};
-	},
-	createPruefungen(uids, datum, lva_id, sem_kurzbz){
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/createPruefungen',
-			params: { uids, datum, lva_id, sem_kurzbz }
-		};
-	},
-	saveNotenvorschlagBulk(lv_id, sem_kurzbz, noten) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/saveNotenvorschlagBulk',
-			params: { lv_id, sem_kurzbz, noten }
-		};
-	},
-	saveStudentPruefungBulk(lv_id, sem_kurzbz, pruefungen) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/savePruefungenBulk',
-			params: { lv_id, sem_kurzbz, pruefungen }
-		};
-	},
-	getNoteByPunkte(punkte, lv_id, sem_kurzbz) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Noten/getNoteByPunkte',
-			params: { punkte, lv_id, sem_kurzbz }
-		};
-	}
-}

public/js/api/factory/paabgabeUebersicht.js

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

public/js/api/factory/studiensemester.js

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

public/js/apps/Cis/Cis.js

@@ -1,28 +1,263 @@
+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/MyLvPlan.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_DESKTOP, DEFAULT_MODE_RAUMINFO_MOBILE} 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 StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
+import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
-import ApiAuthinfo from "../../api/factory/authinfo.js";
 
-import {router} from "../../routers/Cis/CisRouter.js";
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+const isMobile = window.matchMedia("(max-width: 767px)").matches;
+
+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: isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP,
+						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()
+					: (isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP);
+
+				// 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: `/Cis/StgOrgLvPlan/:mode?/:focus_date?/:stgkz?/:sem?/:verband?/:gruppe?`,
+			name: 'StgOrgLvPlan',
+			component: StgOrgLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+      		path: `/Cis/OtherLvPlan/:otherUid/:mode?/:focus_date?`,
+      		name: "OtherLvPlan",
+      		component: OtherLvPlan,
+      		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',
 	data: () => ({
 		appSideMenuEntries: {},
 		windowWidth: 0,
-		isStudent: null,
-		isMitarbeiter: null,
 	}),
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			isMobile: Vue.computed(() => this.isMobile),
-			isStudent: Vue.computed(() => this.isStudent),
-			isMitarbeiter: Vue.computed(() => this.isMitarbeiter)
 		}	
 	},
 	computed: {
@@ -41,39 +276,35 @@ const app = Vue.createApp({
 			if(target?.id == 'skiplink') return
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
-
-				const path = url.pathname + url.search;
+				
+				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);
-
+				
 			}
 		},
 		handleWindowResize() {
 			this.windowWidth = window.innerWidth;
 		},
 	},
-	async created() {
+	created() {
 		this.windowWidth = window.innerWidth;
-		await this.$api.call(ApiAuthinfo.getAuthInfo()).then((res) => {
-			this.isMitarbeiter = res.data.isMitarbeiter;
-			this.isStudent = res.data.isStudent;
-		});
 	},
 	async mounted() {
 		document.addEventListener('click', this.handleClick);

public/js/apps/Cis/Menu.js

@@ -5,8 +5,6 @@ import Theme from "../../plugins/Theme.js";
 import ApiSearchbar from '../../api/factory/searchbar.js';
 import ApiLvPlan from "../../api/factory/lvPlan.js";
 
-import {router} from "../../routers/Cis/CisRouter.js";
-
 const app = Vue.createApp({
     name: 'CisMenuApp',
     components: {
@@ -195,7 +193,6 @@ const app = Vue.createApp({
 
 FhcApps.makeExtendable(app);
 
-app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -433,6 +433,7 @@ export default {
 						:label="$p.t('wawi/ausgegebenam')"
 						name="ausgegebenam"
 						v-model="formData.ausgegebenam"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -449,6 +450,7 @@ export default {
 						:label="$p.t('wawi/retouram')"
 						name="retouram"
 						v-model="formData.retouram"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

public/js/components/Bootstrap/Offcanvas.js

@@ -148,4 +148,4 @@ export default {
 			</div>
 		</div>
 	`
-}
+}

public/js/components/Calendar/Base.js

@@ -44,10 +44,7 @@ export default {
 				return () => true;
 			}),
 			hasDragoverFunc: Vue.computed(() => this.onDragover),
-			mode: Vue.computed(() => this.mode),
-			reservierbarMap: Vue.computed(() => this.reservierbarMap),
-			isReservierbar: Vue.computed(() => this.isReservierbar),
-			createContext: Vue.computed(() => this.createContext)
+			mode: Vue.computed(() => this.mode)
 		};
 	},
 	props: {
@@ -100,13 +97,7 @@ export default {
 		draggableEvents: [Boolean, Array, Function],
 		dropableEvents: [Boolean, Array, Function],
 		onDragover: Function,
-		onDrop: Function,
-		isReservierbar: Boolean,
-		createContext: Object,
-		reservierbarMap: {
-			type: Object,
-			default: () => ({})
-		},
+		onDrop: Function
 	},
 	emits: [
 		"click:next",
@@ -114,13 +105,11 @@ export default {
 		"click:mode",
 		"click:event",
 		"click:day",
-		"click:slot",
 		"click:week",
 		"update:date",
 		"update:mode",
 		"update:range",
-		"drop",
-		"create-event"
+		"drop"
 	],
 	data() {
 		return {

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

@@ -2,7 +2,6 @@ import GridLine from './Grid/Line.js';
 import GridLineEvent from './Grid/Line/Event.js';
 
 import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
-import CalClick from '../../../directives/Calendar/Click.js';
 
 export default {
 	name: "CalendarGrid",
@@ -11,16 +10,12 @@ export default {
 		GridLineEvent
 	},
 	directives: {
-		CalDnd,
-		CalClick
+		CalDnd
 	},
 	inject: {
 		originalEvents: "events",
 		originalBackgrounds: "backgrounds",
-		dropAllowed: "dropAllowed",
-		timezone: "timezone",
-		reservierbar: "isReservierbar",
-		reservierbarMap: "reservierbarMap",
+		dropAllowed: "dropAllowed"
 	},
 	provide() {
 		return {
@@ -313,25 +308,8 @@ export default {
 			} else {
 				this.$refs.scroller.scrollTo(0, 0);
 			}
-		},
-		isFreeSlot(date, part, dayEvents) {
-			const pastEnd = luxon.DateTime.now().setZone(this.timezone);
-
-			const start = date.plus(part.start || part);
-			const end = date.plus(part.end || part.plus({ hours: 1 }));
-
-			if (start < pastEnd)
-				return false;
-
-			if (!dayEvents || !dayEvents.length)
-				return true;
-
-			return !dayEvents.some(ev => ev.start < end && ev.end > start);
 		}
 	},
-	created() {
-		this.$p.loadCategory(["LvPlan"]);
-	},
 	beforeUnmount() {
 		this.disableAutoScroll();
 	},
@@ -422,20 +400,6 @@ export default {
 							:style="'grid-' + axisCol + ':' + (1+index) + ';grid-' + axisRow + ':ps_' + i + '/pe_' + i"
 						>
 							<slot name="part-body" v-bind="{ index, part }" />
-							
-							 <div
-							   v-if="isFreeSlot(date, part, eventsNormal[index]) && reservierbar"
-								class="fhc-calendar-empty-slot"
-								style="position:absolute; inset:0; z-index:1"
-								v-cal-click:slot="{ date, part }"
-								:title="this.reservierbarMap?.[date.toISODate()] ? $p.t('LvPlan/add_reservation') : $p.t('LvPlan/reservation_not_allowed')"
-							>
-								<div class="fhc-calendar-empty-slot-plus">
-									<i v-if="this.reservierbarMap?.[date.toISODate()]" class="fa-solid fa-plus"></i>
-									<i v-else class="fa-solid fa-ban" style="color: red;"></i>
-								</div>
-							</div>
-
 							<div
 								v-if="snapToGrid && dragging"
 								style="position:absolute;inset:0;z-index:1"

public/js/components/Calendar/LvPlan.js

@@ -28,15 +28,7 @@ export default {
 		getPromiseFunc: {
 			type: Function,
 			required: true
-		},
-		reservierbar: {
-			type: Boolean,
-			default: false
-		},
-		createContext: {
-			type: Object,
-			default: () => ({})
-		},
+		}
 	},
 	provide() {
 		return {
@@ -51,26 +43,11 @@ export default {
 	emits: [
 		"update:date",
 		"update:mode",
-		"update:range",
-		"create-event",
-		"delete-event",
-		'update:reservierbarMap'
+		"update:range"
 	],
 	data() {
 		return {
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
-			isReservierbar: Vue.computed(() => {
-				if (!this.reservierbar)
-					return false;
-
-				if (!this.reservierbarMap)
-					return false;
-
-				if (typeof this.reservierbarMap === 'object')
-					return Object.keys(this.reservierbarMap).length > 0;
-
-				return false;
-			}),
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
@@ -148,14 +125,11 @@ export default {
 			);
 			this.compactibleEventTypes = compactibleEventTypesResponse.data;
 		},
-		closeModal() {
-			this.$refs.calendar.hideEventModal();
-		},
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
 		
-		const { events, lv, reservierbarMap, reset  } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
 
 		Vue.watch(lv, newValue => {
 			context.emit('update:lv', newValue);
@@ -163,15 +137,10 @@ export default {
 
 		const { renderers } = useRenderers();
 
-		Vue.watch(reservierbarMap, newVal => {
-			context.emit('update:reservierbarMap', newVal);
-		});
-
 		return {
 			rangeInterval,
 			events,
 			lv,
-			reservierbarMap,
 			reset,
 			renderers
 		};
@@ -193,9 +162,6 @@ export default {
 		:events="events || []"
 		:backgrounds="backgrounds"
 		:time-grid="teachingunits"
-		:reservierbar-map="reservierbarMap"
-		:isReservierbar="isReservierbar"
-		:create-context="createContext"
 		show-btns
 		@update:date="(newDate, newMode) => $emit('update:date', newDate, newMode)"
 		@update:mode="(newMode, newDate) => $emit('update:mode', newMode, newDate)"
@@ -218,7 +184,6 @@ export default {
 					v-if="mode == 'event'"
 					:is="renderers[event.type]?.modalContent"
 					:event="event"
-					@create-event="(event) => $emit('create-event', event)"
 				></component>
 				<component
 					v-else-if="mode == 'eventheader'"
@@ -229,7 +194,6 @@ export default {
 					v-else
 					:is="renderers[event.type]?.calendarEvent"
 					:event="event"
-					@delete-event="(event) => $emit('delete-event', event)"
 					:timeSlotDisplayBehavior="
 						$props.mode.toLowerCase() === 'list' ? 'always' : 'default'
 					"

public/js/components/Calendar/Mode/Day/View.js

@@ -16,19 +16,7 @@ export default {
 	inject: {
 		timeGrid: "timeGrid",
 		originalEvents: "events",
-		timezone: "timezone",
-		reservierbar: {
-			from: "isReservierbar",
-			default: false
-		},
-		reservierbarMap: {
-			type: Object,
-			default: () => ({})
-		},
-		createContext: {
-			from: 'createContext',
-			default: () => {}
-		},
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -115,27 +103,6 @@ export default {
 					});
 				}
 			}
-			else if (evt.detail.source == 'slot')
-			{
-				if (!this.reservierbar)
-					return;
-
-				const { date, part } = evt.detail.value || {};
-				if (!date)
-					return;
-				let reservierbar = this.reservierbarMap?.[date.toISODate()] === true;
-				if (!reservierbar)
-					return;
-
-				this.$emit('requestModalOpen', {
-					event: {
-						type: this.createContext?.scope ?? 'slot',
-						start: date.plus(part.start || part),
-						end: date.plus(part.end || part.plus({ hours: 1 })),
-						createContext: this.createContext
-					}
-				});
-			}
 		}
 	},
 	setup() {

public/js/components/Calendar/Mode/Week.js

@@ -7,14 +7,6 @@ export default {
 		BaseSlider,
 		WeekView
 	},
-	inject: {
-		reservierbar: "isReservierbar",
-		reservierbarMap: "reservierbarMap",
-		createContext: {
-			from: 'createContext',
-			default: () => {}
-		},
-	},
 	props: {
 		currentDate: {
 			type: luxon.DateTime,
@@ -91,33 +83,14 @@ export default {
 		},
 		handleClickDefaults(evt) {
 			switch (evt.detail.source) {
-				case 'day':
-					// default: Set current-date
-					this.$emit('update:currentDate', evt.detail.value);
-					break;
-				case 'event':
-					// default: Request Modal
-					this.$emit('requestModalOpen', { event: evt.detail.value });
-					break;
-				case 'slot':
-				{
-					const { date, part } = evt.detail.value || {};
-					if (!date)
-						return;
-					let reservierbar = this.reservierbarMap?.[date.toISODate()] === true;
-					if (!reservierbar)
-						return;
-
-					this.$emit('requestModalOpen', {
-						event: {
-							type: this.createContext?.scope ?? 'slot',
-							start: date.plus(part.start || part),
-							end: date.plus(part.end || part.plus({ hours: 1 })),
-							createContext: this.createContext
-						}
-					});
-					break;
-				}
+			case 'day':
+				// default: Set current-date
+				this.$emit('update:currentDate', evt.detail.value);
+				break;
+			case 'event':
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
+				break;
 			}
 		}
 	},

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -1436,20 +1436,41 @@ export const AbgabetoolAssistenz = {
 			const table = this.$refs.abgabeTable.tabulator
 
 			this.tableBuiltResolve()
+			
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
 
 			const saved = this.loadState();
 
-			// setup change eventlisteners
-			const events = [
-				"columnMoved", "columnResized", "columnVisibilityChanged",
-				"filterChanged", "headerFilterChanged", "dataSorted",
-				"columnSorted", "sortersChanged"
-			];
-
-			events.forEach(eventName => {
-				table.on(eventName, () => this.saveState(table));
-			});
-
 			table.on("renderComplete", () => {
 				if(!this.stateRestored) {
 					

public/js/components/Cis/Benotungstool/NotenlisteLinks.js

@@ -1,73 +0,0 @@
-// components/Lehre/Benotungstool/NotenlisteLinks.js
-import LehreinheitenModule from '../../DropdownModes/LehreinheitenModule.js';
-
-export const NotenlisteLinks = {
-	name: "NotenlisteLinks",
-	props: {
-		lehrveranstaltung:   { type: Object, default: null },
-		sem_kurzbz:          { type: String, default: null },
-		selectedLehreinheit: { type: Object, default: null }
-	},
-	computed: {
-		LehreinheitenModule() {
-			return LehreinheitenModule;
-		},
-		lehreinheiten() {
-			// reuse the already-loaded LE options from the shared module
-			const all = LehreinheitenModule.options ?? [];
-			// when a single Lehreinheit is selected, restrict the list to just that one
-			if (this.selectedLehreinheit?.lehreinheit_id != null) {
-				return all.filter(le => le.lehreinheit_id === this.selectedLehreinheit.lehreinheit_id);
-			}
-			return all;
-		},
-		baseUrl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ 'cis/private/lehre/notenliste.xls.php';
-		},
-		ready() {
-			const lv = this.lehrveranstaltung;
-			return !!(lv && lv.studiengang_kz != null && lv.lv_semester != null
-				&& lv.lehrveranstaltung_id != null && this.sem_kurzbz);
-		},
-		gesamtUrl() {
-			if (!this.ready) return null;
-			return this.buildUrl();
-		}
-	},
-	methods: {
-		buildUrl(lehreinheit_id = null) {
-			const lv = this.lehrveranstaltung;
-			const params = new URLSearchParams({
-				stg:   lv.studiengang_kz,
-				sem:   lv.lv_semester,
-				lvid:  lv.lehrveranstaltung_id,
-				stsem: this.sem_kurzbz
-			});
-			if (lehreinheit_id != null) params.set('lehreinheit_id', lehreinheit_id);
-			return this.baseUrl + '?' + params.toString();
-		}
-	},
-	template: `
-        <div v-if="ready">
-            <div class="fw-bold mb-2">{{ $capitalize($p.t('benotungstool/c4notenlisten')) }}</div>
-
-            <div class="mb-1">
-                <a class="Item" :href="gesamtUrl" target="_blank" rel="noopener">
-                    {{ $capitalize($p.t('benotungstool/c4gesamtliste')) }} {{ lehrveranstaltung.lv_bezeichnung }}
-                </a>
-            </div>
-
-            <div v-for="le in lehreinheiten" :key="le.lehreinheit_id" class="mb-1" style="padding-left: 1.5rem;">
-                <a class="Item" :href="buildUrl(le.lehreinheit_id)" target="_blank" rel="noopener">
-                    {{ le.infoString }}
-                </a>
-            </div>
-        </div>
-        <div v-else class="text-muted">
-            {{ $capitalize($p.t('benotungstool/c4keineStudentenGefunden')) }}
-        </div>
-    `
-};
-
-export default NotenlisteLinks;

public/js/components/Cis/Cms/Content_types/Iframe_content.js

@@ -1,3 +1,5 @@
+import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js";
+
 export default {
 	name: "iframe_content",
 	props: {
@@ -13,7 +15,7 @@ export default {
 				return "";
 
 			let url = iframe.getAttribute("src") || "";
-			return url.replace(/\.\.\//, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+			return replaceRelativeLegacyLink(url);
 		}
 	},
 	template: `

public/js/components/Cis/Compat.js

@@ -1,93 +0,0 @@
-export default {
-	name: "Compat",
-	props: {
-		mode: { type: String, required: true },
-		path: { type: String, required: true },
-		query_string: { type: String, required: true, default: ''}
-	},
-	data: function() {
-		return {
-			lastLoadediFrameURL: '',
-			srcUrl: ''
-		};
-	},
-	computed: {
-		propsWatchHelper: function() {
-			return this.mode + '#' + this.path + '#' + this.query_string;
-		}
-	},
-	mounted: function() {
-		this.srcUrl = this.buildSrcUrl();
-	},
-	watch: {
-		propsWatchHelper: function() {
-			if(this.lastLoadediFrameURL === '') {
-				return;
-			}
-
-			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
-
-			let url = this.buildSrcUrl();
-			if(this.lastLoadediFrameURL !== url) {
-				this.srcUrl = url;
-				if(this.srcUrl === url) {
-					this.$refs.compatiframe.contentWindow.location.href = url;
-				}
-			}
-		}
-	},
-	methods: {
-		buildSrcUrl: function() {
-			let url = false;
-			switch(this.mode) {
-				case 'ci':
-					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
-					break;
-				case 'legacy':
-					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
-					break;
-				default:
-					url = false;
-			}
-			if(this.query_string !== '' && url) {
-				url += '?' + this.query_string;
-			}
-
-			return url;
-		},
-		loadHandler: function() {
-			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
-			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
-			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
-			let routerpath = null;
-
-			this.lastLoadediFrameURL = iframe_href;
-
-			if(iframe_href.startsWith(ci_urlstart)) {
-				routerpath = iframe_href.replace(
-					ci_urlstart, '/Cis/Compat/ci/');
-			} else if(iframe_href.startsWith(legacy_urlstart)) {
-				routerpath = iframe_href.replace(
-					legacy_urlstart, '/Cis/Compat/legacy/');
-			} else {
-				return;
-			}
-
-			if(this.$route.fullPath !== routerpath) {
-				this.$router.push(routerpath);
-			}
-		}
-	},
-	template: `
-		<div class="w-100">
-			<iframe
-				ref="compatiframe"
-				v-if="srcUrl"
-				:src="srcUrl"
-				@load="loadHandler"
-				style="width:100%; height:90vh; border:0; display:block;"
-			></iframe>
-		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
-		</div>
-	`
-};

public/js/components/Cis/Menu/Entry.js

@@ -1,10 +1,5 @@
-import CisMenuLink from "./Link.js";
-
 export default {
     name: 'CisMenuEntry',
-	components: {
-		CisMenuLink
-	},
     props: {
         entry: Object,
         level: {
@@ -175,7 +170,7 @@ export default {
     <template v-else>
         <template v-if="hasChilds">
 			<div class="btn-group w-100">
- 				<cis-menu-link :target="target"
+ 				<a :target="target" 
  					:href="(entry.menu_open && hasFullLink) ? entry.url : null"
 					@click="toggleCollapse"
                     :class="{
@@ -184,7 +179,7 @@ export default {
 						'fw-bold':active
                     }">
                     {{ entry.titel }}
-                </cis-menu-link>
+                </a>
                 <button @click.prevent="toggleCollapse" :aria-expanded="entry.menu_open"
                     :class="{
                         'btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0': true,
@@ -198,7 +193,7 @@ export default {
                 <cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
             </ul>
         </template>
-		<cis-menu-link v-else
+		<a v-else
             :href="entry.url"
             :target="target"
             :class="{
@@ -208,6 +203,6 @@ export default {
             }"
             @mouseup="setActiveEntry(entry.content_id)">
             {{ entry.titel }}
-        </cis-menu-link>
+        </a>
     </template>`
 };

public/js/components/Cis/Menu/Link.js

@@ -1,38 +0,0 @@
-import {isCompatLink, calcCompatRouterLink} from '../../../helpers/CompatLinkHelpers.js';
-
-export default {
-	name: 'CisMenuLink',
-	props: {
-		href: {
-			type: [String, null],
-			default: null
-		}
-	},
-	methods: {
-		isRouterHandled() {
-			let isrouterhandled = this.$route.matched.length > 0;
-			return isrouterhandled;
-		},
-		isCompatLink() {
-			if(this.href === null) {
-				return false;
-			}
-			return isCompatLink(this.href);
-		},
-		calcCompatRouterLink() {
-			return calcCompatRouterLink(this.href);
-		}
-	},
-	template: `
-		<router-link v-if="this.isRouterHandled() && this.isCompatLink()"
-			:to="this.calcCompatRouterLink()"
-		>
-			<slot></slot>
-		</router-link>
-		<a v-else 
-			:href="this.href"
-		>
-			<slot></slot>
-		</a>
-	`
-};

public/js/components/Cis/Mylv/LvMenu.js

@@ -1,6 +1,5 @@
 
 export default {
-	name: 'LvMenu',
 	props:{
 		menu:{
 			type:Array,

public/js/components/Cis/Mylv/LvUebersicht.js

@@ -4,7 +4,7 @@ import LvMenu from "./LvMenu.js";
 import ApiAddons from '../../../api/factory/addons.js';
 
 export default  {
-	name: 'LvUebersicht',
+  
     props:{
         event:{
             type:Object,

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

@@ -1,7 +1,6 @@
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiRoomPlan from '../../../api/factory/calendar/roomPlan.js';
 
 export const DEFAULT_MODE_RAUMINFO_MOBILE = 'List';
 export const DEFAULT_MODE_RAUMINFO_DESKTOP = 'Week';
@@ -25,36 +24,6 @@ export default {
 			return this.propsViewData?.mode || defaultMode;
 		}
 	},
-	data() {
-		return {
-			filteredGroups: [],
-			abortController: null,
-			createContext: {
-				scope: 'slot_room',
-				show_all_fields: false,
-				room_create_information: {
-					semester: [1, 2, 3, 4, 5, 6, 7, 8],
-						verband: ['A', 'B', 'C', 'D', 'E', 'F', 'V'],
-					gruppe: [1, 2, 3, 4],
-					studiengaenge: [],
-					searchGroup: this.searchGroup,
-					searchLektor: this.searchLektor,
-				},
-			}
-		}
-	},
-	created() {
-
-		this.$api.call(ApiRoomPlan.getRoomCreationInfo())
-			.then(result => result.data)
-			.then(result => {
-				if (result.berechtigt)
-				{
-					this.createContext.room_create_information.studiengaenge = result.studiengaenge
-				}
-				this.createContext.show_all_fields = result.berechtigt;
-			});
-	},
 	methods:{
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
@@ -72,81 +41,8 @@ export default {
 				}
 			});
 		},
-		async handleCreateEvent(event)
-		{
-			event.ort_kurzbz = this.propsViewData.ort_kurzbz;
-			this.$api.call(ApiRoomPlan.addRoomReservation(event));
-			this.$refs.calendar.resetEventLoader();
-			this.$refs.calendar.closeModal();
-		},
-		async handleDeleteEvent(event)
-		{
-			if (event.type !== 'reservierung')
-				return;
-
-			if (luxon.DateTime.fromISO(`${event.datum}T${event.beginn}`) < luxon.DateTime.now())
-				return;
-
-			this.$api.call(ApiRoomPlan.deleteRoomReservation(event.reservierung_id));
-
-			this.$refs.calendar.reset();
-
-		},
-		async searchGroup(event)
-		{
-			const query = event.query.trim();
-
-			if (query.length < 2)
-				return [];
-
-			if (this.abortController)
-				this.abortController.abort();
-
-			this.abortController = new AbortController();
-			const signal = this.abortController.signal;
-
-			return this.$api.call(ApiRoomPlan.getGruppen(query), { signal })
-				.then(result => {
-					return result.data.map(gruppe => ({
-							label: gruppe.bezeichnung
-								? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
-								: gruppe.gruppe_kurzbz.trim(),
-							gid: gruppe.gid,
-							gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
-							lehrverband: gruppe.lehrverband,
-						})
-					);
-				})
-				.catch((e)=> {
-					this.$fhcAlert.handleSystemError(e)
-					return []
-				})
-		},
-		async searchLektor(event)
-		{
-			const query = event.query.trim();
-
-			if (query.length < 2)
-				return [];
-
-			if (this.abortController)
-				this.abortController.abort();
-
-			this.abortController = new AbortController();
-			const signal = this.abortController.signal;
-
-			return this.$api.call(ApiRoomPlan.getLektor(query), { signal })
-				.then(result => {
-					return result.data.map(lektor => ({
-							label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
-							uid: lektor.uid
-						})
-					)})
-				.catch(this.$fhcAlert.handleSystemError)
-		},
 		getPromiseFunc(start, end) {
 			return [
-				this.$api.call(ApiRoomPlan.getReservableMap(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
 				this.$api.call(ApiLvPlan.getRoomInfo(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
 				this.$api.call(ApiLvPlan.getOrtReservierungen(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
 			];
@@ -161,12 +57,8 @@ export default {
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
-			:reservierbar="true"
-			:create-context="createContext"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
-			@create-event="handleCreateEvent"
-			@delete-event="handleDeleteEvent"
 			class="responsive-calendar"
 		></fhc-calendar>
 	</div>`

public/js/components/Cis/Mylv/Semester.js

@@ -1,7 +1,6 @@
 import MylvSemesterStudiengang from "./Semester/Studiengang.js";
 
 export default {
-	name: 'Semester',
 	components: {
 		MylvSemesterStudiengang
 	},
@@ -44,4 +43,4 @@ export default {
 	<div class="mylv-semester text-center" v-else>
 		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 	</div>`
-};
+};

public/js/components/Cis/Mylv/Semester/Studiengang.js

@@ -2,10 +2,7 @@ import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
 import MylvSemesterStudiengangAverageGrade from "./Studiengang/AverageGrade.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
-import ApiAuthinfo from '../../../../api/factory/authinfo.js';
-
 export default {
-	name: 'Studiengang',
 	components: {
 		MylvSemesterStudiengangLv,
 		MylvSemesterStudiengangAverageGrade
@@ -21,11 +18,6 @@ export default {
 		lvs: Array,
 		sg_bezeichnung_eng: String
 	},
-	data() {
-		return {
-			isAverageGradeDisplayed: false,
-		}
-	},
 	computed: {
 		lehrveranstaltungen() {
 			return [... new Map(
@@ -41,17 +33,9 @@ export default {
 		note(lv) {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
 		},
-		async checkIfAverageGradeIsDisplayed() {
-			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
-			const authInfo = authInfoResponse.data;
-			this.isAverageGradeDisplayed = !!authInfo.isStudent;
-		},
 	},
-	created() {
-		this.checkIfAverageGradeIsDisplayed();
-	},
-	template: `
-	<div class="card mb-3">
+	template: `<div class="card mb-3">
+
 		<div class="card-body">
 			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>
@@ -61,7 +45,7 @@ export default {
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
-			<mylv-semester-studiengang-average-grade v-if="isAverageGradeDisplayed" :semesterInfo="$props.semesterInfo" />
+			<mylv-semester-studiengang-average-grade :semesterInfo="$props.semesterInfo" />
 		</div>
 	</div>`
-};
+};

public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js

@@ -1,18 +1,23 @@
 import LvPruefungen from "./Lv/Pruefungen.js";
+import LvInfo from "./Lv/Info.js";
+import Phrasen from "../../../../../mixins/Phrasen.js";
+import LvUebersicht from "../../LvUebersicht.js";
 
 import ApiLehre from '../../../../../api/factory/lehre.js';
 import ApiAddons from '../../../../../api/factory/addons.js';
 
-import {isCompatLink, calcCompatRouterLink} from '../../../../../helpers/CompatLinkHelpers.js';
-
 // TODO(chris): L10n
 
 export default {
-	name: 'Lv',
-	inject: ['studien_semester', 'type'],
+	components:{
+		LvUebersicht,
+	},
+	mixins: [
+		Phrasen
+	],
+	inject: ['studien_semester'],
 	props: {
-		lehrveranstaltung_id: [Number, String],
-		semesterstunden: [Number, String],
+		lehrveranstaltung_id: Number,
 		bezeichnung: String,
 		bezeichnung_eng: String,
 		module: String,
@@ -30,8 +35,7 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String,
-		menu: [Array, String]
+		note_index: String
 	},
 	provide() {
 		return {
@@ -42,6 +46,7 @@ export default {
 		return {
 			pruefungenData: null,
 			info: null,
+			menu: null,
 			preselectedMenuItem: null,
 		}
 	},
@@ -65,6 +70,12 @@ export default {
 		emptyMenu(){
 			return !this.menu || !Array.isArray(this.menu) || Array.isArray(this.menu) && this.menu.length == 0;
 		},
+		bodyStyle() {return {};
+			/*const bodyStyle = {};
+			if (this.farbe)
+				bodyStyle['background-color'] = '#' + this.farbe;
+			return bodyStyle;*/
+		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
 			// no more showing of grade LV, if grade Zeugnis is not existing yet
@@ -78,6 +89,7 @@ export default {
 		},
 	},
 	methods: {
+		
 		fetchMenu(lehrveranstaltung_id = this.lehrveranstaltung_id, studien_semester = this.studien_semester) {
 			return this.$api
 				.call(ApiAddons.getLvMenu(lehrveranstaltung_id, studien_semester))
@@ -89,18 +101,28 @@ export default {
 					this.menu = [];
 				});
 		},
-		c4_target(menuItem) {
-			if (menuItem.c4_moodle_links?.length > 0) return null;
-			return menuItem.c4_target ?? null;
-		},
+
 		c4_link(menuItem) {
 			if (!menuItem) return null;
 			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
 				return '#';
-			} else {
+			}
+			else {
 				return menuItem.c4_link ?? null;
 			}
 		},
+		openLvOption(menuItem){
+			if (menuItem.id == "core_menu_mailanstudierende"){
+				window.location.href = menuItem.c4_link;
+			} else if (menuItem.id == "core_menu_digitale_anwesenheitslisten") {
+				window.location.href = menuItem.c4_link;
+			} else{
+				this.preselectedMenuItem = menuItem;
+				Vue.nextTick(() => {
+					this.$refs.lvUebersicht.show();
+				});
+			}
+		},
 		openPruefungen() {
 			if (!this.LvHasPruefungenInformation) return;
 
@@ -109,76 +131,74 @@ export default {
 				bezeichnung: this.bezeichnung
 			});
 		},
-		isCompatLink(link) {
-			return isCompatLink(link);
-		},
-		calcCompatRouterLink(link) {
-			return calcCompatRouterLink(link);
+		openInfos() {
+			if (!this.info) {
+				this.info = true;
+				// TODO(chris): load all this params on ajax?
+				LvInfo.popup({
+					lehrveranstaltung_id: this.lehrveranstaltung_id, 
+					bezeichnung: this.bezeichnung,
+					bezeichnung_eng: this.bezeichnung_eng,
+					studiengang_kuerzel: this.studiengang_kuerzel,
+					semester: this.semester,
+					studien_semester: this.studien_semester,
+					orgform_kurzbz: this.orgform_kurzbz,
+					sprache: this.sprache,
+					ects: this.ects,
+					incoming: this.incoming
+				}).then(() => this.info = false).catch(() => this.info = false);
+			}
+		}
+	},
+	watch:{
+		studien_semester(newValue){
+			this.fetchMenu(this.lehrveranstaltung_id, newValue);
 		}
 	},
 	created() {
-		if(this.type == 'student') {
-			this.$api
-				.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
-				.then(res => res.data)
-				.then(pruefungen => {
-					this.pruefungenData = pruefungen;
-				});
-		}
+		this.$api
+			.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
+			.then(res => res.data)
+			.then(pruefungen => {
+				this.pruefungenData = pruefungen;
+			}); 
 	},
-	template: /*html*/`
-	<div class="mylv-semester-studiengang-lv card">
+	mounted() {
+		this.fetchMenu(this.lehrveranstaltung_id, this.studien_semester);
+	},
+	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
+		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
+			lehrveranstaltung_id: lehrveranstaltung_id,
+			studiensemester_kurzbz:studien_semester,
+			lehrfach_bez:studien_semester,
+			stg_kurzbzlang:studien_semester,
+		}"/>
+
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
 			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
-		<div v-if="!emptyMenu" class="card-body ">
+		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
 			<template v-if="menu">
 				<ul class="list-group border-top-0 border-bottom-0 rounded-0">
-					<li :type="menuItem.c4_link ? 'button' : null" 
-						v-for="(menuItem, index) in menu" :key="index" class="list-group-item border-0 " >
-						<div class="d-flex flex-row">
+					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 " >
+						<div class="d-flex flex-row"  :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null">
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a :id="menuItem.name"
+							<a
 							class="fhc-body text-decoration-none text-truncate"
-							:class="{ 'unavailable':!menuItem.c4_link }"
+							:id="'moodle_links_'+lehrveranstaltung_id"
+							:class="{ 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
 							</a>
-							
-							<div v-if="(menuItem.c4_moodle_links?.length || menuItem.c4_linkList?.length) && menuItem.c4_link" class="dropdown">
-								<button 
-									class="btn btn-sm dropdown-toggle dropdown-toggle-split border-0" 
-									type="button" 
-									data-bs-toggle="dropdown" 
-									aria-expanded="false">
-									<span class="visually-hidden">Toggle Dropdown</span>
-								</button>
-					
-								<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu dropdown-menu p-0">
-									<li v-for="item in menuItem.c4_moodle_links" :key="item.url">
-									   <a class="dropdown-item border-bottom" :href="item.url" target="#">{{ item.lehrform }}</a>
-									</li>
-								</ul>
-								
-								<ul v-else class="dropdown-menu dropdown-menu p-0">
-									<li v-for="([text, link], i) in menuItem.c4_linkList" :key="i">
-										<template v-if="this.isCompatLink(link)">
-											<router-link 
-												class="dropdown-item border-bottom"
-												:to="this.calcCompatRouterLink(link)"
-											>{{ text }}</router-link>
-										</template>
-										<a v-else="" class="dropdown-item border-bottom" :href="link" target="#">{{ text }}</a>
-									</li>
-								</ul>
 							</div>
-				
-					   </div>
+							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
+								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
+							</ul>
 					</li>
 				</ul>
 			</template>
@@ -188,31 +208,16 @@ export default {
 				</div>
 			</template>
 		</div>
-		<div v-if="!emptyMenu && type == 'student'" class="card-footer">
-			<div class="row">
-				<!-- template for the LV if there are multiple pruefungen -->
-				<template v-if="LvHasPruefungenInformation">
-					<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
-						<i class="fa fa-check text-success" v-if="positiv"></i>
-						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || $p.t('lehre/noGrades') }}</span>
-						<i class="fa fa-circle-info ms-1"></i>
-					</a>
-				</template>
-				<!-- template for the LV with no pruefungen -->
-				<template v-else>
-					<span  class="col-auto text-start text-decoration-none" >
-						<i class="fa fa-check text-success" v-if="positiv"></i>
-						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || $p.t('lehre/noGrades') }}</span>
-					</span>
-				</template>
-			</div>
-		</div>
-		<div v-else-if="!emptyMenu && type == 'employee'" class="card-footer">
-			<div class="row">
-				<div class="col-auto">
-					<span class="ps-1">{{ $p.t('lehre/semesterstunden') }}: {{ semesterstunden }}</span>
-				</div>
+		<div v-if="!emptyMenu" class="card-footer">
+			<div
+				@click.prevent="openPruefungen()"
+				:type="LvHasPruefungenInformation ? 'button' : ''"
+				class="d-flex flex-row align-items-center gap-1"
+			>
+				<i class="fa fa-check text-success" v-if="positiv"></i>
+				<span :style="'color:'+gradeColor">{{ grade || $p.t('lehre/noGrades') }}</span>
+				<i v-if="LvHasPruefungenInformation" class="fa fa-circle-info ms-1"></i>
 			</div>
 		</div>
 	</div>`
-};
+};

public/js/components/Cis/Mylv/Student.js

@@ -1,37 +1,25 @@
-import MylvSemesterCards from "./Semester.js";
-import MylvTable from "./Table.js";
-import ApiAddons from "../../../api/factory/addons.js"
+import MylvSemester from "./Semester.js";
+import Phrasen from "../../../mixins/Phrasen.js";
 
 // TODO(chris): phrase: global/studiensemester_auswaehlen
 // TODO(chris): phrase: next & prev +aria-label
 
 export default {
-	name: 'MyLv',
 	components: {
-		MylvSemesterCards,
-		MylvTable
+		MylvSemester
 	},
+	mixins: [
+		Phrasen
+	],
 	data: () => {
 		return {
 			firstLoad: true,
 			studiensemester: null,
 			lvs: {},
-			currentSemester: null,
-			mode: localStorage.getItem('myLvaDefaultMode') ?? 'cards'
+			currentSemester: null
 		};
 	},
-	provide() {
-		return {
-			type: Vue.computed(() => this.type),
-		}
-	},
-	inject: ['isStudent', 'isMitarbeiter'],
 	computed: {
-		type() {
-			if(this.isStudent) return 'student'
-			if(this.isMitarbeiter) return 'employee'
-			return null
-		},
 		ready() {
 			return this.studiensemester !== null && (!this.firstLoad || this.current.lvs !== null);
 		},
@@ -46,22 +34,7 @@ export default {
 				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Lvs/' + this.currentSemester).then(res => {
 					this.lvs[this.currentSemester].lvs = res.data.retval || [];
 					this.firstLoad = false;
-					
-					this.lvs[this.currentSemester].lvs.forEach(lv=>{
-
-						this.$api.call(ApiAddons.getLvMenu(lv.lehrveranstaltung_id, this.currentSemester)).then(res => {
-							if(res.data) {
-								
-								const lvProp = this.lvs[this.currentSemester].lvs.find(lv2 => lv2.lehrveranstaltung_id == lv.lehrveranstaltung_id)
-								lvProp.menu = res.data
-								
-							}
-						})
-						
-					})
-					
-
-				})
+				});
 			}
 			return this.lvs[this.currentSemester];
 		},
@@ -94,10 +67,6 @@ export default {
 		}
 	},
 	methods: {
-		clickMode(evt, mode) {
-			localStorage.setItem('myLvaDefaultMode', mode)
-			this.mode = mode
-		},
 		prevSem() {
 			this.$refs.studiensemester.selectedIndex--;
 			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
@@ -130,7 +99,7 @@ export default {
 	<div>
 		<h2>{{$p.t('lehre/myLV')}}</h2>
 		<hr>
-		<div class="mylv" v-if="ready">
+		<div class="mylv-student" v-if="ready">
 			<div v-if="currentSemester" class="row justify-content-center mb-3">
 				<div class="col-auto d-none">
 					<label class="col-form-label">{{$p.t('lehre/studiensemester')}}</label>
@@ -148,35 +117,14 @@ export default {
 						</button>
 					</div>
 				</div>
-				<div class=" col-auto my-lva-modes">
-					<div class="d-flex gap-1 justify-content-end" role="group">
-						<button
-							type="button"
-							class="btn btn-outline-secondary"
-							:class="{active: mode === 'cards'}"
-							@click="clickMode($event, 'cards')"
-						>
-							<i class="fa fa-grip"></i>
-						</button>
-						<button
-							type="button"
-							class="btn btn-outline-secondary"
-							:class="{active: mode === 'table'}"
-							@click="clickMode($event, 'table')"
-						>
-							<i class="fa fa-table"></i>
-						</button>
-					</div>
-				</div>
 			</div>
 			<div class="alert alert-danger" role="alert" v-else>
 				{{$p.t('lehre/noLvFound')}}
 			</div>
-			<mylv-semester-cards v-if="mode == 'cards'" v-bind="current"/>
-			<mylv-table v-else-if="mode == 'table'" v-bind="current"/>
+			<mylv-semester v-bind="current"/>
 		</div>
-		<div class="mylv text-center" v-else>
+		<div class="mylv-student text-center" v-else>
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>`
-};
+};

public/js/components/Cis/Mylv/Table.js

@@ -1,345 +0,0 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
-
-export default {
-	name: 'MylvTable',
-	components: {
-		CoreFilterCmpt
-	},
-	props: {
-		semester: [String],
-		lvs: Array,
-	},
-	data() {
-		return {
-			phrasenPromise: null,
-			phrasenResolved: false,
-			tabulatorUuid: null,
-			tableBuiltResolve: null,
-			tableBuiltPromise: null,
-			mylvTableOptions: {
-				height: Vue.ref(400),
-				index: 'lehrveranstaltung_id',
-				layout: 'fitDataStretch',
-				placeholder: this.$p.t('global/noDataAvailable'),
-				columns: [
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/studiengang'))), field: 'sg_bezeichnung', widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('global/bezeichnung'))), field: 'bezeichnung', widthGrow: 2},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/orgform'))), field: 'orgform_kurzbz', widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/kurzbz'))), field: 'studiengang_kuerzel', widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/semesterstunden'))), field: 'semesterstunden', 
-						bottomCalc: this.semesterstundenCalc, widthGrow: 1, visible: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('global/actions'))), headerSort: false,
-						field: 'menu', formatter: this.actionFormatter, widthGrow: 1, tooltip: this.spoofingFunc}
-				],
-				persistence: false,
-				persistenceID: "mylv_2026_04_17"
-			},
-			mylvTableEventHandlers: [
-				
-			]
-		}
-	},
-	computed: {
-		ready() { return this.lvs !== null; },
-	},
-	methods: {
-		semesterstundenCalc(values, data) {
-			let sum = 0
-			values.forEach(val => {
-				sum += Number(val)
-			})
-			return sum
-		},
-		spoofingFunc() {
-			// intentionally send empty tooltip info so tabulator tooltip doesnt get rendered but hover event propagates
-			// to individual button tooltips
-			return ''
-		},
-		c4_link(menuItem) {
-			if (!menuItem) return null;
-			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
-				return '#';
-			} else {
-				return menuItem.c4_link ?? null;
-			}
-		},
-		handleUuidDefined(uuid) {
-			this.tabulatorUuid = uuid
-		},
-		tableResolve(resolve) {
-			this.tableBuiltResolve = resolve
-		},
-		actionFormatter(cell) {
-			let container = document.createElement('div');
-			container.className = "d-flex gap-2";
-
-			const data = cell.getData()
-			if(data.menu && data.menu.length) {
-				
-				container.className = "d-flex flex-wrap gap-2"
-
-				data.menu.forEach((lvLink) => {
-					// render dropdown if we have a link and some some linklist
-					const hasDropdown = (lvLink.c4_moodle_links?.length || lvLink.c4_linkList?.length) && lvLink.c4_link;
-
-					if (hasDropdown) {
-						// button group
-						const group = document.createElement('div');
-						group.className = 'btn-group';
-
-						// main action button
-						const button= this.createActionButton(lvLink)
-
-						// toggle button
-						const toggle = document.createElement('button');
-						toggle.className = 'btn btn-sm dropdown-toggle dropdown-toggle-split border-0';
-						toggle.type = 'button';
-						toggle.dataset.bsToggle = 'dropdown'; // uses absolute position which gets clipped by tabulator
-						toggle.ariaExpanded = 'false';
-						toggle.innerHTML = '<span class="visually-hidden">Toggle Dropdown</span>';
-
-						// dropdown menu
-						const dropMenu = document.createElement('ul');
-						dropMenu.className = 'dropdown-menu dropdown-menu p-0';
-						
-						// moodle links have priority to be dropdown items but both can be!
-						const items = lvLink.c4_moodle_links?.length
-							? lvLink.c4_moodle_links.map(item => ({ text: item.lehrform, href: item.url }))
-							: lvLink.c4_linkList.map(([text, link]) => ({ text, href: link }));
-						
-						
-						items.forEach(({ text, href }) => {
-							const li = document.createElement('li');
-							const a = document.createElement('a');
-							a.className = 'dropdown-item border-bottom';
-							a.href = href;
-							a.target = '#';
-							a.textContent = text;
-							li.appendChild(a);
-							dropMenu.appendChild(li);
-						});
-
-						group.appendChild(button);
-						group.appendChild(toggle);
-						group.appendChild(dropMenu);
-						container.appendChild(group);
-						
-					} else {
-						container.appendChild(this.createActionButton(lvLink));
-					}
-
-				})
-				
-			}
-
-			return container;
-		},
-		createActionButton(lvLink){
-			const button = document.createElement('a');
-			button.className = 'fhc-body text-decoration-none text-truncate';
-			if (!lvLink.c4_link) button.classList.add('unavailable');
-			button.id = `${lvLink.name}_${lvLink.lehrveranstaltung_id}`;
-
-			const icon = lvLink.c4_icon2 ?? 'fa-solid fa-pen-to-square';
-			const label = lvLink.phrase ? this.$p.t(lvLink.phrase) : lvLink.name;
-			button.title = label;
-			button.innerHTML = `<i class="${icon}"></i><span style="margin-left:2px;">${label}</span>`;
-
-			button.addEventListener('click', (event) => {
-				event.preventDefault();
-				const url = this.c4_link(lvLink);
-				if (url) {
-					const target = lvLink.c4_target || '_blank';
-					if (target === '_blank') {
-						window.open(url, '_blank', 'noopener,noreferrer');
-					} else {
-						window.location.href = url;
-					}
-				} else {
-					console.warn("Link is unavailable for:", lvLink.name);
-				}
-			});
-			return button
-		},
-		loadState() {
-			return JSON.parse(localStorage.getItem(this.mylvTableOptions.persistenceID) || "null");
-		},
-		saveState(table) {
-			// avoid storing state after first restore part happened
-			if(!this.stateRestored) return
-			const rawLayout = table.getColumnLayout();
-			const state = {
-				columns: rawLayout.map(col => ({
-					field: col.field,
-					visible: col.visible,
-					width: col.width,
-				})),
-				sort: table.getSorters().map(s => ({
-					field: s.field,
-					dir: s.dir,
-				})),
-				filters: table.getFilters(),
-				headerFilters: table.getHeaderFilters()
-			};
-
-			localStorage.setItem(this.mylvTableOptions.persistenceID, JSON.stringify(state));
-		},
-		handleTableBuilt() {
-			const table = this.$refs.mylvTable.tabulator
-
-			this.tableBuiltResolve()
-
-			table.on("columnMoved", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnResized", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnVisibilityChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("filterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("headerFilterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("dataSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("sortersChanged", () => {
-				this.saveState(table);
-			});
-
-			const saved = this.loadState();
-
-			table.on("renderComplete", () => {
-				if(!this.stateRestored) {
-
-					if (saved?.columns && !this.colLayoutRestored) {
-						const layout = saved.columns.map(col => ({
-							field: col.field,
-							width: col.width,
-							visible: col.visible,
-							// add more if needed, but keep it simple
-						}));
-
-						table.setColumnLayout(layout);
-
-						this.colLayoutRestored = true;
-					}
-
-					if (saved?.filters && !this.filtersRestored) {
-						this.filtersRestored = true // instantly avoid retriggers
-						table.setFilter(saved.filters);
-					}
-					if (saved?.headerFilters && !this.headerFiltersRestored) {
-						this.headerFiltersRestored = true // instantly avoid retriggers
-						for (let hf of saved.headerFilters) {
-							table.setHeaderFilterValue(hf.field, hf.value);
-						}
-					}
-
-					if (saved?.sort?.length && !this.sortRestored) {
-						this.sortRestored = true;
-
-						setTimeout(() => {
-							const sortList = saved.sort.map(s => {
-								const col = table.columnManager.findColumn(s.field);
-								if (!col) {
-									return null;
-								}
-								return { column: col, dir: s.dir };
-							}).filter(Boolean);
-
-							table.setSort(sortList);
-						}, 100);
-					}
-					this.stateRestored = true
-
-				}
-
-			});
-		},
-		async setupData() {
-			this.$refs.mylvTable.tabulator.setData(this.lvs);
-		},
-		async setupMounted() {
-			this.tableBuiltPromise = new Promise(this.tableResolve)
-			await this.tableBuiltPromise
-			
-			this.setupData()
-			
-			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
-			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
-			if(!tableDataSet) return
-			const rect = tableDataSet.getBoundingClientRect();
-
-			const h = window.visualViewport.height - rect.top - 50
-			if(this.$refs.mylvTable) {
-				this.$refs.mylvTable.$refs.table.style.setProperty('height', h+'px')
-
-				// necessary so the wrapping action row resolves to the full rowHeight required
-				// without the redraw here actions past the initial rowHeight would be clipped off
-				this.$refs.mylvTable.tabulator.redraw(true)
-			}
-
-		}
-	},
-	created() {
-		this.phrasenPromise = this.$p.loadCategory(['global', 'lehre', 'lvinfo'])
-		this.phrasenPromise.then(()=> {this.phrasenResolved = true})	
-	},
-	mounted() {
-		this.setupMounted()	
-	},
-	watch: {
-		lvs: {
-			async handler(newVal) {
-				await this.tableBuiltPromise;
-				if(!this.$refs.mylvTable?.tabulator) return
-				
-				this.$refs.mylvTable.tabulator.setData(newVal);
-
-				const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
-				const tableDataSet = document.getElementById('filterTableDataset' + tableID);
-				if(!tableDataSet) return
-				const rect = tableDataSet.getBoundingClientRect();
-
-				const h = window.visualViewport.height - rect.top - 50
-				if(this.$refs.mylvTable) {
-					this.$refs.mylvTable.$refs.table.style.setProperty('height', h+'px')
-				}
-			},
-			deep: true
-		}
-	},
-	template: `
-	<div class="mylv-semester-table" v-if="ready">
-		 <core-filter-cmpt
-			v-if="phrasenResolved"
-			@uuidDefined="handleUuidDefined"
-			:title="''"
-			ref="mylvTable"
-			:tabulator-options="mylvTableOptions"
-			:tabulator-events="mylvTableEventHandlers"
-			@tableBuilt="handleTableBuilt"
-			tableOnly
-			:sideMenu="false"
-		 />
-	</div>
-	<div v-if="tabulatorUuid === null" class="text-center d-flex justify-content-center align-items-center h-100" >
-		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-	</div>
-	`
-};

public/js/components/Cis/Profil/MitarbeiterProfil.js

@@ -476,7 +476,7 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- Bearbeiten Button -->
-            <div v-if="isEditable" class="row d-none d-md-block ">
+            <div class="row d-none d-md-block ">
                 <div class="col mb-3">
                     <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">

public/js/components/Cis/Profil/MitarbeiterViewProfil.js

@@ -43,7 +43,6 @@ export default {
 						maxWidth: 40,
 						headerClick: this.collapseFunction,
 						visible: true,
-						responsive: 0,
 					},
 					{
 						title: "placeholder",
@@ -52,7 +51,6 @@ export default {
 						headerFilter: true,
 						minWidth: 200,
 						visible: true,
-						responsive: 0,
 					},
 					{
 						title: "placeholder",
@@ -61,7 +59,6 @@ export default {
 						headerFilter: true,
 						minWidth: 200,
 						visible: true,
-						responsive: 1,
 					},
 					{
 						title: "placeholder",
@@ -74,7 +71,6 @@ export default {
 						visible: true,
 						formatter: "datetime",
 						formatterParams: this.datetimeFormatterParams(),
-						responsive: 4,
 					},
 					{
 						title: "placeholder",
@@ -87,7 +83,6 @@ export default {
 						visible: true,
 						formatter: "datetime",
 						formatterParams: this.datetimeFormatterParams(),
-						responsive: 3,
 					},
 					{
 						title: "placeholder",
@@ -96,7 +91,6 @@ export default {
 						headerFilter: true,
 						minWidth: 200,
 						visible: true,
-						responsive: 2,
 					},
 				],
 			},

public/js/components/Cis/Profil/Profil.js

@@ -171,11 +171,12 @@ export const Profil = {
 			const data = viewDataResult.data;
 			if (!data) return;
 
-			this.isEditable = data.editable;
 			this.view = data.profil_data.view;
+			this.isEditable = data.profil_data.editable;
 			this.data = data.profil_data.data;
 			this.calendarSyncUrls = data.calendar_sync_urls ?? [];
 			this.authPermissions = data.permissions;
+			console.log(data.profil_data);
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {

public/js/components/Cis/Profil/StudentProfil.js

@@ -273,14 +273,14 @@ export default {
     <div class="row">
         <div  class="d-md-none col-12 ">
 			<!-- Bearbeiten Button -->
-			<div v-if="isEditable" class="row">
-				<div class="col mb-4">
+			<div v-if="isEditable" class="row ">
+				<div class="col mb-3">
 					<button @click="showEditProfilModal" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
-							<div class="col-auto">
+							<div class="col-2">
 								<i class="fa fa-edit"></i>
 							</div>
-							<div class="col-auto">{{$p.t('ui','bearbeiten')}}</div>
+							<div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
 						</div>
 					</button>
 				</div>
@@ -400,7 +400,7 @@ export default {
 					@tableBuilt="zutrittsgruppenTableBuilt" 
 					:title="$p.t('profil','zutrittsGruppen')" 
 					ref="zutrittsgruppenTable" 
-					:tabulator-options="zutrittsgruppen_table_options"
+					:tabulator-options="zutrittsgruppen_table_options"  
 					tableOnly 
 					:sideMenu="false" 
 					noColumnFilter />
@@ -411,14 +411,14 @@ export default {
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
 			<!-- Bearbeiten Button -->
-			<div v-if="isEditable" class="row d-none d-md-block">
+			<div class="row d-none d-md-block">
 				<div class="col mb-3">
 					<button @click="()=>showEditProfilModal()" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
-							<div class="col-auto">
+							<div class="col-2">
 								<i class="fa fa-edit"></i>
 							</div>
-							<div class="col-auto">{{$p.t('ui','bearbeiten')}}</div>
+							<div class="col-10">{{$p.t('ui','bearbeiten')}}</div>
 						</div>
 					</button>
 				</div>

public/js/components/Cis/ProjektabgabeUebersicht/ProjektabgabeUebersicht.js

@@ -1,339 +0,0 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
-import ApiPaabgabe from '../../../api/factory/paabgabeUebersicht.js'
-import Loader from "../../Loader.js";
-
-export const ProjektabgabeUebersicht =  {
-	name: "ProjektabgabeUebersicht",
-	components: {
-		CoreFilterCmpt,
-		Loader
-	},
-	data() {
-		return {
-			phrasenPromise: null,
-			phrasenResolved: false,
-			tabulatorUuid: Vue.ref(0),
-			tableBuiltResolve: null,
-			tableBuiltPromise: null,
-			studiengaenge: null,
-			abgabetypen: null,
-			termine: null,
-			abgaben: null,
-			defaultStudiengang: {
-				studiengang_kz: null,
-				kuerzel: '-'
-			},
-			defaultTyp: {
-				paabgabetyp_kurzbz: null,
-				bezeichnung: '-'
-			},
-			defaultTermin: {
-				termin: null,
-				termin_anzeige: Vue.computed(() => this.$p.t('ui/alle'))
-			},
-			selectedStudiengang: null,
-			selectedAbgabetyp: null,
-			selectedTermin: null,
-			personSearchString: null,
-			paabgabeTableOptions: {
-				height: Vue.ref(400),
-				index: 'paabgabe_id',
-				layout: 'fitColumns',
-				//~ placeholder: this.$p.t('global/noDataAvailable'),
-				columns: [
-					{
-						title: Vue.computed(() => this.$p.t('global/aktionen')), field: 'actions',
-						formatter: (cell, formatterParams, onRendered) => {
-							let container = document.createElement('div');
-							container.className = "d-flex gap-2";
-
-							let downloadButton = document.createElement('button');
-							downloadButton.className = 'btn btn-outline-secondary';
-							downloadButton.innerHTML = '<i class="fa fa-download"></i>';
-							downloadButton.title = this.$p.t('ui', 'downloadDok');
-							downloadButton.addEventListener('click', evt => {
-								evt.stopPropagation();
-								this.actionDownload(cell.getData().paabgabe_id);
-							});
-							container.append(downloadButton);
-
-							if (this.showEdit)
-							{
-								let editButton = document.createElement('button');
-								editButton.className = 'btn btn-outline-secondary';
-								editButton.innerHTML = '<i class="fa fa-edit"></i>';
-								//editButton.addEventListener('click', () =>
-									//this.$refs.edit.open(cell.getData())
-								//);
-								container.append(editButton);
-							}
-
-							return container;
-						}
-					},
-					{title: Vue.computed(() => this.$p.t('abgabetool/paabgabeid')), field: 'paabgabe_id', visible: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/projektarbeitid')), field: 'projektarbeit_id', visible: false},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/termin')),
-						field: "termin",
-						widthGrow: 1,
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-								hour12: false
-							});
-						}
-					},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetyp')), field: 'paabgabetyp_bezeichnung'},
-					{title: Vue.computed(() => this.$p.t('person/uid')), field: 'uid'},
-					{title: Vue.computed(() => this.$p.t('person/vorname')), field: 'vorname'},
-					{title: Vue.computed(() => this.$p.t('person/nachname')), field: 'nachname'},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz'},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel'},
-					{title: Vue.computed(() => this.$p.t('abgabetool/personStatus')), field: 'personStatus'},
-					{
-						title: "in Visual Library",
-						field: 'in_visual_library',
-						formatter: (cell) => {
-							return cell.getValue() ? this.$p.t('ui/ja') : this.$p.t('ui/nein');
-						}
-					}
-				],
-				persistence: false,
-			},
-			paabgabeTableEventHandlers: [{
-					event: "tableBuilt",
-					handler: async () => {
-						this.tableBuiltResolve()
-					}
-				}
-			],
-			showEdit: null,
-		};
-	},
-	methods: {
-		tableResolve(resolve) {
-			this.tableBuiltResolve = resolve
-		},
-		setupData(){
-			//~ const d = data.map(paabgabe => {
-				//~ return {
-					//~ ort_kurzbz: paabgabe.ort_kurzbz,
-					//~ bezeichnung: paabgabe.bezeichnung.replace('&amp;', '&'),
-					//~ nummer: paabgabe.planbezeichnung,
-					//~ personen: paabgabe.max_person
-				//~ }
-			//~ })
-
-			this.$refs.paabgabeTable.tabulator.setData(this.abgaben);
-		},
-		// set placeholder text for no data table
-		setNoDataPlaceholder() {
-			this.$refs.paabgabeTable.tabulatorOptions.placeholder = this.$p.t('global/noDataAvailable');
-		},
-		loadStudiengaenge() {
-			this.$api.call(ApiPaabgabe.getStudiengaenge())
-				.then(res => {
-					this.studiengaenge = res?.data ?? []
-				})
-		},
-		loadPaabgabeTypes() {
-			this.$api.call(ApiPaabgabe.getPaAbgabetypen())
-				.then(res => {
-					this.abgabetypen = res?.data ?? []
-				})
-		},
-		loadTermine() {
-			this.$api.call(ApiPaabgabe.getTermine(this.selectedStudiengang, this.selectedAbgabetyp))
-				.then(res => {
-					this.selectedTermin = null;
-					this.termine = res?.data ?? []
-			})
-		},
-		loadPaAbgaben() {
-			this.$refs.loader.show();
-
-			this.$api.call(
-				ApiPaabgabe.getPaAbgaben(this.selectedStudiengang, this.selectedAbgabetyp, this.selectedTermin, this.personSearchString)
-			)
-			.then(res => {
-				this.$refs.loader.hide();
-				this.abgaben = res?.data ?? [];
-				this.setupData(res?.data ?? []);
-			});
-		},
-		handleUuidDefined(uuid) {
-			this.tabulatorUuid = uuid
-		},
-		//~ setRoute(val) {
-			//~ // TODO: router push
-		//~ },
-		async setupMounted() {
-
-			// load data for dropdowns
-			this.loadStudiengaenge();
-			this.loadPaabgabeTypes();
-			this.loadTermine();
-
-			// wait for table to build
-			this.tableBuiltPromise = new Promise(this.tableResolve);
-			await this.tableBuiltPromise;
-
-			// data placeholder after table built so phrases are available
-			this.setNoDataPlaceholder();
-			//this.loadPaAbgaben();
-
-
-			//~ const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
-			//~ const tableDataSet = document.getElementById('filterTableDataset' + tableID);
-			//~ if(!tableDataSet) return
-			//~ const rect = tableDataSet.getBoundingClientRect();
-
-			//~ const h = window.visualViewport.height - rect.top - 100
-			//~ if(this.$refs.raumsucheTable) {
-				//~ this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
-			//~ }
-
-		},
-		actionDownload(paabgabe_id) {
-			//~ window.open(
-				//~ FHC_JS_DATA_STORAGE_OBJECT.app_root
-				//~ + FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				//~ +'/api/frontend/v1/education/paabgabeuebersicht/downloadProjektarbeit?paabgabe_id=' + encodeURIComponent(paabgabe_id),
-				//~ '_blank'
-			//~ );
-		},
-		// download zip file with all searched submission files
-		actionDownloadZip() {
-			const url = new URL(FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+'/api/frontend/v1/education/PaabgabeUebersicht/downloadZip');
-			if (this.selectedStudiengang) url.searchParams.append('studiengang_kz', this.selectedStudiengang);
-			if (this.selectedAbgabetyp) url.searchParams.append('abgabetyp_kurzbz', this.selectedAbgabetyp);
-			if (this.selectedTermin) url.searchParams.append('abgabedatum', this.selectedTermin);
-			if (this.personSearchString) url.searchParams.append('personSearchString', this.personSearchString);
-			window.open(url.toString(), '_blank');
-		},
-		async getViewData() {
-			const viewDataResponse = await this.$api.call(ApiPaabgabe.getViewData());
-			const viewData = viewDataResponse.data;
-			this.showEdit = viewData.showEdit;
-		},
-	},
-	computed: {
-		isDarkMode() {
-			return this.$theme.theme_name.value == 'dark';
-		},
-		personSearchEnabled() {
-			return this.selectedStudiengang == null && this.selectedTermin == null && this.selectedAbgabetyp == null;
-		},
-		abgabeSearchEnabled() {
-			return this.personSearchString == '' || this.personSearchString == null;
-		},
-		zipDownloadUrl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/education/PaabgabeUebersicht/downloadZip';
-		}
-	},
-	async created() {
-		await this.getViewData();
-		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global', 'person', 'ui']);
-		this.phrasenPromise.then(()=> {this.phrasenResolved = true});
-	},
-	mounted() {
-		this.setupMounted();
-	},
-	template: `
-	<h1 class="h3">{{$p.t('abgabetool/projektabgabeUebersicht')}}</h1>
-	<hr>
-	<div class="row">
-
-		<div class="col-12 col-lg-2">
-			<h6>{{ $p.t('abgabetool/studiengang') }}:</h6>
-			<select
-				ref="studiengang"
-				id="studiengangSelect"
-				v-model="selectedStudiengang"
-				class="form-select"
-				:aria-label="$p.t('abgabetool/studiengang_auswaehlen')"
-				:disabled="!abgabeSearchEnabled"
-				@change="loadTermine();"
-			>
-				<option :key="defaultStudiengang.studiengang_kz" selected :value="defaultStudiengang.studiengang_kz">{{defaultStudiengang.kuerzel}}</option>
-				<option v-for="stg in studiengaenge" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}}</option>
-			</select>
-		</div>
-
-		<div class="col-12 col-lg-2">
-			<h6>{{ $p.t('abgabetool/c4abgabetyp') }}:</h6>
-			<select
-				ref="abgabetyp"
-				id="abgabetypSelect"
-				v-model="selectedAbgabetyp"
-				class="form-select"
-				:aria-label="$p.t('abgabetool/abgabetyp_auswaehlen')"
-				:disabled="!abgabeSearchEnabled"
-				@change="loadTermine();"
-			>
-				<option :key="defaultTyp.paabgabetyp_kurzbz" selected :value="defaultTyp.paabgabetyp_kurzbz">{{defaultTyp.bezeichnung}}</option>
-				<option v-for="typ in abgabetypen" :key="typ.paabgabetyp_kurzbz" :value="typ.paabgabetyp_kurzbz">{{typ.bezeichnung}}</option>
-			</select>
-		</div>
-
-		<div class="col-12 col-lg-2">
-			<h6>{{ $p.t('abgabetool/termin') }}:</h6>
-			<select
-				ref="termin"
-				id="terminSelect"
-				v-model="selectedTermin"
-				class="form-select"
-				:aria-label="$p.t('abgabetool/termin_auswaehlen')"
-				:disabled="!abgabeSearchEnabled"
-			>
-				<option :key="defaultTermin.termin" selected :value="defaultTermin.termin">{{defaultTermin.termin_anzeige}}</option>
-				<option v-for="termin in termine" :key="termin.termin" :value="termin.termin">{{termin.termin_anzeige}}</option>
-			</select>
-		</div>
-
-		<div class="col-12 col-lg-2">
-			<h6>{{ $p.t('abgabetool/personsuche') }}:</h6>
-			<input
-				type="text"
-				name="person-search"
-				class="form-control"
-				:placeholder="'name/uid/person ID/prestudent ID'"
-				:disabled="!personSearchEnabled"
-				v-on:keyup.enter="loadPaAbgaben"
-				v-model="personSearchString"
-			/>
-		</div>
-
-		<div class="col-12 col-lg-2 align-content-end">
-			<button class="btn btn-primary border-0" @click="loadPaAbgaben">{{ $p.t('abgabetool/anzeigen') }}</button>
-		</div>
-		<div class="col-12 col-lg-2 align-content-end">
-			<button class="btn btn-secondary border-0" @click="actionDownloadZip">{{ $p.t('abgabetool/zipDownload') }}</button>
-		</div>
-
-	</div>
-
-	<core-filter-cmpt
-		v-if="phrasenResolved"
-		@uuidDefined="handleUuidDefined"
-		ref="paabgabeTable"
-		:tabulator-options="paabgabeTableOptions"
-		:tabulator-events="paabgabeTableEventHandlers"
-		tableOnly
-		:sideMenu="false"
-	 />
-
-	 <loader ref="loader" :timeout="0"></loader>
-	`
-};
-
-export default ProjektabgabeUebersicht;

public/js/components/Cis/Raumsuche/Raumsuche.js

@@ -68,8 +68,8 @@ export const Raumsuche =  {
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
-			}]
-		};
+			}
+			]};
 	},
 	computed: {
 		isDarkMode(){

public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js

@@ -10,10 +10,6 @@ export default {
 			// options: default, always, never 
 		}
 	},
-	inject: {
-		mode: "mode",
-	},
-	emits: ['delete-event'],
 	computed: {
 		tooltipString() {
 			const tooltipArray = [];
@@ -60,10 +56,6 @@ export default {
 				.fromISOTime(this.event.ende)
 				.toISOTime({ suppressSeconds: true });
 		},
-		isFutureEvent() {
-			const eventStart = luxon.DateTime.fromISO(`${this.event.datum}T${this.event.beginn}`);
-			return eventStart > luxon.DateTime.now();
-		},
 		timeSlotDisplayClasses() {
 			switch (this.$props.timeSlotDisplayBehavior) {
 				case "always":
@@ -75,14 +67,10 @@ export default {
 			}
 		},
 	},
-	methods: {
-		handleDelete() {
-			this.$emit('delete-event', this.event);
-		},
-	},
 	template: /* html */`
 	<div
-		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1 position-relative">
+		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1"
+	>
 		<div
 			v-if="!event?.allDayEvent && event?.beginn && event?.ende"
 			:class="timeSlotDisplayClasses"
@@ -92,15 +80,6 @@ export default {
 			<span>{{ end }}</span>
 		</div>
 		<div class="event-text" v-tooltip="tooltipString">
-			<button
-				v-if="isFutureEvent && event.type === 'reservierung' && event.deletable && mode !== 'Month'"
-				class="btn btn-sm btn-outline-secondary position-absolute top-0 end-0 m-1"
-				title="Löschen"
-				@click.stop="handleDelete"
-			>
-				<i class="fa-solid fa-xmark"></i>
-			</button>
-		
 			<span class="event-topic">{{ event.topic }}</span>
 			<span class="event-place">{{ event.ort_kurzbz }}</span>
 			<span

public/js/components/Cis/Renderer/Slot/roomModalContent.js

@@ -1,246 +0,0 @@
-import FormInput from '../../../Form/Input.js';
-
-export default {
-	emits: ['create-event'],
-	components: {
-		FormInput
-	},
-	inject: {
-		timeGrid: "timeGrid",
-	},
-	props: {
-		event: { type: Object, required: true },
-	},
-	data() {
-		return {
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
-			data: {},
-			filteredGroups: [],
-			filteredLektoren: [],
-			selectedStart: null,
-			selectedEnd: null,
-			title: null,
-			beschreibung: null,
-			studiengang: null,
-			semester: null,
-			verband: null,
-			gruppe: null,
-			selectedGruppe: null,
-			selectedLektoren: []
-		};
-	},
-	mounted() {
-		this.syncFromEvent(this.event);
-	},
-
-	watch: {
-		event: {
-			handler(newEvent) {
-				this.syncFromEvent(newEvent);
-			},
-			deep: true
-		}
-	},
-	methods: {
-		syncFromEvent(newEvent) {
-			if (!newEvent) return;
-
-			const startTime = newEvent.start?.setZone?.(this.timezone)?.toFormat?.('HH:mm:ss');
-			const endTime = newEvent.end?.setZone?.(this.timezone)?.toFormat?.('HH:mm:ss');
-
-			this.selectedStart = this.timeGrid.find(t => t.start === startTime)?.start || this.timeGrid[0]?.start;
-			this.selectedEnd = this.timeGrid.find(t => t.end === endTime)?.end || this.timeGrid.at(-1)?.end;
-		},
-		saveEvent() {
-			const [startHour, startMinute] = this.selectedStart.split(':').map(Number);
-			const [endHour, endMinute] = this.selectedEnd.split(':').map(Number);
-			const selectedStart = this.event.start.startOf('day').set({ hour: startHour, minute: startMinute });
-			const selectedEnd = this.event.start.startOf('day').set({ hour: endHour, minute: endMinute });
-
-			const lektoren_uid = this.selectedLektoren.map(m => m.uid)
-
-			const spezialgruppe = this.selectedGruppe?.gruppe_kurzbz;
-
-			const event = {
-				selectedStart: selectedStart,
-				selectedEnd: selectedEnd,
-				title: this.title,
-				beschreibung: this.beschreibung,
-				studiengang: this.studiengang,
-				semester: this.semester,
-				verband: this.verband,
-				gruppe: this.gruppe,
-				spezialgruppe: spezialgruppe,
-				lektoren: lektoren_uid
-			}
-
-			this.$emit('create-event', event);
-		},
-		async searchGroup(event) {
-			this.filteredGroups = await this.event.createContext.room_create_information.searchGroup(event)
-		},
-		async searchLektor(event) {
-			this.filteredLektoren = await this.event.createContext.room_create_information.searchLektor(event)
-		},
-		capitalize(text)
-		{
-			if (!text) return ''
-			return text.charAt(0).toUpperCase() + text.slice(1)
-		}
-	},
-
-	template: `
-	<div class="p-3">
-		<h5 class="mb-3">Neue Reservierung</h5>
-		<div class="row">
-			<form-input
-				:label="capitalize($p.t('ui', 'dateFrom'))"
-				type="select"
-				container-class="col-3"
-				v-model="selectedStart"
-				name="selectedStart"
-			>
-				<option
-					v-for="slot in timeGrid"
-					:value="slot.start"
-					:key="slot.id"
-				>
-					{{ slot.start }}
-				</option>
-			</form-input>
-			
-			<form-input
-				:label="capitalize($p.t('ui', 'dateTo'))"
-				type="select"
-				container-class="col-3"
-				v-model="selectedEnd"
-				name="selectedEnd"
-			>
-				<option
-					v-for="slot in timeGrid"
-					:value="slot.end"
-					:key="slot.id"
-				>
-					{{ slot.end }}
-				</option>
-			</form-input>
-		</div>
-		<div class="row">
-			<form-input
-				:label="capitalize($p.t('global', 'titel'))"
-				type="text"
-				container-class="col-3"
-				v-model="title"
-				name="title"
-			/>
-				
-			<form-input
-				:label="capitalize($p.t('global', 'beschreibung'))"
-				type="text"
-				container-class="col-4"
-				v-model="beschreibung"
-				name="Beschreibung"
-			/>
-			<form-input
-				v-if="event.createContext.show_all_fields"
-				type="autocomplete"
-				:minLength="2"
-				:label="capitalize($p.t('lehre', 'lektor'))"
-				:suggestions="filteredLektoren"
-				placeholder="Mitarbeiter hinzufügen"
-				field="label"
-				v-model="selectedLektoren"
-				container-class="col-5"
-				@complete="searchLektor"
-				multiple
-				name="lektorautocomplete"
-			>
-			</form-input>
-		</div>
-		
-		<div v-if="event.createContext.show_all_fields">
-			<div class="row">
-				<form-input
-					:label="capitalize($p.t('lehre', 'studiengang'))"
-					type="select"
-					container-class="col-3"
-					v-model="studiengang"
-					name="studiengang"
-				>
-					<option
-						v-for="studiengang in event.createContext.room_create_information.studiengaenge"
-						:value="studiengang.studiengang_kz"
-						:key="studiengang.studiengang_kz"
-					>
-						{{ studiengang.kuerzel }} ({{ studiengang.kurzbzlang }}) 
-					</option>
-				</form-input>
-				
-				<form-input
-					:label="capitalize($p.t('lehre', 'semester'))"
-					type="select"
-					container-class="col-2"
-					v-model="semester"
-					name="semester"
-				>
-					<option
-						v-for="semester in event.createContext.room_create_information.semester"
-						:value="semester"
-						:key="semester"
-					>
-						{{ semester }} 
-					</option>
-				</form-input>
-				
-				<form-input
-					:label="capitalize($p.t('lehre', 'verband'))"
-					type="select"
-					container-class="col-2"
-					v-model="verband"
-					name="semester"
-				>
-					<option
-						v-for="verband in event.createContext.room_create_information.verband"
-						:value="verband"
-						:key="verband"
-					>
-						{{ verband }} 
-					</option>
-				</form-input>
-				
-				<form-input
-					:label="capitalize($p.t('lehre', 'gruppe'))"
-					type="select"
-					container-class="col-2"
-					v-model="gruppe"
-					name="gruppe"
-				>
-					<option
-						v-for="gruppe in event.createContext.room_create_information.gruppe"
-						:value="gruppe"
-						:key="gruppe"
-					>
-						{{ gruppe }} 
-					</option>
-				</form-input>
-				
-				<form-input
-					:label="capitalize($p.t('lehre', 'special_group'))"
-					type="autocomplete"
-					:suggestions="filteredGroups"
-					:placeholder="$p.t('lehre', 'addGroup')"
-					field="label"
-					:minLength="2"
-					container-class="col-5"
-					v-model="selectedGruppe"
-					name="gruppeautocomplete"
-					@complete="searchGroup"
-				/>
-			</div>
-		</div>
-		
-
-		<button class="btn btn-primary mt-3" @click="saveEvent">Speichern</button>
-	</div>
-	`
-};

public/js/components/Cis/Renderer/Slot/roomModalTitle.js

@@ -1,3 +0,0 @@
-export default {
-	template:`<div>{{ $p.t('lehre','new_reservierung') }}</div>`
-}

public/js/components/Cis/Studium/Studium.js

@@ -3,7 +3,6 @@ import LvUebersicht from "../Mylv/LvUebersicht.js";
 import ApiCisStudium from '../../../api/factory/cis/studium.js';
 
 export default {
-	name: 'Studium',
 	data(){
 		return {
 			studienSemester :[],

public/js/components/Cis/Zeitsperren/Zeitsperren.js

@@ -1,673 +0,0 @@
-import {CoreFilterCmpt} from "../../filter/Filter.js";
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-import PvAutoComplete from '../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js';
-
-import ApiAuthinfo from '../../../api/factory/authinfo.js';
-import ApiTimelocks from "../../../api/factory/cis/zeitsperren.js";
-import ApiStvAbschlusspruefung from "../../../api/factory/stv/abschlusspruefung.js";
-
-export default {
-	name: 'ZeitsperrenComponent',
-	components: {
-		CoreFilterCmpt,
-		FormForm,
-		FormInput,
-		PvAutoComplete
-	},
-	data(){
-		return {
-			uid: null,
-			statusNew: true,
-			timeRecordingLockedUntil: '2015-08-31', //TODO(Manu) check if needed
-			typesTimeLocks: ["Urlaub", "PflegeU", "ZA", "Krank", "DienstF", "DienstV", "CovidSB", "CovidKS"],
-			typesHideStunden: ["Urlaub", "ZA", "Krank", "DienstF", "DienstV", "CovidSB", "CovidKS"],
-			listTypenZeitsperren: [],
-			listTypenErreichbarkeit: [],
-			listStunden: [],
-			tabulatorOptions: null,
-			tabulatorEvents: [],
-			originalData: {},
-			zeitsperreData: {
-				vondatum : new Date(),
-				bisdatum: new Date(),
-				vonISO : "00:00:00", //later
-				bisISO: "23:59:59", //later
-				erreichbarkeit_kurzbz: 'n',
-				zeitsperretyp_kurzbz: 'Arzt',
-				vonstunde: null,
-				bisstunde: null
-			},
-			changedData: {},
-			selectedVertretung: null,
-			filteredMitarbeiter: [],
-			abortController: {
-				mitarbeiter: null
-			},
-		};
-	},
-	computed: {
-		dienstverhinderungen() {
-			return {
-				"Eheschließung": "a) " + this.$p.t('zeitsperren', 'eheschliessung'),
-				"Geburt eigenes Kind": "b) " + this.$p.t('zeitsperren', 'geburt'),
-				"Heirat Kind/Geschwister": "c) " + this.$p.t('zeitsperren', 'heirat'),
-				"Eigene Sponsion/Promotion": "d) " + this.$p.t('zeitsperren', 'sponsion'),
-				"Lebensbedr. Erkrankung P/K/E": "e) " + this.$p.t('zeitsperren', 'erkrankung_lebensbedr'),
-				"Ableben P/K/E": "f) " + this.$p.t('zeitsperren', 'ableben'),
-				"Bestattung G/S/G": "g) " + this.$p.t('zeitsperren', 'bestattung'),
-				"Wohnungswechsel": "h) " + this.$p.t('zeitsperren', 'umzug'),
-				"Bundesheer": "i) " + this.$p.t('zeitsperren', 'bundesheer'),
-				"Volksschultag": "j) " + this.$p.t('zeitsperren', 'volksschultag')};
-		},
-		showInfo(){
-			return this.zeitsperreData.zeitsperretyp_kurzbz === 'DienstF';
-		},
-	},
-	methods: {
-		actionEditZeitsperre(zeitsperre_id){
-			this.statusNew = false;
-			return this.$api
-				.call(ApiTimelocks.loadZeitsperre(zeitsperre_id))
-				.then(response => {
-					this.originalData = structuredClone(response.data);
-					this.zeitsperreData = structuredClone(response.data);
-
-					this.selectedVertretung = {
-						label: this.getPersonLabel(this.zeitsperreData.ma_titelpre, this.zeitsperreData.ma_nachname, this.zeitsperreData.ma_vorname, this.zeitsperreData.ma_titelpost, this.zeitsperreData.vertretung_uid),
-						person_id: this.zeitsperreData.ma_person_id,
-						mitarbeiter_uid: this.zeitsperreData.vertretung_uid
-					};
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		actionDeleteZeitsperre(zeitsperre_id){
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? zeitsperre_id
-					: Promise.reject({ handled: true })
-				)
-				.then(() => this.deleteZeitsperre(zeitsperre_id))
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		saveZeitsperre(zeitsperreId = null) {
-			const isNew = !zeitsperreId;
-
-			let payload = isNew
-				? { ...this.zeitsperreData }                 // add
-				: this.getChangedFields(this.originalData,   // edit
-					this.zeitsperreData);
-
-			if (!isNew && Object.keys(payload).length === 0) {
-				return Promise.resolve();
-			}
-
-			const request = isNew
-				? ApiTimelocks.addZeitsperre(this.uid, payload)
-				: ApiTimelocks.editZeitsperre(zeitsperreId, payload);
-
-			return this.$refs.dataZeitsperre
-				.call(request)
-				.then(() => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-
-					this.reset();
-					this.reload();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		deleteZeitsperre(zeitsperre_id){
-			return this.$api
-				.call(ApiTimelocks.deleteZeitsperre(zeitsperre_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(()=> {
-					this.reload();
-				});
-		},
-		searchMitarbeiter(event) {
-			if (this.abortController.mitarbeiter) {
-				this.abortController.mitarbeiter.abort();
-			}
-
-			this.abortController.mitarbeiter = new AbortController();
-
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
-				.then(result => {
-					this.filteredMitarbeiter = [];
-					for (let mitarbeiter of result.data.retval) {
-						this.filteredMitarbeiter.push(
-							{
-								label: this.getPersonLabel(
-									mitarbeiter.titelpre,
-									mitarbeiter.nachname,
-									mitarbeiter.vorname,
-									mitarbeiter.titelpost,
-									mitarbeiter.mitarbeiter_uid
-								),
-								person_id: mitarbeiter.person_id,
-								mitarbeiter_uid: mitarbeiter.mitarbeiter_uid
-							}
-						);
-					}
-				});
-		},
-		getPersonLabel(titelpre, nachname, vorname, titelpost, uid) {
-			if(!uid)
-				return '';
-			return nachname + ' ' + vorname + (titelpre ? ' ' + titelpre : '') + (titelpost ? ' ' + titelpost : '') + (uid ? ' (' + uid + ')' : '');
-		},
-		reload() {
-			if (this.$refs.table)
-				this.$refs.table.reloadTable();
-		},
-		reset(){
-			this.statusNew = true;
-			this.selectedVertretung = null;
-			this.zeitsperreData = {
-					vondatum : new Date(),
-					bisdatum: new Date(),
-					vonISO : "00:00:00", //later
-					bisISO: "23:59:59", //later
-					erreichbarkeit_kurzbz: 'n',
-					zeitsperretyp_kurzbz: 'Arzt',
-					vonstunde: null,
-					bisstunde: null
-				};
-			this.originalData = {};
-		},
-		handleChangeVonStunde(){
-			let stunde = this.zeitsperreData.vonstunde;
-			const result = this.listStunden.find(item => item.stunde === stunde);
-			if (!result) {
-				this.zeitsperreData.vonISO = '00:00:00';
-				return;
-			}
-			this.zeitsperreData.vonISO = result.beginn;
-		},
-		handleChangeBisStunde(){
-			let stunde = this.zeitsperreData.bisstunde;
-			const result = this.listStunden.find(item => item.stunde === stunde);
-			if (!result) {
-				this.zeitsperreData.bisISO = '23:59:59';
-				return;
-			}
-			this.zeitsperreData.bisISO = result.ende;
-		},
-		handleStunden(){
-			if (this.typesHideStunden.includes(this.zeitsperreData.zeitsperretyp_kurzbz)){
-				this.zeitsperreData.vonstunde = null;
-				this.zeitsperreData.bisstunde = null;
-				this.zeitsperreData.vonISO = '00:00:00';
-				this.zeitsperreData.bisISO = '23:59:59';
-			}
-		},
-		copyDateForBis(){
-			this.zeitsperreData.bisdatum = this.zeitsperreData.vondatum;
-		},
-		getChangedFields(original, current) {
-			const diff = {};
-
-			Object.keys(current).forEach((key) => {
-				if (current[key] !== original[key]) {
-					diff[key] = current[key];
-				}
-			});
-			return diff;
-		},
-	},
-	watch: {
-		selectedVertretung(newVal) {
-			this.zeitsperreData.vertretung_uid = newVal?.mitarbeiter_uid || null;
-		},
-		'zeitsperreData.zeitsperretyp_kurzbz'(newVal) {
-			if (newVal === 'DienstV') {
-				// set first key as default
-				if (!this.zeitsperreData.bezeichnung) {
-					const firstKey = Object.keys(this.dienstverhinderungen)[0];
-					this.zeitsperreData.bezeichnung = firstKey;
-				}
-			} else {
-				this.zeitsperreData.bezeichnung = '';
-			}
-		}
-	},
-	created() {
-		this.$api.call(ApiAuthinfo.getAuthUID()).then(res => {
-
-			//check if there is a user, passed via route
-			const urlUid = this.$route?.query?.uid;
-			this.uid = urlUid ? urlUid : res.data.uid;
-
-			this.tabulatorOptions = {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () =>
-					this.$api.call(ApiTimelocks.getTimelocksUser(this.uid)),
-				ajaxResponse: (url, params, response) => response.data,
-				columns: [
-					{title:"bezeichnung", field:"bezeichnung"},
-					{title:"Grund", field:"beschreibung"},
-					{title:"Von", field:"vondatum",
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-							});
-						}
-					},
-					{title:"Bis", field:"bisdatum",
-						formatter: function (cell) {
-							const dateStr = cell.getValue();
-							if (!dateStr) return "";
-
-							const date = new Date(dateStr);
-							return date.toLocaleString("de-DE", {
-								day: "2-digit",
-								month: "2-digit",
-								year: "numeric",
-							});
-						}
-					},
-					{title:"vonstunde", field:"vonstunde", visible: false},
-					{title:"bisstunde", field:"bisstunde", visible: false},
-					{title:"Vertretung", field:"vertretung"},
-					{title:"Erreichbarkeit", field:"erreichbarkeit_beschreibung"},
-					{title:"zeitsperre_id", field:"zeitsperre_id", visible: false},
-					{title:"mitarbeiter_uid", field:"mitarbeiter_uid", visible: false},
-					{title:"freigabeamum", field:"freigabeamum", visible: false,
-						formatter: function (cell) {
-							const value = cell.getValue();
-							return value === null
-								? ''
-								: '<i class="fa fa-check text-success"></i>';
-						}
-						},
-					{title: 'Aktionen', field: 'actions',
-						minWidth: 150, // Ensures Action-buttons will be always fully displayed
-						formatter: (cell, formatterParams, onRendered) => {
-							let container = document.createElement('div');
-							container.className = "d-flex gap-2";
-
-							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = this.$p.t('ui', 'bearbeiten');
-							button.addEventListener('click', (event) =>
-								this.actionEditZeitsperre(cell.getData().zeitsperre_id)
-							);
-							if(cell.getData().zeitsperretyp_kurzbz == 'DienstV' || cell.getData().zeitsperretyp_kurzbz == 'ZVerfueg'){
-								button.disabled = true;
-							}
-							//TODO(Manu) check if needed
-							if(this.typesTimeLocks.includes(cell.getData().zeitsperretyp_kurzbz) && (cell.getData().vondatum < this.timeRecordingLockedUntil)){
-								button.disabled = true;
-							}
-							container.append(button);
-
-							button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = this.$p.t('ui', 'loeschen');
-							button.addEventListener('click', () =>
-								//this.deleteZeitsperre(cell.getData().zeitsperre_id)
-								this.actionDeleteZeitsperre(cell.getData().zeitsperre_id)
-							);
-							if(cell.getData().zeitsperretyp_kurzbz == 'Urlaub' || cell.getData().zeitsperretyp_kurzbz == 'ZVerfueg'){
-								button.disabled = true;
-							}
-							//TODO(Manu) check if needed
-							if(this.typesTimeLocks.includes(cell.getData().zeitsperretyp_kurzbz) && (cell.getData().vondatum < this.timeRecordingLockedUntil)){
-								button.disabled = true;
-							}
-							container.append(button);
-
-							return container;
-						},
-						frozen: true
-					},
-				]
-			};
-				this.tabulatorEvents = [
-					{
-						event: 'tableBuilt',
-						handler: async() => {
-							await this.$p.loadCategory(['global', 'person', 'zeitsperren', 'ui', 'abschlusspruefung']);
-
-							let cm = this.$refs.table.tabulator.columnManager;
-
-							cm.getColumnByField('bezeichnung').component.updateDefinition({
-								title: this.$p.t('person', 'grund')
-							});
-							cm.getColumnByField('beschreibung').component.updateDefinition({
-								title: this.$p.t('global', 'bezeichnung')
-							});
-							cm.getColumnByField('vondatum').component.updateDefinition({
-								title: this.$p.t('ui', 'von')
-							});
-							cm.getColumnByField('bisdatum').component.updateDefinition({
-								title: this.$p.t('global', 'bis')
-							});
-							cm.getColumnByField('vonstunde').component.updateDefinition({
-								title: this.$p.t('zeitsperren', 'stunde_von')
-							});
-							cm.getColumnByField('bisstunde').component.updateDefinition({
-								title: this.$p.t('zeitsperren', 'stunde_bis')
-							});
-							cm.getColumnByField('vertretung').component.updateDefinition({
-								title: this.$p.t('person', 'vertretung')
-							});
-
-							cm.getColumnByField('erreichbarkeit_beschreibung').component.updateDefinition({
-								title: this.$p.t('person', 'erreichbarkeit')
-							});
-							cm.getColumnByField('freigabeamum').component.updateDefinition({
-								title: this.$p.t('abschlusspruefung', 'freigabe')
-							});
-
-	/*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-							});*/
-
-						}
-					}
-				];
-		});
-
-		this.$api
-			.call(ApiTimelocks.getTypenZeitsperren())
-			.then(result => {
-				this.listTypenZeitsperren = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiTimelocks.getTypenErreichbarkeit())
-			.then(result => {
-				this.listTypenErreichbarkeit = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiTimelocks.getStunden())
-			.then(result => {
-				this.listStunden = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-	},
-	template: /* html */`
-	<div class="zeitsperre">
-		<h4>{{$p.t('zeitsperren', 'header_zeitsperren')}} ({{uid}}) </h4>
-
-			<form-form class="row g-3 mt-3" ref="dataZeitsperre">
-				<div class= "w-50">
-					<div class="row mb-3">
-						<form-input
-							type="select"
-							:class="showInfo ? 'is-info' : ''"
-							name="zeitsperretyp_kurzbz"
-							:label="$p.t('person/grund')"
-							v-model="zeitsperreData.zeitsperretyp_kurzbz"
-							@change="handleStunden"
-						>
-							<option
-								v-for="typ in listTypenZeitsperren"
-								:key="typ.zeitsperretyp_kurzbz"
-								:value="typ.zeitsperretyp_kurzbz"
-								:disabled="typ.zeitsperretyp_kurzbz == 'Urlaub'"
-								>
-								 {{typ.beschreibung}}
-							</option>
-						</form-input>
-						<div v-if="showInfo" class="info-feedback">
-							<strong> Dienstfreistellungen</strong> nur in Absprache mit HR Service eintragen!
-						 </div>
-					</div>
-
-					<div v-if="zeitsperreData.zeitsperretyp_kurzbz == 'DienstV'" class="row mb-3">
-						<form-input
-							type="select"
-							name="beschreibung"
-							:label="$p.t('ui/bezeichnung')"
-							v-model="zeitsperreData.bezeichnung"
-						>
-							<option v-for="(beschreibung, key) in dienstverhinderungen"
-								:key="key"
-								:value="key">{{beschreibung}}
-							</option>
-
-						</form-input>
-					</div>
-					<div v-else class="row mb-3">
-						<form-input
-							type="text"
-							name="beschreibung"
-							:label="$p.t('ui/bezeichnung')"
-							v-model="zeitsperreData.bezeichnung"
-						>
-						</form-input>
-					</div>
-				</div>
-
-				<div>
-					<div class="row">
-						<div class="mb-3 col-2">
-							<form-input
-								type="DatePicker"
-								name="vondatum"
-								:label="$p.t('ui/from')"
-								v-model="zeitsperreData.vondatum"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								text-input
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								required
-							>
-							</form-input>
-						</div>
-						<div class="mb-3 col-1 d-flex align-items-end">
-							<button
-							class="btn btn-outline-secondary"
-							title="Für Bis-Datum übernehmen"
-							@click.prevent="copyDateForBis"
-							>
-								<i class="fa-solid fa-arrow-down"></i>
-							</button>
-						</div>
-
-						<div class="mb-3 col-3">
-							<form-input
-								v-if="!typesHideStunden.includes(zeitsperreData.zeitsperretyp_kurzbz)"
-								type="select"
-								name="vonstunde"
-								:label="$p.t('zeitsperren/stunde')"
-								v-model="zeitsperreData.vonstunde"
-								@change="handleChangeVonStunde"
-							>
-								<option value='null'>*</option>
-								<option
-									v-for="std in listStunden"
-									:key="std.stunde"
-									:value="std.stunde"
-									>
-									 {{std.stunde}} ({{std.beginn}} - {{std.ende}})
-								</option>
-							</form-input>
-
-						</div>
-
-						<!-- Uncomment to use timestamp VON
-							<div class="mb-3 col-3">
-								<form-input
-									type="text"
-									name="vonISO"
-									label="vonISO"
-									v-model="zeitsperreData.vonISO"
-									auto-apply
-									:enable-time-picker="true"
-									format="dd.MM.yyyy HH:mm"
-									text-input
-									preview-format="dd.MM.yyyy HH:mm"
-									:teleport="true"
-								>
-								{{timestampHoursVon}}
-								</form-input>
-							</div>
-						-->
-
-					</div>
-
-					<div class="row">
-						<div class="mb-3 col-2">
-							<form-input
-								type="DatePicker"
-								name="bisdatum"
-								:label="$p.t('global/bis')"
-								v-model="zeitsperreData.bisdatum"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								text-input
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								required
-							>
-							</form-input>
-						</div>
-						<div class="mb-3 col-1"></div>
-
-						<div class="mb-3 col-3">
-							<form-input
-								v-if="!typesHideStunden.includes(zeitsperreData.zeitsperretyp_kurzbz)"
-								type="select"
-								name="bisstunde"
-								:label="$p.t('zeitsperren/stunde')"
-								v-model="zeitsperreData.bisstunde"
-								@change="handleChangeBisStunde"
-							>
-								<option value='null'>*</option>
-								<option
-									v-for="std in listStunden"
-									:key="std.stunde"
-									:value="std.stunde"
-									>
-									 {{std.stunde}} ({{std.beginn}} - {{std.ende}})
-								</option>
-							</form-input>
-						</div>
-
-						<!-- Uncomment to use timestamp BIS
-							<div class="mb-3 col-3">
-								<form-input
-									type="text"
-									name="bisISO"
-									label="bisISO"
-									v-model="zeitsperreData.bisISO"
-									auto-apply
-									:enable-time-picker="true"
-									format="dd.MM.yyyy HH:mm"
-									text-input
-									preview-format="dd.MM.yyyy HH:mm"
-									:teleport="true"
-								>
-								</form-input>
-							</div>
-						-->
-
-					</div>
-
-					<div class= "w-50">
-						<div class="row mb-3">
-							<form-input
-								type="autocomplete"
-								name="vertretung_uid"
-								:label="$p.t('person/vertretung')"
-								v-model="selectedVertretung"
-								optionLabel="label"
-								optionValue="mitarbeiter_uid"
-								dropdown
-								forceSelection
-								:suggestions="filteredMitarbeiter"
-								@complete="searchMitarbeiter"
-								:min-length="3"
-								>
-							</form-input>
-						</div>
-					</div>
-
-					<div class="row align-items-end">
-						<div class="mb-3 col-4">
-							<form-input
-								type="select"
-								name="erreichbarkeit"
-								:label="$p.t('person/erreichbarkeit')"
-								v-model="zeitsperreData.erreichbarkeit_kurzbz"
-								>
-								<option
-									v-for="typ in listTypenErreichbarkeit"
-									:key="typ.erreichbarkeit_kurzbz"
-									:value="typ.erreichbarkeit_kurzbz"
-									>
-									 {{typ.beschreibung}}
-								</option>
-							</form-input>
-						</div>
-
-						<div class="mb-3 col-3">
-							<button
-							  v-if="statusNew"
-							  type="button"
-							  class="btn btn-primary"
-							  @click="saveZeitsperre()">
-							  {{$p.t('zeitsperren', 'addZeitsperre')}}
-							</button>							
-							<button
-							  v-else
-							  type="button"
-							  class="btn btn-warning"
-							  @click="saveZeitsperre(zeitsperreData.zeitsperre_id)">
-							  {{$p.t('zeitsperren', 'saveZeitsperre')}}
-							</button>
-						  </div>
-					</div>
-
-				</div>
-
-			</form-form>
-					
-			<div class="d-flex align-items-start text-muted small">
-			  <i class="fa fa-circle-info me-2 mt-1"></i>
-			  <div>
-				<strong>{{$p.t('alert', 'attention')}}</strong><br>
-				{{$p.t('zeitsperren', 'info_zeitsperrenMoreDays')}}
-			  </div>
-			</div>
-
-
-			<hr>
-
-			<core-filter-cmpt
-				v-if="tabulatorOptions"
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
-				reload
-				:reload-btn-infotext="this.$p.t('table', 'reload')"
-			>
-		</core-filter-cmpt>
-	</div>
-	`
-};

public/js/components/DropdownModes/LehreinheitenModule.js

@@ -1,77 +0,0 @@
-import ApiLehre from "../../api/factory/lehre.js";
-import {capitalize} from "../../helpers/StringHelpers.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) {
-	if (!lv_id || !sem_kurzbz) {
-		options.value = []
-		return
-	}
-	
-	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: capitalize(Vue.computed(()=>appContext?.$p.t('lehre/lehreinheit'))),
-	setupContext,
-	bindParams
-});
-
-export default LehreinheitenModule;

public/js/components/Funktionen/Funktionen.js

@@ -551,6 +551,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_von"
+							model-type="yyyy-MM-dd"
 							name="datum_von"
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
@@ -566,6 +567,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_bis"
+							model-type="yyyy-MM-dd"
 							name="datum_bis"
 							:label="$p.t('global/bis')"
 							auto-apply

public/js/components/Mobility/Legende.js

@@ -1,20 +0,0 @@
-
-export const MobilityLegende = {
-	name: 'MobilityLegende',
-	template:`	
-		<div class="col-auto" style="max-width: 60vw">
-<!--			TODO: phrasen definieren & verwenden-->
-			<div class="row" style="font-weight: bold"><h6>Legende</h6></div>
-			<div class="row"><h6>(i) ... Incoming</h6></div>
-			<div class="row"><h6>(o) ... Outgoing</h6></div>
-			<div class="row"><h6>(ar) ... angerechnet </h6></div>
-			<div class="row"><h6>(iar) ... intern angerechnet</h6></div>
-			<div class="row"><h6>(nz) ... nicht zugelassen</h6></div>
-			<div class="row"><h6>(ma) ... MitarbeiterIn</h6></div>
-			<div class="row"><h6>(a.o.) ... Außerordentliche/r HörerIn</h6></div>
-			<div class="row"><h6>(d.d.) ... Double Degree Program</h6></div>
-		</div>	
-	`
-};
-
-export default MobilityLegende;

public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js

@@ -470,6 +470,7 @@ export default {
 							:label="$p.t('admission', 'anmeldundRtAm')"
 							type="DatePicker"
 							v-model="formData.anmeldedatum"
+							model-type="yyyy-MM-dd"
 							auto-apply
 							:enable-time-picker="false"
 							text-input

public/js/components/Stv/Studentenverwaltung/Details/Details.js

@@ -293,6 +293,7 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
+						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today

public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js

@@ -103,6 +103,7 @@ export default {
 						<form-input
 							type="DatePicker"
 							v-model="formData.nachgereicht_am"
+							model-type="yyyy-MM-dd"
 							name="nachgereicht_am"
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply

public/js/components/Stv/Studentenverwaltung/Details/Konto.js

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: new Date()
+			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
 		};
 	},
 	computed: {
@@ -259,6 +259,7 @@ export default {
 					<form-input
 						type="DatePicker"
 						v-model="counterdate"
+						model-type="yyyy-MM-dd"
 						input-group
 						:enable-time-picker="false"
 						text-input

public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js

@@ -79,6 +79,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

@@ -88,7 +88,7 @@ export default {
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				buchungsdatum: new Date(),
+				buchungsdatum: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,6 +154,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js

@@ -467,6 +467,7 @@ export default {
 						:label="$p.t('ui', 'von')"
 						type="DatePicker"
 						v-model="formData.von"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -501,6 +502,7 @@ export default {
 						:label="$p.t('global', 'bis')"
 						type="DatePicker"
 						v-model="formData.bis"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input