Merge branch 'bug-83698/StudVW_Projektarbeit_Kontaktdaten'

prevent editing contact data of employees

application/config/routes.php

@@ -129,13 +129,19 @@ $route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/in
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
+
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
 
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
 
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/le/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLe/$1/$2';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/lv/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLv/$1/$2';
+
 
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];

application/config/treemenu/custom/lvvw.php

@@ -26,7 +26,8 @@ $config['root'] = [
 			'verband' => [
 				'group'
 			]
-		],
-		'orgform'
+		]
 	]
 ];
+
+$config['root']['stg']['orgform'] = $config['root']['stg'];

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

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

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

@@ -28,7 +28,10 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getByEmp' => ['admin:r', 'assistenz:r'],
+			'getByLe' => ['admin:r', 'assistenz:r'],
+			'getByLv' => ['admin:r', 'assistenz:r'],
 			'getByStg' => ['admin:r', 'assistenz:r'],
+			'getByStgOrgform' => ['admin:r', 'assistenz:r'],
 			'loadByLV' => ['admin:r', 'assistenz:r'],
 		]);
 
@@ -77,41 +80,117 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($tree);
 	}
+
+	public function getByLe($studiensemester_kurzbz = null, $lehreinheit_id = null)
+	{
+		if (is_null($lehreinheit_id))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
+
+
+		$lehreinheiten = $this->_ci->LehreinheitModel->getByLeStudiensemester($lehreinheit_id, $studiensemester_kurzbz);
+		$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
+
+		$this->terminateWithSuccess($lehreinheiten_data);
+	}
+
+	public function getByLv($studiensemester_kurzbz = null, $lehrveranstaltung_id = null)
+	{
+		if (is_null($lehrveranstaltung_id))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
+
+		$tree = [];
+
+		$this->_ci->LehrveranstaltungModel->addSelect('studiengang_kz');
+		$lv = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
+		$lv = $this->getDataOrTerminateWithError($lv);
+
+		if (empty($lv))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehrveranstaltungen_data = array();
+		foreach ($this->_loadLvRows(current($lv)->studiengang_kz, $studiensemester_kurzbz) as $row)
+		{
+			if ((string)$row->lehrveranstaltung_id === (string)$lehrveranstaltung_id)
+			{
+				$lehrveranstaltungen_data[] = $row;
+				break;
+			}
+		}
+
+		if (empty($lehrveranstaltungen_data))
+		{
+
+			$this->_ci->LehrveranstaltungModel->addSelect('
+				tbl_lehrveranstaltung.*,
+				tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+				lehrveranstaltung_id,
+				lehrtyp_kurzbz,
+				studiengang_kz as lv_studiengang_kz,
+				UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang,
+				semester as semester,
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				ects as lv_ects,
+				lehreverzeichnis as lv_lehreverzeichnis,
+				planfaktor as lv_planfaktor,
+				planlektoren as lv_planlektoren,
+				planpersonalkosten as lv_planpersonalkosten,
+				plankostenprolektor as lv_plankostenprolektor,
+				tbl_lehrveranstaltung.orgform_kurzbz as orgform_kurzbz,
+				tbl_lehrveranstaltung.sprache as sprache,
+				lehrform_kurzbz as lv_lehrform_kurzbz,
+				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
+				semesterstunden as lv_semesterstunden,
+			');
+			$this->_ci->LehrveranstaltungModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+			$lehrveranstaltungen = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
+			$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+		}
+
+		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
+		{
+			$lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
+			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
+
+			if (!isset($lehrveranstaltung->_children))
+			{
+				$lehrveranstaltung->_children = $lehreinheiten_data;
+			}
+			$tree[] = $lehrveranstaltung;
+		}
+
+		$counter = 0;
+		$this->assignUniqueIndex($tree, $counter);
+		$this->terminateWithSuccess($tree);
+	}
+
 	public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
+	{
+		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, null);
+	}
+
+	public function getByStgOrgform($studiensemester_kurzbz = null, $stg_kz = null, $orgform = null, $semester = null)
+	{
+		$orgform_kurzbz = $this->getOrgformKurzbz($orgform);
+		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz);
+	}
+
+	private function _getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz)
 	{
 		$studiengang_kz = $this->getStudiengangKz($stg_kz);
 
 		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-		$verband = null;
-		if (!is_null($semester) && !is_numeric($semester))
-		{
-			$verband = $this->getOrgformKurzbz($semester);
-			$semester = null;
-		}
-
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		if (!is_null($semester) && !ctype_digit((string)$semester))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
 
-		$studienplan_ids = array();
-		$only_ids = array();
-		$placeholders = array();
-
-		if (hasData($studienplan_data))
-		{
-			foreach (getData($studienplan_data) as $studienplan) {
-				$placeholders[] = "(?, ?)";
-				$studienplan_ids[] = $studienplan->studienplan_id;
-				$studienplan_ids[] = $studienplan->semester;
-				$only_ids[] = $studienplan->studienplan_id;
-			}
-		}
-
-		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
-		$lehrveranstaltungen_data = hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
+		$lehrveranstaltungen_data = $this->_loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
 
 		$tree = [];
 		foreach ($lehrveranstaltungen_data as $row)
@@ -244,6 +323,31 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->LehreinheitModel->getLvsByFachbereich($fachbereich, $studiensemester_kurzbz, $mitarbeiter_uid);
 	}*/
+
+	private function _loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester = null, $orgform_kurzbz = null)
+	{
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
+
+		$studienplan_ids = array();
+		$only_ids = array();
+		$placeholders = array();
+
+		if (hasData($studienplan_data))
+		{
+			foreach (getData($studienplan_data) as $studienplan) {
+				$placeholders[] = "(?, ?)";
+				$studienplan_ids[] = $studienplan->studienplan_id;
+				$studienplan_ids[] = $studienplan->semester;
+				$only_ids[] = $studienplan->studienplan_id;
+			}
+		}
+
+		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
+		return hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
+	}
+
 	private function _setAuthUID()
 	{
 		$this->_uid = getAuthUID();
@@ -309,8 +413,8 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 
 		if (!$data)
-			return $orgform_kurzbz;
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		return current($data)->orgform_kurzbz;
 	}
-}
+}

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

@@ -101,6 +101,9 @@ class Widget extends FHCAPI_Controller
 			$tmpsetup = json_decode($widget->setup);
 			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
 			$widget->setup = $tmpsetup;
+			$widget->permitted = empty($widget->berechtigung_kurzbz) 
+				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
+
 			return $widget;
 		}, $widgets);
 

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

@@ -28,7 +28,8 @@ class Studiensemester extends FHCAPI_Controller
 				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
 				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
 				'current' => self::PERM_LOGGED,
-				'set' => self::PERM_LOGGED
+				'set' => self::PERM_LOGGED,
+				'getContainingOrNearestByDateRange' => self::PERM_LOGGED,
 			)
 		);
 		// Load model StudiensemesterModel
@@ -203,4 +204,15 @@ class Studiensemester extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(true);
 	}
+
+	public function getContainingOrNearestByDateRange()
+	{
+		$from = $this->input->get("from");
+		$to = $this->input->get("to");
+
+		$result = $this->StudiensemesterModel->getContainingOrNearestByDateRange($from, $to);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }

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

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

application/libraries/SearchBarLib.php

@@ -33,7 +33,7 @@ class SearchBarLib
 	const ERROR_NOT_AUTH = 'ERR005';
 
 	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];
+	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms', 'lehreinheit', 'lehrveranstaltung'];
 
 	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
 
@@ -180,10 +180,14 @@ class SearchBarLib
 	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
 	{
 		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
+		$words = preg_split('/\s+/', trim($searchstr), -1, PREG_SPLIT_NO_EMPTY);
+
+		if (empty($words)) return array();
+
 		$document			 = implode(' || \' \' || ', $columns);
-		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
-		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
-		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
+		$query				 = '\'' . implode(':* & ', $words) . ':*\'';
+		$reversequery		 = '\'*:' . implode(' & *:', $words) . '\'';
+		$nospacequery		 = '\'' . implode('', $words) . ':*\'';
 
 		$searchclause = <<<EOSC
 			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
@@ -596,5 +600,98 @@ EOSC;
 		// Otherwise return an empty array
 		return array();
 	}
+
+
+	private function _lehreinheit($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$idwhere = '';
+		if (ctype_digit(trim($searchstr)))
+		{
+			$id = (int)trim($searchstr);
+			$idwhere = ' OR le.lehreinheit_id = ' . $id;
+		}
+
+		$lehreinheit = $dbModel->execReadOnlyQuery('
+			SELECT
+				\'teachingunit\' AS renderer,
+				\''.$type.'\' AS type,
+				le.lehreinheit_id AS id,
+				le.studiensemester_kurzbz,
+				lv.bezeichnung,
+				\'lv_table_icon icon-\' AS foto,
+				UPPER(stg.typ || stg.kurzbz) AS studiengang,
+				le.lehrform_kurzbz,
+				lv.semester
+			FROM lehre.tbl_lehreinheit le
+				JOIN lehre.tbl_lehrveranstaltung lv ON (lv.lehrveranstaltung_id = le.lehrveranstaltung_id)
+				JOIN public.tbl_studiengang stg ON (stg.studiengang_kz = lv.studiengang_kz)
+				JOIN public.tbl_studiensemester sem ON (sem.studiensemester_kurzbz = le.studiensemester_kurzbz)
+			WHERE (' .
+				$this->buildSearchClause(
+					$dbModel,
+					array(
+						'(stg.typ || stg.kurzbz)',
+						'lv.semester',
+						'lv.bezeichnung'
+					),
+					$searchstr
+				) . ')' . $idwhere . '
+	');
+
+		// If something has been found then return it
+		if (hasData($lehreinheit)) return getData($lehreinheit);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	private function _lehrveranstaltung($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$idwhere = '';
+
+		if (ctype_digit(trim($searchstr)))
+		{
+			$id = (int)trim($searchstr);
+			$idwhere = ' OR tbl_lehrveranstaltung.lehrveranstaltung_id = ' . $id;
+		}
+
+		$lehreinheit = $dbModel->execReadOnlyQuery('
+			
+			SELECT
+				\'teachingunit\' AS renderer,
+				\''.$type.'\' AS type,
+				lehrveranstaltung_id as id,
+				tbl_lehrveranstaltung.bezeichnung,
+				\'lv_table_icon icon-lv\' as foto,
+				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as studiengang,
+				semester,
+				lehrform_kurzbz,
+				tbl_organisationseinheit.bezeichnung as oe_bezeichnung
+			FROM lehre.tbl_lehrveranstaltung
+				JOIN public.tbl_studiengang USING(studiengang_kz)
+				JOIN public.tbl_organisationseinheit ON tbl_lehrveranstaltung.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz
+			WHERE (' .
+				$this->buildSearchClause(
+					$dbModel,
+					array(
+						'(tbl_studiengang.typ || tbl_studiengang.kurzbz)',
+						'semester',
+						'tbl_lehrveranstaltung.bezeichnung'
+					),
+					$searchstr
+				) . ')' . $idwhere . '
+		');
+
+		// If something has been found then return it
+		if (hasData($lehreinheit)) return getData($lehreinheit);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
 }
 

application/libraries/StundenplanLib.php

@@ -7,7 +7,6 @@ use \DateTime as DateTime;
 use \DateTimeZone as DateTimeZone;
 use \DateInterval as DateInterval;
 use \DatePeriod as DatePeriod;
-use CI3_Events as Events;
 
 class StundenplanLib
 {
@@ -144,7 +143,7 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
-		$function_error = $this->expandObjectInformation($stundenplan_data, true);
+		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
 		
@@ -304,7 +303,7 @@ class StundenplanLib
 		return success($lektoren);
 	}
 
-	public function expandObjectInformation($data, $callExtensionsEvent = false)
+	public function expandObjectInformation($data)
 	{
 		$this->_ci =& get_instance();
 		
@@ -393,20 +392,6 @@ class StundenplanLib
 			$item->lektor = $lektor_obj_array;
 
 		}
-		
-		// info retrieved from extensions might not be necessary for some stundenplan use cases so the event
-		// will be gated behind this flag
-		
-		if($callExtensionsEvent) {
-			Events::trigger(
-				'extendStundenplanData',
-				function & () use (&$data)
-				{
-					return $data;
-				}
-			);
-		}
-		
 	}
 
 	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz)

application/libraries/treemenu/LvVwLib.php

@@ -159,8 +159,6 @@ class LvVwLib
 		if (!$stg->mischform)
 			return [];
 		
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
 		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
 	}
 

application/models/education/Lehreinheit_model.php

@@ -340,6 +340,20 @@ EOSQL;
 	}
 
 
+	public function getByLeStudiensemester($lehreinheit_id, $studiensemester_kurzbz)
+	{
+		$qry = "WITH lehreinheiten AS (
+				SELECT *
+				FROM lehre.tbl_lehreinheit
+				WHERE lehreinheit_id = ?
+					AND studiensemester_kurzbz = ?
+			)," . $this->_getLeCTE();
+
+		$params = array($lehreinheit_id, $studiensemester_kurzbz);
+
+		return $this->execReadOnlyQuery($qry, $params);
+
+	}
 	public function getByLvidStudiensemester($lv_id, $studiensemester_kurzbz, $mitarbeiter_uid = null, $fachbereich_kurzbz = null)
 	{
 		$qry = "WITH lehreinheiten AS (
@@ -347,35 +361,7 @@ EOSQL;
 				FROM lehre.tbl_lehreinheit
 				WHERE lehrveranstaltung_id = ?
 					AND studiensemester_kurzbz = ?
-			),
-				". $this->_getGruppenCTE() . ", 
-				". $this->_getLektorenCTE() . ", 
-				". $this->_getFachbereichCTE() . ",
-				". $this->_getTagsCTE() . "
-				
-				SELECT lehreinheiten.*,
-						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
-						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
-						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
-						gruppen.gruppen,
-						mitarbeiter.lektoren,
-						mitarbeiter.le_planstunden,
-						mitarbeiter.vorname,
-						mitarbeiter.nachname,
-						mitarbeiter.semesterstunden,
-						fachbereich.bezeichnung as fachbereich,
-						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
-						semester
-				FROM lehreinheiten
-					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
-					LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id
-					LEFT JOIN mitarbeiter ON lehreinheiten.lehreinheit_id = mitarbeiter.lehreinheit_id
-					LEFT JOIN fachbereich ON lehreinheiten.lehreinheit_id = fachbereich.lehreinheit_id
-					LEFT JOIN gruppen ON lehreinheiten.lehreinheit_id = gruppen.lehreinheit_id
-				WHERE true 
-				";
+			)," . $this->_getLeCTE();
 
 		$params = array($lv_id, $studiensemester_kurzbz);
 
@@ -395,9 +381,83 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}
 
-	private function getLVTmp($stg_kz = null)
+	public function getOffeneStunden($lehreinheit_ids)
 	{
-		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
+		if (!is_array($lehreinheit_ids))
+			$lehreinheit_ids = [$lehreinheit_ids];
+
+		if (empty($lehreinheit_ids))
+			return success([]);
+
+		$db = new DB_Model();
+		$placeholders = implode(',', array_fill(0, count($lehreinheit_ids), '?'));
+
+		$qry = "WITH eventdauer AS (
+					SELECT
+						tbl_kalender_lehreinheit.lehreinheit_id,
+						tbl_kalender.von,
+						tbl_kalender.bis,
+						tbl_kalender.kalender_id
+					FROM lehre.tbl_lehreinheit
+							JOIN lehre.tbl_kalender_lehreinheit USING(lehreinheit_id)
+							JOIN lehre.tbl_kalender USING(kalender_id)
+					WHERE tbl_lehreinheit.lehreinheit_id IN ($placeholders)
+						AND NOT EXISTS (SELECT 1 FROM lehre.tbl_kalender nachfolger
+										WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)
+						AND tbl_kalender.status_kurzbz NOT IN ('deleted', 'todelete', 'archived')
+					GROUP BY tbl_kalender_lehreinheit.lehreinheit_id, tbl_kalender.von, tbl_kalender.bis, tbl_kalender.kalender_id
+				),
+				raster AS (
+					SELECT
+						eventdauer.lehreinheit_id,
+						eventdauer.kalender_id,
+						eventdauer.von,
+						eventdauer.bis,
+						vonstunde.stunde AS vonstunde_nr,
+						bisstunde.stunde AS bisstunde_nr
+					FROM eventdauer
+						LEFT JOIN lehre.tbl_stunde vonstunde ON eventdauer.von::time = vonstunde.beginn
+						LEFT JOIN lehre.tbl_stunde bisstunde ON eventdauer.bis::time = bisstunde.ende
+				),
+				unterrichtsdauer AS (
+					SELECT
+						raster.lehreinheit_id,
+						raster.kalender_id,
+						sum(EXTRACT(EPOCH FROM (LEAST(stunde.ende, raster.bis::time) - GREATEST(stunde.beginn, raster.von::time))) / 60) AS minuten
+					FROM raster JOIN lehre.tbl_stunde stunde ON stunde.beginn < raster.bis::time AND stunde.ende > raster.von::time
+					WHERE raster.vonstunde_nr IS NULL OR raster.bisstunde_nr IS NULL
+					GROUP BY raster.lehreinheit_id, raster.kalender_id
+				),
+				verplantestunden AS (
+					SELECT raster.lehreinheit_id, raster.kalender_id,
+						CASE
+							WHEN raster.vonstunde_nr IS NOT NULL AND raster.bisstunde_nr IS NOT NULL
+								THEN (raster.bisstunde_nr - raster.vonstunde_nr + 1)
+							ELSE coalesce(unterrichtsdauer.minuten, 0) / 45
+						END AS verplantestunde
+					FROM raster LEFT JOIN unterrichtsdauer ON unterrichtsdauer.lehreinheit_id = raster.lehreinheit_id AND unterrichtsdauer.kalender_id = raster.kalender_id
+				),
+				verplant_gesamt AS (
+					SELECT lehreinheit_id, SUM(verplantestunde) AS verplant
+					FROM verplantestunden
+					GROUP BY lehreinheit_id
+				)
+				SELECT
+					lema.lehreinheit_id,
+					lema.mitarbeiter_uid,
+					lema.planstunden,
+					ROUND(coalesce(verplant_gesamt.verplant, 0), 2) AS verplant,
+					ROUND((lema.planstunden - coalesce(verplant_gesamt.verplant, 0)), 2) AS offenestunden
+				FROM lehre.tbl_lehreinheitmitarbeiter lema
+					LEFT JOIN verplant_gesamt ON verplant_gesamt.lehreinheit_id = lema.lehreinheit_id
+				WHERE lema.lehreinheit_id IN ($placeholders)";
+
+		return $db->execReadOnlyQuery($qry, array_merge($lehreinheit_ids, $lehreinheit_ids));
+	}
+
+	private function getLVTmp()
+	{
+		return "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
 						'' as stundenblockung,
 						'' as lehreinheit_id,
 						'' as wochenrythmus,
@@ -408,24 +468,33 @@ EOSQL;
 						'' as studienplan_beeichnung, 
 						UPPER(CONCAT(vw_lehreinheit.stg_typ, vw_lehreinheit.stg_kurzbz)) as studiengang
                 FROM campus.vw_lehreinheit
-				WHERE mitarbeiter_uid = ?
-				  AND studiensemester_kurzbz = ?";
-
-		if (!is_null($stg_kz)) {
-			$qry .= " AND lv_studiengang_kz = ?";
-		}
-
-		return $qry;
+				WHERE studiensemester_kurzbz = ? ";
 	}
 
-	public function getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz = null)
+	public function getLvsById($lehrveranstaltung_id, $studiensemester_kurzbz)
 	{
-		$qry = "WITH lvs AS (" . $this->getLVTmp($stg_kz) . ")
+		$where = ' AND lehrveranstaltung_id = ?';
+		$qry = "WITH lvs AS (" . $this->getLVTmp() . $where .")
 				SELECT lvs.*
 				FROM lvs
-				";
+			";
+
+		$params = array($studiensemester_kurzbz, $lehrveranstaltung_id);
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+	public function getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz = null)
+	{
+		$where = ' AND mitarbeiter_uid = ?';
+
+		if ($stg_kz != null)
+			$where .= " AND lv_studiengang_kz = ?";
+
+		$qry = "WITH lvs AS (" . $this->getLVTmp() . $where .")
+				SELECT lvs.*
+				FROM lvs";
+
+		$params = array($studiensemester_kurzbz, $mitarbeiter_uid);
 
-		$params = array($mitarbeiter_uid, $studiensemester_kurzbz);
 		if (!is_null($stg_kz))
 		{
 			$params[] = $stg_kz;
@@ -632,6 +701,36 @@ EOSQL;
 		return success('Contract successfully updated.');
 	}
 
+	private function _getLeCTE()
+	{
+		return $this->_getGruppenCTE() . ",
+				". $this->_getLektorenCTE() . ",
+				". $this->_getFachbereichCTE() . ",
+				". $this->_getTagsCTE() . "
+
+				SELECT lehreinheiten.*,
+						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
+						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
+						gruppen.gruppen,
+						mitarbeiter.lektoren,
+						mitarbeiter.le_planstunden,
+						mitarbeiter.vorname,
+						mitarbeiter.nachname,
+						mitarbeiter.semesterstunden,
+						fachbereich.bezeichnung as fachbereich,
+						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
+						semester
+				FROM lehreinheiten
+					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
+					LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id
+					LEFT JOIN mitarbeiter ON lehreinheiten.lehreinheit_id = mitarbeiter.lehreinheit_id
+					LEFT JOIN fachbereich ON lehreinheiten.lehreinheit_id = fachbereich.lehreinheit_id
+					LEFT JOIN gruppen ON lehreinheiten.lehreinheit_id = gruppen.lehreinheit_id
+				WHERE true";
+	}
 	private function _getGruppenCTE()
 	{
 		return "gruppen AS (

application/models/organisation/Studiensemester_model.php

@@ -292,13 +292,29 @@ class Studiensemester_model extends DB_Model
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_startdate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_startdate)
-				) AS studiensemester_kurzbz
+				) AS studiensemester_kurzbz,
+				COALESCE(
+					(SELECT start FROM semester_interval_startdate),
+					(SELECT start FROM nearest_semester_interval_startdate)
+				) as start,
+				COALESCE(
+					(SELECT ende FROM semester_interval_startdate),
+					(SELECT ende FROM nearest_semester_interval_startdate)
+				) as ende
 			UNION
 			SELECT
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_enddate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_enddate)
-				) AS studiensemester_kurzbz
+				) AS studiensemester_kurzbz,
+				COALESCE(
+					(SELECT start FROM semester_interval_enddate),
+					(SELECT start FROM nearest_semester_interval_enddate)
+				) as start,
+				COALESCE(
+					(SELECT ende FROM semester_interval_enddate),
+					(SELECT ende FROM nearest_semester_interval_enddate)
+				) as ende
 
 EOSQL;
 

application/views/templates/CISVUE-Header.php

@@ -21,6 +21,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
 <script type="text/javascript">
+	document.body.classList.add("cis4");
 	if (window.self !== window.top)
 		document.body.classList.add("in-frame");
 </script>

include/entwicklungsteam.class.php

@@ -21,6 +21,7 @@
  *          Manuela Thamer <[email protected]>
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/mitarbeiter.class.php');
 
 class entwicklungsteam extends basis_db
 {
@@ -43,7 +44,6 @@ class entwicklungsteam extends basis_db
 	public $ext_id;
 
 	public $besqual;
-	public $studiengang_kz_old;
 
 	/**
 	 * Konstruktor
@@ -74,7 +74,7 @@ class entwicklungsteam extends basis_db
 		$qry = "SELECT * FROM bis.tbl_entwicklungsteam JOIN bis.tbl_besqual USING(besqualcode)
 				WHERE entwicklungsteam_id=".$this->db_add_param($entwicklungsteam_id);
 
-				$qry.=";";
+		$qry.=";";
 
 		if($this->db_query($qry))
 		{
@@ -147,6 +147,11 @@ class entwicklungsteam extends basis_db
 			$this->errormsg = 'Es muss ein Mitarbeiter angegeben werden';
 			return false;
 		}
+		if(!$this->checkIfExistingUid($this->mitarbeiter_uid))
+		{
+			$this->errormsg = 'Bitte einen Eintrag aus dem Dropdown Personensuche auswählen!';
+			return false;
+		}
 		if($this->studiengang_kz=='')
 		{
 			$this->errormsg = 'Es muss ein Studiengang angegeben werden';
@@ -162,6 +167,26 @@ class entwicklungsteam extends basis_db
 			$this->errormsg = 'Endedatum darf nicht vor Anfangsdatum liegen';
 			return false;
 		}
+
+		if($this->beginn != '')
+		{
+			$beginnParts = explode('-', $this->beginn);
+			if (!checkdate((int)$beginnParts[1], (int)$beginnParts[2], (int)$beginnParts[0])) {
+				$this->errormsg = 'Anfangsdatum ist ungültig';
+				return false;
+			}
+		}
+
+		if($this->ende != '')
+		{
+			$endeParts = explode('-', $this->ende);
+			if (!checkdate((int)$endeParts[1], (int)$endeParts[2], (int)$endeParts[0]))
+			{
+				$this->errormsg = 'Endedatum ist ungültig';
+				return false;
+			}
+		}
+
 		return true;
 	}
 
@@ -183,30 +208,28 @@ class entwicklungsteam extends basis_db
 			//Neuen Datensatz anlegen
 			$qry = "INSERT INTO bis.tbl_entwicklungsteam (mitarbeiter_uid, studiengang_kz, besqualcode, beginn, ende,
 					updateamum, updatevon, insertamum, insertvon) VALUES (".
-			       $this->db_add_param($this->mitarbeiter_uid).', '.
-			       $this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
-			       $this->db_add_param($this->besqualcode, FHC_INTEGER).', '.
-			       $this->db_add_param($this->beginn).', '.
-			       $this->db_add_param($this->ende).', '.
-			       $this->db_add_param($this->updateamum).', '.
-			       $this->db_add_param($this->updatevon).', '.
-			       $this->db_add_param($this->insertamum).', '.
-			       $this->db_add_param($this->insertvon).');';
+				$this->db_add_param($this->mitarbeiter_uid).', '.
+				$this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
+				$this->db_add_param($this->besqualcode, FHC_INTEGER).', '.
+				$this->db_add_param($this->beginn).', '.
+				$this->db_add_param($this->ende).', '.
+				$this->db_add_param($this->updateamum).', '.
+				$this->db_add_param($this->updatevon).', '.
+				$this->db_add_param($this->insertamum).', '.
+				$this->db_add_param($this->insertvon).');';
 		}
 		else
 		{
-			if($this->studiengang_kz_old=='')
-				$this->studiengang_kz_old = $this->studiengang_kz;
-
 			//Bestehenden Datensatz aktualisieren
 			$qry= "UPDATE bis.tbl_entwicklungsteam SET".
-				  " besqualcode=".$this->db_add_param($this->besqualcode, FHC_INTEGER).",".
-				  " beginn=".$this->db_add_param($this->beginn).",".
-				  " studiengang_kz=".$this->db_add_param($this->studiengang_kz, FHC_INTEGER).",".
-				  " ende=".$this->db_add_param($this->ende).",".
-				  " updateamum=".$this->db_add_param($this->updateamum).",".
-				  " updatevon=".$this->db_add_param($this->updatevon).
-				  " WHERE entwicklungsteam_id=".$this->db_add_param($this->entwicklungsteam_id).";";
+				" besqualcode=".$this->db_add_param($this->besqualcode, FHC_INTEGER).",".
+				" beginn=".$this->db_add_param($this->beginn).",".
+				" studiengang_kz=".$this->db_add_param($this->studiengang_kz, FHC_INTEGER).",".
+				" ende=".$this->db_add_param($this->ende).",".
+				" mitarbeiter_uid=".$this->db_add_param($this->mitarbeiter_uid).",".
+				" updateamum=".$this->db_add_param($this->updateamum).",".
+				" updatevon=".$this->db_add_param($this->updatevon).
+				" WHERE entwicklungsteam_id=".$this->db_add_param($this->entwicklungsteam_id).";";
 		}
 
 		if($this->db_query($qry))
@@ -234,7 +257,7 @@ class entwicklungsteam extends basis_db
 		if($studiengang_kz!=null)
 			$qry.=" AND studiengang_kz=".$this->db_add_param($studiengang_kz);
 
-        $qry.=";";
+		$qry.=";";
 
 		if($this->db_query($qry))
 		{
@@ -316,7 +339,7 @@ class entwicklungsteam extends basis_db
 
 		if ($sort != null)
 		{
-				$qry .= " ORDER BY ".$sort;
+			$qry .= " ORDER BY ".$sort;
 		}
 
 		$qry .= ";";
@@ -364,7 +387,7 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
+		$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
 					JOIN public.tbl_studiengang USING(studiengang_kz)
@@ -375,7 +398,7 @@ class entwicklungsteam extends basis_db
 		if($studiengang_kz!=null)
 			$qry.=" AND studiengang_kz=".$this->db_add_param($studiengang_kz);
 
-        $qry.=";";
+		$qry.=";";
 
 		if($this->db_query($qry))
 		{
@@ -407,5 +430,20 @@ class entwicklungsteam extends basis_db
 			return false;
 		}
 	}
+
+	/*
+	 * Überprüft, ob die übergebene Uid in der Tabelle tbl_mitarbeiter vorhanden ist
+	 * @param String $uid UID des Mitarbeiters
+	 * @return true wenn vorhanden, false wenn nicht
+	 */
+	private function checkIfExistingUid($uid)
+	{
+		$mitarbeiter = new mitarbeiter();
+
+		if(!$mitarbeiter->checkIfExistingUid($uid))
+			return false;
+
+		return true;
+	}
 }
 ?>

include/mitarbeiter.class.php

@@ -1995,5 +1995,23 @@ class mitarbeiter extends benutzer
 			return true;
 		}
 	}
+
+	/**
+	 * Prueft ob eine existierende ma_uid übergeben wurde
+	 * @param	String $mitarbeiter_uid mitarbeiter_uid
+	 * @return	bool	True wenn mitarbeiter_uid vorhanden sonst false.
+	 */
+	public function checkIfExistingUid($mitarbeiter_uid)
+	{
+		$qry = "Select 1 from public.tbl_mitarbeiter where mitarbeiter_uid =".$this->db_add_param($mitarbeiter_uid);
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+	}
 }
 ?>

public/css/Cis4/Cis.css

@@ -7,6 +7,11 @@ html {
   font-size: 0.875em;
 }
 
+body.compat,
+body.compat main#cis-main {
+	background-color: #fff;
+}
+
 .fhc-dark-bg{
 	background-color: var(--fhc-dark);
 	color:var(--fhc-light) !important;
@@ -454,8 +459,8 @@ html {
 
 /* desktop */
 @media (min-width: 992px) {
-  body {
-    display: flex;
+	body.cis4 {
+		display: flex;
     padding-top: var(--fhc-cis-header-height);
     width: calc(100svw - var(--scrollbar-width, 0px));
     /* overflow: visible !important; */
@@ -760,7 +765,7 @@ html {
 }
 
 .dashboard-item {
-	overscroll-behavior: none;
+	overscroll-behavior: auto;
 }
 
 .abgabe-zieldatum-border-red,
@@ -840,11 +845,8 @@ html {
 	color: var(--fhc-light);
 }
 
-/* the bootstrap opacity 0.5 reaches 2.9:1 on the blue header, 0.75 reaches 4.5:1 (WCAG 1.4.11) */
 #cis-main .modal-header .btn-close{
 	filter: invert(1);
-	--bs-btn-close-opacity: 0.75;
-	--bs-btn-close-hover-opacity: 1;
 }
 
 #cis-main .modal-footer {
@@ -856,4 +858,20 @@ html {
 	border: 1px solid rgba(0, 0, 0, 0.15);
 	border-radius: 0.5rem;
 	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
-}
+}
+
+.cis-main-menu {
+	max-width: 100vw;
+}
+
+.cis-main-menu ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+.cis-main-menu ul li {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}

public/css/Tabulator5.css

@@ -121,9 +121,8 @@
 	background-color: #000;
 }
 
-/* contrast: #777 reaches 4.48:1 on the odd and 4:1 on the even rows (#f2f2f2), #6c6c6c 5.3:1 and 4.7:1 */
 .tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
-	color: #6c6c6c !important;
+	color: #777 !important;
 }
 
 .tabulator-cell .btn {
@@ -157,23 +156,3 @@
 	color: #fff;
 	background: #1d68cd;
 }
-
-/* contrast (WCAG 1.4.11): tabulator_simple draws the inactive sort arrow in #bbb (1.9:1) and the
- * placeholder in #ccc (1.6:1). #8f8f8f (3.2:1) is close to the grey of the active arrow, so the
- * active arrow gets the primary color (6.8:1) */
-.tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-col-sorter .tabulator-arrow,
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="none"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-bottom-color: #8f8f8f;
-}
-
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="ascending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-bottom-color: var(--fhc-primary, #006095);
-}
-
-.tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="descending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-top-color: var(--fhc-primary, #006095);
-}
-
-.tabulator .tabulator-tableholder .tabulator-placeholder .tabulator-placeholder-contents {
-	color: #6c757d;
-}

public/css/components/inViewTooltip.css

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

public/css/theme/default.css

@@ -188,9 +188,6 @@
 	--fhc-light: var(--fhc-white-50);
 
 	--fhc-cis-menu-lvl-1-color: var(--fhc-white-50);
-
-	/* input borders, 3:1 against the background and the tinted card headers (#f8f8f9) */
-	--fhc-input-border: #868e96;
 }
 
 :root.dark {
@@ -236,8 +233,6 @@
 	--fhc-dark: var(--fhc-black-50);
 	--fhc-light: var(--fhc-white-70);
 
-	/* input borders, 3:1 against the background */
-	--fhc-input-border: #7c8791;
 }
 
 :root.purple {
@@ -318,13 +313,12 @@ html.dark .border-primary {
 	border-color: var(--fhc-primary) !important;
 }
 
-/* fhc danger: --fhc-danger is a light red for text and borders on the dark background. White text
- * on it reaches 1.2:1, the backgrounds use the dark red (6.5:1) */
+/* fhc danger*/
 html.dark .bg-danger,
 html.dark .btn-danger,
 html.dark .btn-outline-danger {
-	background-color: var(--fhc-red-60) !important;
-	border-color: var(--fhc-red-60) !important;
+	background-color: var(--fhc-danger) !important;
+	border-color: var(--fhc-danger) !important;
 	color: white;
 }
 
@@ -333,25 +327,6 @@ html.dark .btn-danger:hover {
 	filter: brightness(90%);
 }
 
-/* the dark primevue theme draws p-button-danger (e.g. FhcAlert.confirmDelete) light pink with black text,
- * use the dark red of .btn-danger */
-html.dark .p-button.p-button-danger {
-	color: white;
-	background: var(--fhc-red-60);
-	border-color: var(--fhc-red-60);
-}
-
-html.dark .p-button.p-button-danger:enabled:hover,
-html.dark .p-button.p-button-danger:enabled:active {
-	color: white;
-	background: var(--fhc-red-70);
-	border-color: var(--fhc-red-70);
-}
-
-html.dark .p-button.p-button-danger:enabled:focus {
-	box-shadow: 0 0 0 0.2rem rgba(225, 110, 120, 0.5);
-}
-
 html.dark .text-danger {
 	color: var(--fhc-danger) !important;
 }
@@ -360,55 +335,6 @@ html.dark .border-danger {
 	border-color: var(--fhc-danger) !important;
 }
 
-/* bootstrap draws btn-outline-secondary in #6c757d: 4.3:1 on the light dialog footer (#f6f6f6).
- * --fhc-gray-30 reaches 5.4:1 there, the white hover text 5.9:1 */
-html.light .btn-outline-secondary {
-	--bs-btn-color: var(--fhc-gray-30);
-	--bs-btn-border-color: var(--fhc-gray-30);
-	--bs-btn-hover-bg: var(--fhc-gray-30);
-	--bs-btn-hover-border-color: var(--fhc-gray-30);
-	--bs-btn-active-bg: var(--fhc-gray-30);
-	--bs-btn-active-border-color: var(--fhc-gray-30);
-}
-
-/* bootstrap keeps #6c757d for btn-outline-secondary in the dark theme: 2.4:1 on the dark tables and dialogs */
-html.dark .btn-outline-secondary {
-	--bs-btn-color: var(--fhc-white-90);
-	--bs-btn-border-color: var(--fhc-white-90);
-	--bs-btn-hover-color: var(--fhc-black-30);
-	--bs-btn-hover-bg: var(--fhc-white-90);
-	--bs-btn-hover-border-color: var(--fhc-white-90);
-	--bs-btn-active-color: var(--fhc-black-30);
-	--bs-btn-active-bg: var(--fhc-white-90);
-	--bs-btn-active-border-color: var(--fhc-white-90);
-}
-
-/* the primevue multiselect renders the check icon also in unchecked boxes and hides it by color:
- * white on white in the light theme, but #151515 on #20262e in the dark theme */
-html.dark .p-checkbox .p-checkbox-box:not(.p-highlight) .p-checkbox-icon {
-	color: transparent;
-}
-
-/* FhcAlert.confirm passes bootstrap classes to the primevue buttons. The primevue theme loads after
- * bootstrap, its .p-button colors replace the .btn colors: every button blue */
-.p-button.btn {
-	color: var(--bs-btn-color);
-	background: var(--bs-btn-bg);
-	border-color: var(--bs-btn-border-color);
-}
-
-.p-button.btn:enabled:hover {
-	color: var(--bs-btn-hover-color);
-	background: var(--bs-btn-hover-bg);
-	border-color: var(--bs-btn-hover-border-color);
-}
-
-.p-button.btn:enabled:active {
-	color: var(--bs-btn-active-color);
-	background: var(--bs-btn-active-bg);
-	border-color: var(--bs-btn-active-border-color);
-}
-
 
 html.dark .tabulator,
 html.dark .tabulator .tabulator-header,
@@ -429,52 +355,6 @@ html.dark .tabulator .tabulator-header .tabulator-col:hover {
 	background-color: var(--fhc-tertiary) !important;
 }
 
-/* the active sort arrow of tabulator_simple (#666) reaches 2:1 on the dark header */
-html.dark .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="ascending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-bottom-color: var(--fhc-text);
-}
-
-html.dark .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="descending"] .tabulator-col-content .tabulator-col-sorter .tabulator-arrow {
-	border-top-color: var(--fhc-text);
-}
-
-@media (hover: hover) and (pointer: fine) {
-	html.dark .tabulator .tabulator-header .tabulator-col.tabulator-sortable .tabulator-col-content .tabulator-col-sorter.tabulator-col-sorter-element .tabulator-arrow:hover {
-		border-bottom-color: var(--fhc-text);
-		border-top-color: var(--fhc-text);
-	}
-}
-
-/* the group toggle arrow of tabulator_simple (#666) reaches 2:1 on the dark rows */
-html.dark .tabulator .tabulator-row.tabulator-group:not(.tabulator-group-visible) .tabulator-arrow {
-	border-left-color: var(--fhc-text);
-}
-
-html.dark .tabulator .tabulator-row.tabulator-group.tabulator-group-visible .tabulator-arrow {
-	border-top-color: var(--fhc-text);
-}
-
-/* the footer stays white otherwise: the page buttons get the white button text of the dark color scheme */
-html.dark .tabulator .tabulator-footer {
-	background-color: var(--fhc-tertiary);
-	border-top-color: var(--fhc-border);
-	color: var(--fhc-text);
-}
-
-html.dark .tabulator .tabulator-footer .tabulator-page {
-	background: transparent;
-	border-color: var(--fhc-white-90);
-	color: var(--fhc-text);
-}
-
-html.dark .tabulator .tabulator-footer .tabulator-page.active {
-	color: var(--fhc-red-30);
-}
-
-html.dark .tabulator .tabulator-tableholder .tabulator-placeholder .tabulator-placeholder-contents {
-	color: var(--fhc-white-90);
-}
-
 .p-paginator{
 	background-color: var(--fhc-background) !important;
 }
@@ -496,35 +376,4 @@ html.dark .tabulator .tabulator-tableholder .tabulator-placeholder .tabulator-pl
 
 .p-link:focus {
 	box-shadow: 0 0 0 0.2rem rgba(var(--fhc-primary), 0.5) !important;
-}
-
-/* input borders: 3:1 against the background (WCAG 1.4.11), the bootstrap, primevue and datepicker defaults
- * reach 1.3 - 1.9:1. Focus and checked states of the libraries stay */
-.form-control,
-.form-select,
-.form-check-input,
-.p-inputtext,
-.p-inputtext:enabled:hover:not(:focus),
-.p-dropdown,
-.p-dropdown:not(.p-disabled):hover:not(.p-focus),
-.p-multiselect,
-.p-multiselect:not(.p-disabled):hover:not(.p-focus),
-.p-checkbox .p-checkbox-box,
-.p-radiobutton .p-radiobutton-box {
-	border-color: var(--fhc-input-border, #868e96);
-}
-
-/* the datepicker css loads after the theme, html raises the specificity */
-html .dp__theme_light,
-html .dp__theme_dark {
-	--dp-border-color: var(--fhc-input-border, #868e96);
-	--dp-border-color-hover: var(--fhc-border-highlight, #495057);
-}
-
-/* the light datepicker (also in the dark cis4 theme) draws the days of other months in #c0c4cc (1.8:1),
- * the icons in #959595 (3:1) and the selected day in #f8f5f5 on #1976d2 (4.2:1) */
-html .dp__theme_light {
-	--dp-secondary-color: #6c6c6c;
-	--dp-icon-color: #6c757d;
-	--dp-primary-text-color: #fff;
 }

public/js/api/factory/studiensemester.js

@@ -44,5 +44,15 @@ export default {
 				studiensemester_kurzbz
 			}
 		};
-	}
+	},
+	getContainingOrNearestByDateRange(from, to) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/organisation/studiensemester/getContainingOrNearestByDateRange',
+			params: {
+				from,
+				to,
+			}
+		};
+	},
 };

public/js/apps/LVVerwaltung.js

@@ -17,6 +17,8 @@ const router = VueRouter.createRouter({
 			component: LVVerwaltung,
 			children: [
 				{ name: 'emp', path: 'emp/:emp/:treemenu(.*)*', component: LVVerwaltung },
+				{ name: 'le', path: 'le/:le', component: LVVerwaltung },
+				{ name: 'lv', path: 'lv/:lv', component: LVVerwaltung },
 				{ name: 'treemenu', path: ':treemenu(.*)*', component: LVVerwaltung }
 			]
 		},

public/js/components/Bootstrap/Modal.js

@@ -73,7 +73,6 @@ export default {
 		}
 	},
 	computed: {
-		// opacity 0.5 reaches 2.4:1 on the blue cis4 modal header, 0.75 reaches 3.6:1 (WCAG 1.4.11)
 		getExpandButtonStyles() {
 			const hovered = this.expandBtnHovered;
 			const focused = this.expandBtnFocused;
@@ -86,11 +85,12 @@ export default {
 					border: 0;
 					background: transparent;
 					font-size: 1em;
+					opacity: 0.5;
 					color: inherit;
 					cursor: pointer;
 					line-height: 1;
 					transition: opacity 0.15s ease;
-					opacity: ${focused || hovered ? '1' : '0.75'};
+					opacity: ${focused ? '1' : hovered ? '0.75' : '0.5'};
 					outline: ${focused ? '1px solid currentColor' : 'none'};
 					outline-offset: 2px;`
 		}	
@@ -103,6 +103,13 @@ export default {
 				keyboard: this.keyboard
 			});
 	},
+	//to avoid pagelocks if more than one instance
+	beforeUnmount() {
+		if (this.modal) {
+			this.modal.dispose();
+			this.modal = null;
+		}
+	},
 	popup(body, options, title, footer) {
 		const BsModal = this,
 			slots = {};

public/js/components/Cis/Compat.js

@@ -16,9 +16,15 @@ export default {
 			return this.mode + '#' + this.path + '#' + this.query_string;
 		}
 	},
+	beforeMount: function() {
+		document.body.classList.add('compat');
+	},
 	mounted: function() {
 		this.srcUrl = this.buildSrcUrl();
 	},
+	beforeUnmount: function() {
+		document.body.classList.remove('compat');
+	},
 	watch: {
 		propsWatchHelper: function() {
 			if(this.lastLoadediFrameURL === '') {

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

@@ -1,6 +1,7 @@
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
+import ApiStudienSemester from '../../../api/factory/studiensemester.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
 export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
@@ -16,13 +17,12 @@ export default {
 	},
 	data() {
 		return {
-			studiensemester_kurzbz: null,
-			studiensemester_start: null,
-			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
 			isStudent: false,
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+			startSemester: null,
+			endSemester: null,
 		};
 	},
 	inject: ["isMobile"],
@@ -48,9 +48,12 @@ export default {
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
-			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
-				return false;
+			const startDate = this.startSemester?.start;
+			const endDate = this.endSemester ? this.endSemester.ende : this.startSemester?.ende;
 
+			if (!startDate || !endDate || !this.uid)
+				return false;
+			
 			let type = false;
 			type = this.isStudent ? 'student' : type;
 			type = this.isMitarbeiter ? 'lektor' : type;
@@ -61,10 +64,10 @@ export default {
 
 			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
-				.fromISO(this.studiensemester_start, opts)
+				.fromISO(startDate, opts)
 				.toUnixInteger();
 			const ende = luxon.DateTime
-				.fromISO(this.studiensemester_ende, opts)
+				.fromISO(endDate, opts)
 				.toUnixInteger();
 
 			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
@@ -109,16 +112,21 @@ export default {
 				}
 			});
 		},
-		updateRange(rangeInterval) {
-			this.$api
-				.call(ApiLvPlan.studiensemesterDateInterval(
-					rangeInterval.end.startOf('week').toISODate()
-				))
-				.then(res => {
-					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
-					this.studiensemester_start = res.data.start;
-					this.studiensemester_ende = res.data.ende;
-				});
+		async updateRange(rangeInterval) {
+			const semesterResponse = await this.$api.call(
+				ApiStudienSemester.getContainingOrNearestByDateRange(
+					rangeInterval.s.toISO().slice(0, 10),
+					rangeInterval.e.toISO().slice(0, 10),
+				),
+			);
+			this.startSemester = 
+				semesterResponse.data.length
+					? semesterResponse.data[0]
+					: null;
+			this.endSemester =
+				semesterResponse.data.length > 1
+					? semesterResponse.data[1]
+					: null;
 		},
 		getPromiseFunc(start, end) {
 			return [
@@ -142,8 +150,11 @@ export default {
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
 		<h2>
 			{{ $p.t('lehre/stundenplan') }}
-			<span v-if="studiensemester_kurzbz" class="ps-3">
-				{{ studiensemester_kurzbz }}
+			<span v-if="startSemester?.studiensemester_kurzbz">
+				{{ startSemester.studiensemester_kurzbz }}
+				<span v-if="endSemester?.studiensemester_kurzbz">
+					{{ "- " + endSemester.studiensemester_kurzbz }}
+				</span>
 			</span>
 		</h2>
 		<hr>

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

@@ -5,6 +5,7 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 import ApiLvPlan from "../.././../api/factory/lvPlan.js";
 import ApiOtherLvPlan from "../.././../api/factory/otherLvPlan.js";
 import ApiAuthinfo from "../../../api/factory/authinfo.js";
+import ApiStudienSemester from '../../../api/factory/studiensemester.js';
 
 export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
 export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
@@ -22,9 +23,6 @@ export default {
 	data() {
 		return {
 			localProps: {},
-			studiensemester_kurzbz: null,
-			studiensemester_start: null,
-			studiensemester_ende: null,
 			isOtherPersonMitarbeiter: false,
 			isOtherPersonStudent: false,
 			currentStgBezeichnung: null,
@@ -36,6 +34,8 @@ export default {
 				photo: "",
 			},
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+			startSemester: null,
+			endSemester: null,
 		};
 	},
 	inject: ["isMobile"],
@@ -67,11 +67,10 @@ export default {
 			// do not show download links in otherLvPlan Mode
 			return false;
 
-			if (
-				!this.studiensemester_start ||
-				!this.studiensemester_ende ||
-				!this.propsViewData.otherUid
-			)
+			const startDate = this.startSemester?.start;
+			const endDate = this.endSemester ? this.endSemester.ende : this.startSemester?.ende;
+
+			if (!startDate || !endDate || !this.uid)
 				return false;
 
 			const type = this.isOtherPersonStudent
@@ -84,11 +83,11 @@ export default {
 
 			const opts = { zone: this.timezone };
 			const start = luxon.DateTime.fromISO(
-				this.studiensemester_start,
+				startDate,
 				opts,
 			).toUnixInteger();
 			const ende = luxon.DateTime.fromISO(
-				this.studiensemester_ende,
+				endDate,
 				opts,
 			).toUnixInteger();
 
@@ -166,19 +165,21 @@ export default {
 				},
 			});
 		},
-		updateRange(rangeInterval) {
-			this.$api
-				.call(
-					ApiLvPlan.studiensemesterDateInterval(
-						rangeInterval.end.startOf("week").toISODate(),
-					),
-				)
-				.then((res) => {
-					this.studiensemester_kurzbz =
-						res.data.studiensemester_kurzbz;
-					this.studiensemester_start = res.data.start;
-					this.studiensemester_ende = res.data.ende;
-				});
+		async updateRange(rangeInterval) {
+			const semesterResponse = await this.$api.call(
+				ApiStudienSemester.getContainingOrNearestByDateRange(
+					rangeInterval.s.toISO().slice(0, 10),
+					rangeInterval.e.toISO().slice(0, 10),
+				),
+			);
+			this.startSemester = 
+				semesterResponse.data.length
+					? semesterResponse.data[0]
+					: null;
+			this.endSemester =
+				semesterResponse.data.length > 1
+					? semesterResponse.data[1]
+					: null;
 		},
 		getPromiseFunc(start, end) {
 			return [
@@ -250,8 +251,14 @@ export default {
     <div class="d-flex flex-column h-100">
         <h2>
             <div class="d-flex flex-row justify-content-between align-items-center">
-			          <span>    
-                    {{ $p.t('lehre/stundenplan') + (studiensemester_kurzbz ? " " + studiensemester_kurzbz : "") }}
+			    <span>
+                    {{ $p.t('lehre/stundenplan') }}
+					<span v-if="startSemester?.studiensemester_kurzbz">
+						{{ startSemester.studiensemester_kurzbz }}
+						<span v-if="endSemester?.studiensemester_kurzbz">
+							{{ "- " + endSemester.studiensemester_kurzbz }}
+						</span>
+			</span>
                 </span>
                 <div @click="this.$router.push({name: 'ProfilView', params: {uid: propsViewData.otherUid}})" type="button" class="d-flex flex-row align-items-center gap-3">
                     <span v-if="otherPersonData.fullNameWithTitle?.length">

public/js/components/Cis/Menu.js

@@ -186,7 +186,7 @@ export default {
 		</div>
 	</div>
 
-    <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+    <nav id="nav-main" class="cis-main-menu offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div class="d-flex flex-row h-100">
 				<div class="offcanvas-body p-0">

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

@@ -162,6 +162,7 @@ export default {
 			<div class="btn-group w-100">
  				<a :target="target" 
  					:href="(entry.menu_open && hasFullLink) ? entry.url : null"
+					draggable="false"
 					@click="toggleCollapse"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
@@ -180,12 +181,15 @@ export default {
             </div>
             <ul ref="children"
                 class="nav w-100 collapse">
-                <cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+				<li>
+					<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeContent" v-for="child in entry.childs" :key="child" :entry="child" :level="level + 1"/>
+				</li>
             </ul>
         </template>
 		<a v-else
             :href="entry.url"
             :target="target"
+			draggable="false"
             :class="{
                 'btn btn-default rounded-0 w-100 text-start': true,
                 ['btn-level-' + level]: true,

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

@@ -73,7 +73,7 @@ export default  {
 			// check if the lv has lvplan entries for this studiensemester
 			if (this.studiensemester && this.event) {
 				return this.$fhcApi.factory.studium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
-					.then(data => data.data)
+					.then(data => data.data?.retval)
 					.then(res => {
 						if (Array.isArray(res) && res.length > 0) {
 							this.hasLvPlanEintraege = true;
@@ -114,4 +114,4 @@ export default  {
 
     
     `,
-};
+};

public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js

@@ -2,15 +2,16 @@ export default {
 	props: {
 		data: {
 			type: String,
-		}
+		},
 	},
 	data() {
-		return {}
+		return {};
 	},
-	template: /*html*/`
+	template: /*html*/ `
     <div class="card">
         <div class="card-body">
-            <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+            <span v-if="data">{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+			<span v-else>{{$p.t('profil','fhAusweisStatusNichtAusgegeben')}}</span>
         </div>
     </div>`,
-}
+};

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

@@ -1,5 +1,6 @@
 
 export default {
+	name: 'Cis-Renderer-Feiertag-CalendarEvent',
 	props: {
 		event: {
 			type: Object,

public/js/components/Cis/Renderer/Feiertage/modalContent.js

@@ -1,6 +1,7 @@
 import { formatDate } from "../../../../helpers/DateHelpers.js"
 
 export default {
+	name: 'Cis-Renderer-Feiertag-ModalContent',
 	props:{
 		event: {
 			type: Object,

public/js/components/Cis/Renderer/Feiertage/modalTitle.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Feiertag-ModalTitle',
 	props:{
 		event: {
 			type: Object,

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

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Lehreinheit-CalendarEvent',
 	props:{
 		event: {
 			type: Object,
@@ -66,24 +67,6 @@ export default {
 					return "d-none d-xl-grid";
 			}
 		},
-		// link into the FHC-Core-Anwesenheiten tool
-		// digi_anw_data is attached per event by the extension's `extendStundenplanData` listener
-		anwLink() {
-			const d = this.event && this.event.digi_anw_data;
-			if (!d || !d.stg_kz || !d.lv_id || !d.sem_kurzbz)
-				return null;
-			const base = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/extensions/FHC-Core-Anwesenheiten/';
-			return base
-				+ `?stg_kz=${encodeURIComponent(d.stg_kz)}`
-				+ `&sem=${encodeURIComponent(d.sem ?? '')}`
-				+ `&lvid=${encodeURIComponent(d.lv_id)}`
-				+ `&sem_kurzbz=${encodeURIComponent(d.sem_kurzbz)}`;
-		},
-		anwLinkTitle() {
-			return this.$p.t('global/anwKontrolleOeffnen');
-		},
 	},
 	template: /*html*/`
 	<div
@@ -114,21 +97,6 @@ export default {
 				... +{{ event.lektor.length - 3 }}
 			</span>
 		</div>
-		<a
-			v-if="anwLink"
-			:href="anwLink"
-			target="_blank"
-			rel="noopener"
-			class="d-flex align-items-center flex-shrink-0"
-			style="margin-right: 4px"
-			:title="anwLinkTitle"
-			:aria-label="anwLinkTitle"
-			draggable="false"
-			@click.stop
-			@mousedown.stop
-		>
-			<i class="fa fa-arrow-up-right-from-square fs-5" aria-hidden="true"></i>
-		</a>
 	</div>
 	`,
 }

public/js/components/Cis/Renderer/Lehreinheit/modalContent.js

@@ -5,6 +5,7 @@ import ApiLvPlan from '../../../../api/factory/lvPlan.js';
 import ApiAddons from '../../../../api/factory/addons.js';
 
 export default {
+	name: 'Cis-Renderer-Lehreinheit-ModalContent',
 	components:{
 		LvMenu,
 	},
@@ -50,19 +51,15 @@ export default {
 			}
 			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		},
-		// Deep link into the attendance tool; only present when the anw extension wrote into digi_anw_data
-		anwLink: function () {
-			const d = this.event && this.event.digi_anw_data;
-			if (!d || !d.stg_kz || !d.lv_id || !d.sem_kurzbz)
-				return null;
-			const base = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/extensions/FHC-Core-Anwesenheiten/';
-			return base
-				+ `?stg_kz=${encodeURIComponent(d.stg_kz)}`
-				+ `&sem=${encodeURIComponent(d.sem ?? '')}`
-				+ `&lvid=${encodeURIComponent(d.lv_id)}`
-				+ `&sem_kurzbz=${encodeURIComponent(d.sem_kurzbz)}`;
+		showLvMenu: function() {
+			const hideOnRoutes = [
+				'OtherLvPlan',
+				'StgOrgLvPlan'
+			];
+			if(hideOnRoutes.includes(this.$route.name)) {
+				return false;
+			}
+			return true;
 		}
 	},
 	watch: {
@@ -174,18 +171,8 @@ export default {
 						}}</th>
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
-					<tr v-if="anwLink">
-						<th>{{
-							$p.t('global','anwKontrolle')?
-							$p.t('global','anwKontrolle')+':'
-							:''
-						}}</th>
-						<td>
-							<a :href="anwLink" target="_blank" rel="noopener" :aria-label="$p.t('global','anwKontrolleOeffnen')" :title="$p.t('global','anwKontrolleOeffnen')"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
-						</td>
-					</tr>
 				</tbody>
 		</table>
-		<lv-menu v-if="lvMenu.length && $route.name === 'MyLvPlan'" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
+		<lv-menu v-if="lvMenu.length && showLvMenu" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
 	</div>`,
 }

public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Lehreinheit-ModalTitle',
 	props:{
 		event: {
 			type: Object,

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

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Reservierung-CalendarEvent',
 	props: {
 		event: {
 			type: Object,

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

@@ -2,6 +2,7 @@ import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
 import LvMenu from "../../Mylv/LvMenu.js";
 
 export default {
+	name: 'Cis-Renderer-Reservierung-ModalContent',
 	props:{
 		event: {
 			type: Object,

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

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Reservierung-ModalTitle',
 	props:{
 		event: {
 			type: Object,

public/js/components/Dashboard/Item.js

@@ -1,5 +1,6 @@
 import BsModal from "../Bootstrap/Modal.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
+import MissingPermissionWidget from "../DashboardWidget/MissingPermission.js";
 
 import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
 
@@ -112,6 +113,12 @@ export default {
 		isPinned() {
 			return this.place?.pinned ? true : false;
 		},
+		permitted() {
+			// widgets without a linked permission (or before the template loaded)
+			// are considered permitted; the backend sets permitted === false only
+			// when the user is missing the widget's required permission
+			return this.widgetTemplate?.permitted !== false;
+		},
 		ready() {
 			return this.component && this.arguments !== null;
 		}
@@ -169,7 +176,11 @@ export default {
 				&& this.widgetTemplate.widget_id
 				&& this.widgetTemplate.arguments
 			) {
-				let component = (await import(this.widgetTemplate.setup.file)).default;
+				// render the "missing permission" screen instead of the actual
+				// widget when the user does not hold the widget's linked permission
+				let component = this.permitted
+					? (await import(this.widgetTemplate.setup.file)).default
+					: MissingPermissionWidget;
 				this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
 				this.component = "widget" + this.widgetTemplate.widget_id;
 				this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
@@ -269,7 +280,7 @@ export default {
 				</template>
 				<!-- widget link -->
 				<a
-					v-if="widgetTemplate.setup.cis4link"
+					v-if="widgetTemplate.setup.cis4link && permitted"
 					:href="getWidgetC4Link(widgetTemplate)"
 					class="col-auto ms-auto"
 					:aria-label="$p.t('dashboard/widget_link')"

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

@@ -14,10 +14,14 @@ export default {
 		callbacks: {}
 	}),
 	computed: {
+		// filter widgets away the user has no permissions for
+		availableWidgets() {
+			return (this.widgets || []).filter(widget => widget.permitted !== false);
+		},
 		hasAnyWidgets() {
 			if (!this.widgets)
 				return false;
-			if (!this.widgets.length && !this.hiddenWidgets?.length)
+			if (!this.availableWidgets.length && !this.hiddenWidgets?.length)
 				return false;
 			return true;
 		}
@@ -54,7 +58,7 @@ export default {
 			<template v-slot:default>
 				<template v-if="widgets && hiddenWidgets">
 					<div
-						v-if="!widgets.length && !hiddenWidgets.length"
+						v-if="!availableWidgets.length && !hiddenWidgets.length"
 						class="row g-2"
 					>
 						<div>{{ $p.t('dashboard/noWidgetsAvailable') }}</div>
@@ -74,16 +78,17 @@ export default {
 							</div>
 						</div>
 						<div
-							v-if="widgets.length"
+							v-if="availableWidgets.length"
 							class="row g-2"
 						>
-							<div
-								v-for="widget in widgets"
+							<template
+								v-for="widget in availableWidgets"
 								:key="widget.widget_id"
-								class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2"
 							>
-								<widget-icon @select="pick" :widget="widget"></widget-icon>
-							</div>
+								<div v-if="widget.permitted" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
+									<widget-icon @select="pick" :widget="widget"></widget-icon>
+								</div>
+							</template>
 						</div>
 					</template>
 				</template>

public/js/components/DashboardWidget/MissingPermission.js

@@ -0,0 +1,21 @@
+import AbstractWidget from './Abstract.js';
+
+/**
+ * Fallback screen rendered in place of a widget when the current user is missing
+ * the permission (berechtigung_kurzbz) linked to that widget. Used for widgets
+ * that are already on a user's dashboard but whose required permission the user
+ * no longer holds.
+ */
+export default {
+	mixins: [
+		AbstractWidget
+	],
+	created() {
+		this.$emit('setConfig', false);
+	},
+	template: /*html*/`
+	<div class="dashboard-widget-missing-permission d-flex flex-column justify-content-center align-items-center text-center h-100 p-3 text-body-secondary">
+		<i class="fa-solid fa-lock fa-2x mb-2" aria-hidden="true"></i>
+		<p class="mb-0">{{ $p.t('dashboard/widget_missing_permission') }}</p>
+	</div>`
+}

public/js/components/InViewHelp.js

@@ -1,34 +0,0 @@
-import InViewTooltip from '../directives/inViewTooltip.js';
-
-/**
- * ? icon with a help text in the in-view tooltip. The panel stays inside the viewport, also at the
- * screen edge, in a modal and on a phone: a plain tooltip ran out of the screen there.
- *
- * Help texts are long, so the panel is sticky by default: it sticks after a hover of 1.4 s or a click,
- * a tap toggles it on touch. sticky: false makes it a plain hover tooltip.
- *
- * The view needs public/css/components/inViewTooltip.css.
- *
- * Usage: <in-view-help :text="$p.t('category/phrase')" button-class="fs-5 text-body-secondary"></in-view-help>
- */
-export default {
-	name: 'InViewHelp',
-	directives: {
-		tooltip: InViewTooltip
-	},
-	props: {
-		text: { type: String, default: '' },
-		sticky: { type: Boolean, default: true },
-		buttonClass: { type: [String, Array, Object], default: '' }
-	},
-	template: /*html*/ `
-	<button
-		type="button"
-		class="btn btn-link p-0 fhc-in-view-help-btn"
-		:class="buttonClass"
-		:aria-label="$p.t('ui/hilfe')"
-		v-tooltip="{ value: text, sticky }"
-	>
-		<i class="fa fa-circle-question" aria-hidden="true"></i>
-	</button>`
-};

public/js/components/LVVerwaltung/LVVerwaltung.js

@@ -61,6 +61,7 @@ export default {
 			selected: [],
 			studiengang_kz: null,
 			selectedStudiensemester: this.defaultSemester,
+			preselected: null,
 			dropdowns: {
 				studiensemester_array: [],
 				sprachen_array: [],
@@ -73,7 +74,11 @@ export default {
 				calcheightonly: true,
 				types: [
 					"mitarbeiter",
-					"mitarbeiter_ohne_zuordnung"
+					"mitarbeiter_ohne_zuordnung",
+/*
+					"lehreinheit",
+					"lehrveranstaltung",
+*/
 				],
 				actions: {
 					employee: {
@@ -86,6 +91,26 @@ export default {
 						childactions: [
 						]
 					},
+					lehreinheit: {
+						defaultaction: {
+							type: "function",
+							action: (data) => {
+								this.onSelectLehreinheit(data);
+							}
+						},
+						childactions: [
+						]
+					},
+					lehrveranstaltung: {
+						defaultaction: {
+							type: "function",
+							action: (data) => {
+								this.onSelectLehrveranstaltung(data);
+							}
+						},
+						childactions: [
+						]
+					}
 				}
 			},
 		}
@@ -94,6 +119,8 @@ export default {
 		filter() {
 			let filter = {
 				emp: this.$route.params.emp,
+				le: this.$route.params.le,
+				lv: this.$route.params.lv,
 				studiensemester_kurzbz: this.selectedStudiensemester
 			};
 			let index;
@@ -105,7 +132,7 @@ export default {
 				if (index > -1)
 					filter.semester = this.$route.params.treemenu[index+1];
 			}
-			filter.activeFilter = filter.emp ? 'employee' : filter.stg ? 'verband' : null;
+			filter.activeFilter = filter.emp ? 'employee' : filter.stg ? 'verband' : filter.le ? 'lehreinheit' : filter.lv ? 'lehrveranstaltung' : null;
 			return filter;
 		},
 		emp() {
@@ -203,20 +230,50 @@ export default {
 		},
 		onSelectEmployee(emp)
 		{
+			let params = { ...this.$route.params }
+			delete params.le;
+			delete params.lv;
+
 			this.$router.push({
 				name: 'emp',
 				params: {
-					...this.$route.params,
+					...params,
 					emp
 				}
 			});
 		},
+		onSelectLehreinheit(lehreinheit)
+		{
+			this.$router.push({
+				name: 'le',
+				params: {
+					le: lehreinheit.id,
+					stdsem: lehreinheit.studiensemester_kurzbz.toLowerCase()
+				}
+			});
+		},
+
+		onSelectLehrveranstaltung(lehrveranstaltung)
+		{
+			this.$router.push({
+				name: 'lv',
+				params: {
+					lv: lehrveranstaltung.id,
+					stdsem: lehrveranstaltung?.studiensemester_kurzbz?.toLowerCase() ?? this.selectedStudiensemester.toLowerCase()
+				}
+			});
+		},
 		onSelectVerband({ path: link, stg_kz })
 		{
+
+			let params = { ...this.$route.params }
+			delete params.le;
+			delete params.lv;
+
 			this.$router.push({
 				name: this.$route.name == 'emp' ? 'emp' : 'treemenu',
 				params: {
-					...this.$route.params,
+					...params,
 					treemenu: link.split('/')
 				}
 			});
@@ -295,7 +352,7 @@ export default {
 		}
 	},
 	created() {
-		if (!this.$route.params.stdsem) {
+		if (this.$route.name !== 'le' && this.$route.name !== 'lv' && !this.$route.params.stdsem) {
 			this.$router.replace({
 				name: 'stdsem',
 				params: {
@@ -477,7 +534,8 @@ export default {
 								<template #top>
 									<lv-table ref="lvTable"
 										v-model:selected="selected"
-										 @row-clicked="handleRowClicked"
+										@row-clicked="handleRowClicked"
+										@select-LV="onSelectLehrveranstaltung"
 										:filter="filter"
 									>
 										<template #filterzuruecksetzen v-if="filter.activeFilter === 'employee'">

public/js/components/LVVerwaltung/Setup/Table.js

@@ -57,7 +57,8 @@ export default {
 	},
 	emits: [
 		'update:selected',
-		'row-clicked'
+		'row-clicked',
+		'selectLV',
 	],
 	watch: {
 		filter: {
@@ -106,8 +107,24 @@ export default {
 				{
 					event: 'dataProcessed',
 					handler: (data) => {
-						this.reexpandRows()
-						this.$emit('update:selected', {})
+						if (this.$route.params.le)
+						{
+							this.$refs.table.tabulator.selectRow(this.$refs.table.tabulator.getRows());
+						}
+						else if (this.$route.params.lv)
+						{
+							this.$refs.table.tabulator.selectRow(this.$refs.table.tabulator.getRows());
+
+							this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
+							this.allRows.forEach(row => {
+								row.treeExpand()
+							});
+						}
+						else
+						{
+							this.reexpandRows()
+							this.$emit('update:selected', {})
+						}
 					}
 				},
 				{
@@ -221,35 +238,35 @@ export default {
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
 
-					if (e.getData()?.lehreinheit_id === undefined)
-						return;
+					if (e.getData()?.lehreinheit_id === undefined || !e.getData()?.lehreinheit_id)
+						return [];
 					return [
 						{
-							label: "LV-Teil kopieren",
+							label: this.$p.t('lehre', 'lvteilkopieren'),
 							menu: [
 								{
-									label: "Alles",
+									label: this.$p.t('lehre', 'alles'),
 									action: (e, row) =>
 									{
 										this.copyLehreinheit(row, "alle");
 									},
 								},
 								{
-									label: "Nur LV-Teil",
+									label: this.$p.t('lehre', 'nurlvteil'),
 									action: (e, row) =>
 									{
 										this.copyLehreinheit(row, "lvteil");
 									},
 								},
 								{
-									label: "Nur mit Gruppen",
+									label: this.$p.t('lehre', 'nurmitgruppen'),
 									action: (e, row) =>
 									{
 										this.copyLehreinheit(row, "gruppen");
 									},
 								},
 								{
-									label: "Nur mit Lehrenden",
+									label: this.$p.t('lehre', 'nurmitlehrende'),
 									action: (e, row) =>
 									{
 										this.copyLehreinheit(row, "lektoren");
@@ -258,7 +275,21 @@ export default {
 							],
 						},
 						{
-							label: "Entfernen",
+							label: this.$p.t('lehre', 'zurlvspringen'),
+							action: (e, row)  => {
+								this.openLV(row)
+							},
+						},
+						{
+							label: this.$p.t('lehre', 'lvteillinkkopieren'),
+							action: (e, row)  => {
+								let rowData = row.getData();
+								let link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/LVVerwaltung/stdsem/' + rowData.studiensemester_kurzbz.toLowerCase() + '/le/' + rowData.lehreinheit_id;
+								navigator.clipboard.writeText(link);
+							},
+						},
+						{
+							label: this.$p.t('ui', 'entfernen'),
 							action: (e, row)  => {
 								this.deleteLehreinheit(row)
 							},
@@ -355,7 +386,7 @@ export default {
 		},
 		buildApiUrl()
 		{
-			if (!['emp', 'treemenu'].includes(this.$route.name))
+			if (!['emp', 'treemenu', 'le', 'lv'].includes(this.$route.name))
 				return null;
 
 			let url = 'stdsem/' + this.$route.params.stdsem;
@@ -364,6 +395,14 @@ export default {
 				url += '/emp/' + this.$route.params.emp;
 			}
 
+			if (this.$route.params.le) {
+				url += '/le/' + this.$route.params.le;
+			}
+
+			if (this.$route.params.lv) {
+				url += '/lv/' + this.$route.params.lv;
+			}
+
 			if (this.$route.params.treemenu) {
 				url += '/' + this.$route.params.treemenu.join('/');
 			}
@@ -502,6 +541,17 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		openLV(row)
+		{
+			let rowData = row.getData();
+
+
+			let data = {
+				id: rowData.lehrveranstaltung_id,
+				studiensemester_kurzbz: rowData.studiensemester_kurzbz
+			}
+			this.$emit('selectLV', data);
+		},
 		getAllRows(rows)
 		{
 			let result = [];

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

@@ -263,7 +263,7 @@ export default {
 			this.$refs[modalRef].hide();
 		},
 		reload() {
-			this.$refs.table.reloadTable();
+			this.$refs.table?.reloadTable();
 		},
 		searchFirma(event) {
 			if (this.abortController.firmen) {

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

@@ -30,6 +30,9 @@ export default {
 	computed: {
 		betreuerFormOpened() {
 			return this.newMode || this.editMode;
+		},
+		isMitarbeiter(){
+			return this.autocompleteSelectedBetreuer?.name?.includes('Mitarbeiter') ?? false;
 		}
 	},
 	props: {
@@ -430,6 +433,11 @@ export default {
 		},
 		actionKontaktdatenBearbeiten() {
 			if (!this.autocompleteSelectedBetreuer) return;
+			if (this.isMitarbeiter)
+			{
+				this.$fhcAlert.alertError(this.$p.t('ui', 'editingMitarbeiterPVonly'));
+				return;
+			} 
 			this.$refs.kontaktdatenModal.show();
 		},
 		// stuff to do after new person has been saved
@@ -494,7 +502,12 @@ export default {
 						<button class="btn btn-outline-secondary" @click="actionNewPerson">{{ $p.t('projektarbeit', 'neuePersonAnlegen') }}</button>
 					</div>
 					<div class="col-6">
-						<button class="btn btn-outline-secondary float-end" @click="actionKontaktdatenBearbeiten">{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}</button>
+						<button
+							class="btn btn-outline-secondary float-end"
+							@click="actionKontaktdatenBearbeiten"
+						>
+							{{ $p.t('projektarbeit', 'kontaktdatenBearbeiten') }}
+						</button>
 					</div>
 				</div>
 
@@ -605,7 +618,7 @@ export default {
 				</contact>
 			</div>
 		</div>
-
 	</bs-modal>
+
 `
 }

public/js/components/filter/Filter.js

@@ -106,13 +106,6 @@ export const CoreFilterCmpt = {
 			type: Array,
 			default: [],
 		},
-		// fields of the columns a preset is allowed to handle. Give the constant
-		// columns here if the table builds dynamic columns at runtime. An empty
-		// array gives the preset every column of the table.
-		presetColumns: {
-			type: Array,
-			default: [],
-		},
 	},
 	data: function () {
 		return {
@@ -949,10 +942,6 @@ export const CoreFilterCmpt = {
 				return res;
 			}, {});
 		},
-		isColumnInPresetScope(columnField) {
-			if (!this.$props.presetColumns.length) return true;
-			return this.$props.presetColumns.includes(columnField);
-		},
 		afterTablePresetApplied(preset) {
 			this.selectedFields = [...preset.displayedColumns];
 			this.appliedPreset = { ...preset };
@@ -984,7 +973,6 @@ export const CoreFilterCmpt = {
 
 			const displayedColumns = this.tabulator.columnManager.columns
 				.filter((column) => column.field !== "collapse")
-				.filter((column) => this.isColumnInPresetScope(column.field))
 				.filter((column) => column.visible)
 				.map((column) => column.field);
 
@@ -1041,13 +1029,12 @@ export const CoreFilterCmpt = {
 			});
 
 			const activeSort = this.tabulator.getSorters()[0];
-			const sort =
-				activeSort && this.isColumnInPresetScope(activeSort.field)
-					? {
-							column: activeSort.field,
-							direction: activeSort.dir,
-						}
-					: null;
+			const sort = activeSort
+				? {
+						column: activeSort.field,
+						direction: activeSort.dir,
+					}
+				: null;
 			if (
 				sort?.column !== this.appliedPreset.sort?.column ||
 				sort?.direction !== this.appliedPreset.sort?.direction
@@ -1161,7 +1148,6 @@ export const CoreFilterCmpt = {
 				:presetsId="$props.presetsId"
 				:tabulator="tabulator"
 				:generalPresets="$props.generalPresets"
-				:presetColumns="$props.presetColumns"
 				ref="tablePresets"
 				class="card-body collapse"
 			></table-presets>

public/js/components/filter/Filter/TablePresets.js

@@ -26,9 +26,6 @@ export default {
 		presetsId: { type: String },
 		tabulator: { type: Object },
 		generalPresets: { type: Array, default: [] },
-		// fields of the columns the preset is allowed to handle. An empty array
-		// gives the preset every column of the table.
-		presetColumns: { type: Array, default: [] },
 	},
 	emits: ["tablePresetApplied"],
 	data: function () {
@@ -165,10 +162,6 @@ export default {
 		},
 	},
 	methods: {
-		isInPresetScope(columnField) {
-			if (!this.$props.presetColumns.length) return true;
-			return this.$props.presetColumns.includes(columnField);
-		},
 		getPresetIndex() {
 			return this.presetIndexBeingApplied;
 		},
@@ -234,9 +227,9 @@ export default {
 			}
 		},
 		generateNewPreset() {
-			const columns = this.tabulator.columnManager.columns
-				.filter((column) => column.field !== "collapse")
-				.filter((column) => this.isInPresetScope(column.field));
+			const columns = this.tabulator.columnManager.columns.filter(
+				(column) => column.field !== "collapse",
+			);
 
 			const displayedColumns = columns
 				.filter((column) => column.visible)
@@ -258,13 +251,12 @@ export default {
 			);
 
 			const activeSort = this.tabulator.getSorters()[0];
-			const sort =
-				activeSort && this.isInPresetScope(activeSort.field)
-					? {
-							column: activeSort.field,
-							direction: activeSort.dir,
-						}
-					: null;
+			const sort = activeSort
+				? {
+						column: activeSort.field,
+						direction: activeSort.dir,
+					}
+				: null;
 
 			this.newPreset = {
 				displayedColumns,
@@ -333,11 +325,8 @@ export default {
 					preset.displayedColumns.length;
 				preset.displayedColumns = preset.displayedColumns.filter(
 					(columnField) => {
-						return (
-							this.isInPresetScope(columnField) &&
-							validColumns.some(
-								(column) => column.field === columnField,
-							)
+						return validColumns.some(
+							(column) => column.field === columnField,
 						);
 					},
 				);
@@ -376,11 +365,10 @@ export default {
 
 			if (preset.sort) {
 				if (
-					!this.isInPresetScope(preset.sort.column) ||
 					!validColumns.some(
 						(column) =>
 							column.field === preset.sort.column &&
-							column.headerSort !== false,
+							column.headerSort,
 					)
 				) {
 					preset.sort = null;
@@ -419,10 +407,7 @@ export default {
 				window.localStorage["tabulatorPreset-" + this.$props.presetsId] =
 					preset.id ? "custom:" + preset.id : "general:" + preset.name;
 	
-				this.$props.tabulator.modules.tablePresets.applyPreset(
-					preset,
-					this.$props.presetColumns,
-				);
+				this.$props.tabulator.modules.tablePresets.applyPreset(preset);
 				
 				this.$emit("tablePresetApplied", { preset });
 	

public/js/components/searchbar/result/teachingunit.js

@@ -0,0 +1,62 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	name: 'SearchbarResultTeachingUnit',
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-teachingunit"
+		:res="res"
+		:actions="actions"
+		:title="res.bezeichnung"
+		:image-fallback="res.foto"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell searchbar_label"> {{ res.type === 'lehreinheit' ? $p.t('lehre/lehreinheit') : $p.t('lehre/lehrveranstaltung') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/studiengang') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.studiengang }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow" v-if="res.oe_bezeichnung">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/organisationseinheit') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.oe_bezeichnung }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow" v-if="res.studiensemester_kurzbz">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/studiensemester') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.studiensemester_kurzbz }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/ausbildungssemester') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.semester }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/lehrform') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
+					{{ res.lehrform_kurzbz }}
+				</div>
+			</div>
+		
+		</div>
+	</template-frame>`
+};

public/js/components/searchbar/searchbar.js

@@ -8,6 +8,7 @@ import dms from "./result/dms.js";
 import cms from "./result/cms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
+import teachingunit from "./result/teachingunit.js";
 import { debounce } from "../../helpers/DebounceHelper.js";
 
 export default {
@@ -23,6 +24,7 @@ export default {
 		cms,
 		mergedStudent,
 		mergedPerson,
+		teachingunit,
 	},
 	props: {
 		searchoptions: {

public/js/directives/inViewTooltip.js

@@ -1,352 +0,0 @@
-/**
- * v-tooltip with a panel that stays in view, also at the screen edge, in a modal and on a phone.
- *
- * - The panel is fixed and stays inside the viewport. It opens below the anchor, above it when
- *   it fits only there or that side has more space. It grows away from the nearer viewport side.
- * - On an anchor wider than the panel, e.g. a long table cell, it opens at the mouse, not at the anchor edge.
- * - One panel at a time, appended to the body. A modal or a scrolling container cannot clip it.
- * - A mouse hover or a keyboard focus opens it. Escape, a click outside or a scroll closes it.
- *
- * Sticky, for several sentences or a list: a short label is read before the hover pause ends, a long text is not.
- * - After HOLD_DELAY_MS + HOLD_FILL_MS of hovering the panel sticks, the border fills up in the end.
- *   A click on the anchor makes it stick at once. Touch has no hover: a tap toggles the sticky panel.
- * - A sticky panel stays until a click outside, Escape, a scroll or an opening bootstrap modal.
- *
- * The view needs public/css/components/inViewTooltip.css.
- *
- * Usage examples:
- *
- * 1) Directive, registered for the app or the component:
- *    app.directive('tooltip', InViewTooltip)  or  directives: { tooltip: InViewTooltip }
- *    <button v-tooltip="label">           a short label, hover only
- *    <span v-tooltip.sticky="longText">   several sentences or a list
- *    v-tooltip="{ value: text, disabled: bool, sticky: bool }", the modifier .top prefers the place above
- *
- * 2) Without a directive, e.g. a tabulator cell. The content is a text, a DOM node or a function:
- *    { event: 'cellMouseEnter', handler: (e, cell) => hoverTooltip(cell.getElement(), () => buildNode(cell), { delay: 300, sticky: true, closeOnClick: true }) },
- *    { event: 'cellMouseLeave', handler: (e, cell) => hideTooltip(cell.getElement()) }
- *
- * 3) A ? icon with a help text: components/InViewHelp.js
- */
-
-// hover time until a sticky panel sticks: a pause without motion filters out a pointer that only passes by,
-// then a short fill shows the pin. A long fill would draw the eye away from the text
-const HOLD_DELAY_MS = 1000
-const HOLD_FILL_MS = 400
-const HIDE_DELAY_MS = 150 // the pointer can cross the gap from the anchor into the panel
-const WATCH_MS = 250 // an anchor can leave the page without an unmount, e.g. in a hidden keep-alive tab
-const PANEL_MAX_WIDTH = 512 // px
-const PANEL_MARGIN = 16 // px between the panel and the viewport edge
-const PANEL_GAP = 6 // px between the anchor and the panel
-const PANEL_RADIUS = 5 // px, the inner radius of the panel border. The progress border follows it
-const PANEL_POINTER_INSET = 16 // px, the horizontal padding of the panel: the text starts below the mouse
-
-const clamp = (value, min, max) => Math.min(Math.max(value, min), max)
-
-let active = null // the open panel, only one at a time
-let pending = null // a delayed show
-let panelCount = 0
-
-// the last pointer. Its type tells a tap from a mouse also for the mouse events of tabulator, a tap fires
-// emulated mouse events too: pointerover fires before them. Its place puts the panel next to the mouse
-const pointer = { type: 'mouse', x: null, y: null }
-const trackPointer = event => {
-	pointer.type = event.pointerType
-	pointer.x = event.clientX
-	pointer.y = event.clientY
-}
-for (const name of ['pointerover', 'pointermove', 'pointerdown'])
-	document.addEventListener(name, trackPointer, { capture: true, passive: true })
-
-/**
- * Opens the panel for an anchor element.
- *
- * content: a text, a DOM node or a function that returns one of them.
- * options: prefer ('bottom' | 'top'), delay (ms), sticky (the hover timer pins the panel), pinned (sticks at once),
- *          closeOnClick (a click on the anchor closes the panel, e.g. a table cell with a click action)
- */
-export function showTooltip(anchor, content, options = {}) {
-	cancelPending()
-	if (!options.delay) return open(anchor, content, options)
-
-	pending = { anchor, timer: setTimeout(() => { pending = null; open(anchor, content, options) }, options.delay) }
-}
-
-// for mouse events without a pointer type, e.g. the cell events of tabulator
-export function hoverTooltip(anchor, content, options) {
-	if (pointer.type === 'mouse') showTooltip(anchor, content, options)
-}
-
-// closes the panel of the anchor after HIDE_DELAY_MS, a sticky panel stays
-export function hideTooltip(anchor) {
-	if (pending?.anchor === anchor) cancelPending()
-	if (active?.anchor !== anchor || active.pinned) return
-
-	clearTimeout(active.hideTimer)
-	active.hideTimer = setTimeout(close, HIDE_DELAY_MS)
-}
-
-// closes the open panel, with an anchor only the panel of that anchor
-export function closeTooltip(anchor) {
-	if (!anchor || pending?.anchor === anchor) cancelPending()
-	if (!anchor || active?.anchor === anchor) close()
-}
-
-function isTooltipPinned(anchor) {
-	return active?.anchor === anchor && active.pinned
-}
-
-// new content for an open panel, an empty text closes it
-function updateTooltip(anchor, content) {
-	if (active?.anchor !== anchor) return
-	if (!content) return close()
-
-	render(active.panel, content)
-	place()
-}
-
-function open(anchor, content, { prefer = 'bottom', sticky = false, pinned = false, closeOnClick = false }) {
-	if (active?.anchor === anchor) {
-		clearTimeout(active.hideTimer)
-		if (pinned) pin()
-		return
-	}
-	close()
-
-	sticky = sticky || pinned
-	const panel = document.createElement('div')
-	panel.id = 'fhc-in-view-tooltip-' + ++panelCount
-	panel.className = 'fhc-in-view-tooltip'
-	panel.setAttribute('role', 'tooltip')
-	panel.innerHTML = '<div class="fhc-in-view-tooltip-body"></div>'
-	if (sticky) {
-		panel.style.setProperty('--fhc-in-view-tooltip-hold-delay', HOLD_DELAY_MS + 'ms')
-		panel.style.setProperty('--fhc-in-view-tooltip-hold-fill', HOLD_FILL_MS + 'ms')
-		panel.insertAdjacentHTML('beforeend', '<svg class="fhc-in-view-tooltip-progress" aria-hidden="true">'
-			+ '<rect width="100%" height="100%" rx="' + PANEL_RADIUS + '"></rect></svg>')
-	}
-	render(panel, content)
-	document.body.appendChild(panel)
-
-	// the pointer at the opening, while it is over the anchor. A keyboard focus has none
-	const rect = anchor.getBoundingClientRect()
-	const overAnchor = pointer.x !== null && pointer.x >= rect.left && pointer.x <= rect.right
-		&& pointer.y >= rect.top && pointer.y <= rect.bottom
-
-	active = {
-		anchor,
-		panel,
-		prefer,
-		pointerX: overAnchor ? pointer.x : null,
-		sticky,
-		closeOnClick,
-		pinned: false,
-		describedBy: anchor.getAttribute('aria-describedby'),
-		holdTimer: null,
-		hideTimer: null,
-		watchTimer: setInterval(() => {
-			if (!anchor.isConnected || !anchor.getClientRects().length) close()
-		}, WATCH_MS)
-	}
-	place()
-	anchor.setAttribute('aria-describedby', panel.id)
-
-	if (pinned) {
-		pin()
-	} else if (sticky) {
-		panel.classList.add('fhc-in-view-tooltip--holding')
-		active.holdTimer = setTimeout(pin, HOLD_DELAY_MS + HOLD_FILL_MS)
-	}
-
-	panel.addEventListener('pointerenter', onPanelEnter)
-	panel.addEventListener('pointerleave', onPanelLeave)
-	panel.addEventListener('click', onPanelClick)
-	document.addEventListener('pointerdown', onPointerDown, true)
-	document.addEventListener('keydown', onKeyDown, true)
-	// an anchor often opens a modal on click, the sticky panel must not cover it
-	document.addEventListener('show.bs.modal', close)
-	window.addEventListener('scroll', onScroll, true)
-	window.addEventListener('resize', place)
-}
-
-function pin() {
-	if (!active || active.pinned || !active.sticky) return
-
-	clearTimeout(active.holdTimer)
-	clearTimeout(active.hideTimer)
-	active.pinned = true
-	active.panel.classList.remove('fhc-in-view-tooltip--holding')
-	active.panel.classList.add('fhc-in-view-tooltip--pinned')
-}
-
-function close() {
-	if (!active) return
-
-	const { anchor, panel, describedBy } = active
-	clearTimeout(active.holdTimer)
-	clearTimeout(active.hideTimer)
-	clearInterval(active.watchTimer)
-	active = null
-
-	panel.remove()
-	if (describedBy) anchor.setAttribute('aria-describedby', describedBy)
-	else anchor.removeAttribute('aria-describedby')
-
-	document.removeEventListener('pointerdown', onPointerDown, true)
-	document.removeEventListener('keydown', onKeyDown, true)
-	document.removeEventListener('show.bs.modal', close)
-	window.removeEventListener('scroll', onScroll, true)
-	window.removeEventListener('resize', place)
-}
-
-function cancelPending() {
-	if (!pending) return
-
-	clearTimeout(pending.timer)
-	pending = null
-}
-
-function render(panel, content) {
-	if (typeof content === 'function') content = content()
-
-	const body = panel.querySelector('.fhc-in-view-tooltip-body')
-	if (content instanceof Node) body.replaceChildren(content)
-	else body.textContent = content
-}
-
-function place() {
-	if (!active) return
-
-	const { anchor, panel, prefer } = active
-	const rect = anchor.getBoundingClientRect()
-	const viewWidth = document.documentElement.clientWidth
-	const viewHeight = document.documentElement.clientHeight
-
-	// measure the natural size first
-	panel.style.maxWidth = Math.min(PANEL_MAX_WIDTH, viewWidth - 2 * PANEL_MARGIN) + 'px'
-	panel.style.maxHeight = ''
-	panel.style.left = '0px'
-	panel.style.top = '0px'
-	panel.style.bottom = ''
-	const width = panel.offsetWidth
-	const height = panel.offsetHeight
-
-	const space = {
-		bottom: viewHeight - rect.bottom - PANEL_GAP - PANEL_MARGIN,
-		top: rect.top - PANEL_GAP - PANEL_MARGIN
-	}
-	const other = prefer === 'top' ? 'bottom' : 'top'
-	let side = prefer
-	if (space[prefer] < height) side = space[other] >= height || space[other] > space[prefer] ? other : prefer
-
-	// a panel at least as wide as the anchor starts at the anchor edge, grows away from the nearer viewport side
-	// and spans the whole anchor. On a wider anchor that edge can be far from the mouse: the text starts below
-	// the pointer, the clamp moves the panel to the left only at the right viewport edge
-	const { pointerX } = active
-	let left
-	if (pointerX === null || width >= rect.width) left = rect.left + rect.width / 2 < viewWidth / 2 ? rect.left : rect.right - width
-	else left = pointerX - PANEL_POINTER_INSET
-	panel.style.left = clamp(left, PANEL_MARGIN, viewWidth - PANEL_MARGIN - width) + 'px'
-	panel.style.maxHeight = space[side] + 'px'
-	if (side === 'bottom') {
-		panel.style.top = rect.bottom + PANEL_GAP + 'px'
-	} else {
-		panel.style.top = ''
-		panel.style.bottom = viewHeight - rect.top + PANEL_GAP + 'px'
-	}
-
-	if (!active.sticky) return
-
-	// the dash of the progress border is as long as the rounded rect along the inner edge of the 1 px border.
-	// Rounded up, else a gap stays at its start: clientWidth drops the fraction of the width
-	const box = panel.getBoundingClientRect()
-	const perimeter = 2 * (box.width + box.height - 4) - (8 - 2 * Math.PI) * PANEL_RADIUS
-	panel.style.setProperty('--fhc-in-view-tooltip-perimeter', Math.ceil(perimeter) + 1)
-}
-
-function onPanelEnter() {
-	cancelPending()
-	clearTimeout(active.hideTimer)
-}
-
-function onPanelLeave(event) {
-	if (event.pointerType === 'mouse') hideTooltip(active.anchor)
-}
-
-// a click into the panel closes it, a text selection keeps it
-function onPanelClick() {
-	if (!String(window.getSelection())) close()
-}
-
-function onPointerDown(event) {
-	const { anchor, panel, closeOnClick } = active
-	if (panel.contains(event.target)) return
-	if (anchor.contains(event.target) && !closeOnClick) return
-
-	cancelPending()
-	close()
-}
-
-// Escape closes only the panel, not a modal around the anchor
-function onKeyDown(event) {
-	if (event.key !== 'Escape') return
-
-	event.stopPropagation()
-	close()
-}
-
-// the panel is fixed, a scroll moves the anchor away from it. A scroll inside the panel keeps it
-function onScroll(event) {
-	if (!active.panel.contains(event.target)) close()
-}
-
-// reads the binding: "text" or { value, disabled, sticky }, the modifiers .sticky and .top
-function read(state, binding) {
-	const value = binding.value
-	const isObject = value && typeof value === 'object'
-	state.text = (isObject ? (value.disabled ? '' : value.value) : value) ?? ''
-	state.sticky = !!(binding.modifiers.sticky || isObject && value.sticky)
-	state.prefer = binding.modifiers.top ? 'top' : 'bottom'
-}
-
-export default {
-	mounted(el, binding) {
-		const state = el._fhcInViewTooltip = { pointerType: 'mouse' }
-		read(state, binding)
-		const show = options => {
-			if (state.text) showTooltip(el, state.text, { prefer: state.prefer, sticky: state.sticky, ...options })
-		}
-
-		state.listeners = {
-			pointerenter: event => { if (event.pointerType === 'mouse') show() },
-			pointerleave: event => { if (event.pointerType === 'mouse') hideTooltip(el) },
-			pointerdown: event => { state.pointerType = event.pointerType },
-			// a mouse click or a key pins a sticky panel at once, a tap toggles it
-			click: () => {
-				if (!state.sticky) return
-
-				if (state.pointerType !== 'mouse' && isTooltipPinned(el)) closeTooltip(el)
-				else show({ pinned: true })
-
-				state.pointerType = 'mouse' // a key click has no pointerdown
-			},
-			focusin: event => { if (event.target.matches(':focus-visible')) show() },
-			focusout: () => hideTooltip(el)
-		}
-		// the click captures: it pins the panel before the click action of the anchor runs, so a modal
-		// that this action opens closes the panel again. The pointer events must not capture the children
-		for (const [name, listener] of Object.entries(state.listeners)) el.addEventListener(name, listener, name === 'click')
-	},
-	updated(el, binding) {
-		const state = el._fhcInViewTooltip
-		const text = state.text
-		read(state, binding)
-		if (state.text !== text) updateTooltip(el, state.text)
-	},
-	beforeUnmount(el) {
-		const state = el._fhcInViewTooltip
-		closeTooltip(el)
-		for (const [name, listener] of Object.entries(state.listeners)) el.removeEventListener(name, listener, name === 'click')
-		delete el._fhcInViewTooltip
-	}
-}

public/js/tabulator/customModules/TablePresetsModule.js

@@ -8,36 +8,27 @@ export default class TablePresetsModule extends Module {
 		super(table);
 	}
 
-	// presetColumns limits the preset to the given column fields. A table with dynamic
-	// columns gives the fields of its constant columns here.
-	applyPreset(preset, presetColumns = []) {
-		if (presetColumns.length) {
-			this.applyColumnsInScope(preset, presetColumns);
-		} else {
-			let columnsConfig = this.table.options.columns;
-			let reorderedColumnsConfig = [];
-			preset.displayedColumns.forEach((columnField) => {
-				let columnConfig = columnsConfig.find(
-					(column) => column.field === columnField,
-				);
-				if (!columnConfig) return;
-				columnConfig.visible = true;
-				reorderedColumnsConfig.push(columnConfig);
-			});
-
-			let hiddenColumnsConfig = columnsConfig
-				.filter(
-					(column) =>
-						!preset.displayedColumns.includes(column.field),
-				)
-				.map((column) => {
-					column.visible = false;
-					return column;
-				});
-			this.table.setColumns(
-				reorderedColumnsConfig.concat(hiddenColumnsConfig),
+	applyPreset(preset) {
+		let columnsConfig = this.table.options.columns;
+		let reorderedColumnsConfig = [];
+		preset.displayedColumns.forEach((columnField) => {
+			let columnConfig = columnsConfig.find(
+				(column) => column.field === columnField,
 			);
-		}
+			if (!columnConfig) return;
+			columnConfig.visible = true;
+			reorderedColumnsConfig.push(columnConfig);
+		});
+
+		let hiddenColumnsConfig = columnsConfig
+			.filter((column) => !preset.displayedColumns.includes(column.field))
+			.map((column) => {
+				column.visible = false;
+				return column;
+			});
+		this.table.setColumns(
+			reorderedColumnsConfig.concat(hiddenColumnsConfig),
+		);
 
 		this.table.clearHeaderFilter();
 		if (preset.headerFilters) {
@@ -70,44 +61,4 @@ export default class TablePresetsModule extends Module {
 			);
 		}
 	}
-
-	// The preset orders and hides the columns of the scope only. A column outside the
-	// scope keeps its position, because the table does not show it in every state.
-	applyColumnsInScope(preset, presetColumns) {
-		const displayedColumns = preset.displayedColumns ?? [];
-
-		// a displayed column takes the rank of the preset. A column that the preset
-		// hides has no rank and keeps the current order at the end of its block.
-		const rank = (columnConfig) => {
-			const index = displayedColumns.indexOf(columnConfig.field);
-			return index === -1 ? displayedColumns.length : index;
-		};
-
-		let columnsConfig = [];
-		let scopeBlock = [];
-
-		// the sort runs for each block of neighbouring scope columns. This way a scope
-		// column never moves over a column outside the scope.
-		const addScopeBlock = () => {
-			scopeBlock.sort((a, b) => rank(a) - rank(b));
-			columnsConfig = columnsConfig.concat(scopeBlock);
-			scopeBlock = [];
-		};
-
-		this.table.getColumnDefinitions().forEach((columnConfig) => {
-			if (!presetColumns.includes(columnConfig.field)) {
-				addScopeBlock();
-				columnsConfig.push(columnConfig);
-				return;
-			}
-
-			columnConfig.visible = displayedColumns.includes(
-				columnConfig.field,
-			);
-			scopeBlock.push(columnConfig);
-		});
-		addScopeBlock();
-
-		this.table.setColumns(columnsConfig);
-	}
 }

system/dbupdate_3.4.php

@@ -103,7 +103,7 @@ require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
 require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
-
+require_once('dbupdate_3.4/77757_widgets_berechtigungen.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/77757_widgets_berechtigungen.php

@@ -0,0 +1,57 @@
+<?php
+/* Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Beschreibung:
+ * Dashboard Widgets: Verknüpfung einer (einzelnen) Berechtigung pro Widget.
+ * Neue Spalte dashboard.tbl_widget.berechtigung_kurzbz mit FK auf
+ * system.tbl_berechtigung. Ist die Spalte NULL, erfordert das Widget keine
+ * gesonderte Berechtigung. Benutzer denen die verknüpfte Berechtigung fehlt,
+ * bekommen das Widget nicht mehr zur Auswahl angezeigt bzw. sehen (falls bereits
+ * am Dashboard) einen "Fehlende Berechtigung"-Screen.
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add column dashboard.tbl_widget.berechtigung_kurzbz (FK => system.tbl_berechtigung)
+if ($result = @$db->db_query("
+	SELECT 1
+	FROM information_schema.columns
+	WHERE table_schema = 'dashboard'
+		AND table_name = 'tbl_widget'
+		AND column_name = 'berechtigung_kurzbz';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+			ALTER TABLE dashboard.tbl_widget
+				ADD COLUMN berechtigung_kurzbz VARCHAR(32) NULL;
+
+			ALTER TABLE dashboard.tbl_widget
+				ADD CONSTRAINT tbl_widget_berechtigung_fk
+				FOREIGN KEY (berechtigung_kurzbz)
+				REFERENCES system.tbl_berechtigung (berechtigung_kurzbz)
+				ON UPDATE CASCADE ON DELETE SET NULL;";
+
+		if (!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget: '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Spalte berechtigung_kurzbz (FK system.tbl_berechtigung) hinzugefuegt<br>';
+		}
+	}
+}

system/seeders/BS010_projektarbeiten_studiengang_4.sql

@@ -1,9 +1,9 @@
 INSERT INTO lehre.tbl_projektarbeit
-(projektarbeit_id, projekttyp_kurzbz, titel, lehreinheit_id, student_uid, firma_id, note, punkte, beginn, ende, faktor, freigegeben, gesperrtbis, stundensatz, themenbereich, anmerkung, updateamum, updatevon, insertamum, insertvon, ext_id, gesamtstunden, titel_english, sprache, seitenanzahl, abgabedatum, kontrollschlagwoerter, schlagwoerter, schlagwoerter_en, abstract, abstract_en, "final") VALUES
-(1, 'Bachelor', 'Auswirkung der Sonneneinstrahlung auf die Gesundheit', 46111, 's46b413', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true),
-(2, 'Bachelor', 'Neue Unterrichtsmethoden mit KI', 46111, 's46b414', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true),
-(3, 'Bachelor', 'Betrugsbekämpfung bei Anwesenheitskontrolle', 46111, 's46b415', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true),
-(4, 'Bachelor', 'Neuronale Netze', 46111, 's46b416', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true)
+(projektarbeit_id, projekttyp_kurzbz, titel, lehreinheit_id, student_uid, firma_id, note, punkte, beginn, ende, faktor, freigegeben, gesperrtbis, stundensatz, themenbereich, anmerkung, updateamum, updatevon, insertamum, insertvon, ext_id, gesamtstunden, titel_english, sprache, seitenanzahl, abgabedatum, kontrollschlagwoerter, schlagwoerter, schlagwoerter_en, abstract, abstract_en, "final", lehrveranstaltung_id, studiensemester_kurzbz) VALUES
+(1, 'Bachelor', 'Auswirkung der Sonneneinstrahlung auf die Gesundheit', 46111, 's46b413', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 4611, NearestWintersemester(1)),
+(2, 'Bachelor', 'Neue Unterrichtsmethoden mit KI', 46111, 's46b414', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 4611, NearestWintersemester(1)),
+(3, 'Bachelor', 'Betrugsbekämpfung bei Anwesenheitskontrolle', 46111, 's46b415', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 4611, NearestWintersemester(1)),
+(4, 'Bachelor', 'Neuronale Netze', 46111, 's46b416', NULL, NULL, NULL, NULL, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, '2025-12-12 14:06:10.000', 'anondata', NULL, 3.0000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 4611, NearestWintersemester(1))
 ;
 
 INSERT INTO lehre.tbl_projektbetreuer