defined new searchbar endpoint searchPV which uses searchbar config searchPV.php -> mostly just curated imports of the actually adapted base search.php config, since the main point of this story was enabling phonenumber lookup. basically works everywhere, unless deliberately unset like in searchcis.php config; also added personalnummer searchfield for employees; adapted phonenumber lookup to be the old version where type needs to be 'telefon' AND the standort_id needs to match, or type is a whider range of options including 'firmenhandy' and 'mobil' but is only matched via person_id; fixed unassigned_employee config by letting the config check for benutzerfunktion.uid instead of benutzerfunktion.bezeichnung after the left join, so the results are actually only employees without kostenstellen or oezuordnung, not all mitarbeiter with empty benutzerfunktion bezeichnungen;

application/config/search.php

@@ -45,7 +45,7 @@ $config['person'] = [
 			'field' => 'kontakt',
 			'join' => [
 				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy') AND tbl_kontakt.person_id = tbl_person.person_id"
 			],
 			"1-n" => true
 		],
@@ -360,6 +360,10 @@ $config['employee'] = [
 			'comparison' => 'equals',
 			'field' => "mitarbeiter_uid"
 		],
+		'personalnummer' => [
+			'comparison' => 'equal-int',
+			'field' => "personalnummer"
+		],
 		'vorname' => [
 			'alias' => ['firstname'],
 			'comparison' => 'similar',
@@ -415,12 +419,27 @@ $config['employee'] = [
 		'tel' => [
 			'alias' => ['phone', 'telefon'],
 			'comparison' => 'similar',
-			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
+			'field' => 'kontakt',
+			'prepare' => "employee_tel (mitarbeiter_uid, kontakt) AS (
+				SELECT m.mitarbeiter_uid,
+					   TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, ''))
+				FROM public.tbl_mitarbeiter m
+				LEFT JOIN public.tbl_kontakt k
+					ON k.standort_id = m.standort_id
+					AND k.kontakttyp = 'telefon'
+				UNION
+				SELECT m.mitarbeiter_uid, k.kontakt
+				FROM public.tbl_mitarbeiter m
+				JOIN public.tbl_benutzer b ON b.uid = m.mitarbeiter_uid
+				JOIN public.tbl_kontakt k
+					ON k.person_id = b.person_id
+					AND k.kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy')
+			)",
 			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
+				'table' => "employee_tel",
+				'using' => "mitarbeiter_uid"
 			],
-			"1-n" => true
+			'1-n' => true
 		],
 		'pid' => [
 			'alias' => ['person_id'],
@@ -471,6 +490,7 @@ $config['employee'] = [
 	],
 	'resultfields' => [
 		"b.uid",
+		"m.personalnummer",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY(
@@ -512,7 +532,6 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];
 
-// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -524,7 +543,7 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 	UNION
 	SELECT tbl_mitarbeiter.*
 	FROM public.tbl_mitarbeiter
@@ -534,10 +553,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
+$config['unassigned_employee']['searchfields']['tel'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";

application/config/searchPV.php

@@ -0,0 +1,34 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+$config['person'] = $CI->config->item('person', 'search');
+
+$config['employee'] = $CI->config->item('employee', 'search');
+$config['employee']['resultjoin'] = "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)";
+
+$config['unassigned_employee'] = $CI->config->item('unassigned_employee', 'search');
+$config['unassigned_employee']['resultjoin'] = "
+    JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+    JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+    JOIN public.tbl_person p USING(person_id)
+    LEFT JOIN (
+        SELECT kontakt, standort_id
+        FROM public.tbl_kontakt
+        WHERE kontakttyp = 'telefon'
+    ) k ON (k.standort_id = m.standort_id)";
+
+$config['room'] = $CI->config->item('room', 'search');
+
+$config['organisationunit'] = $CI->config->item('organisationunit', 'search');

application/config/searchcis.php

@@ -7,6 +7,7 @@ $CI =& get_instance();
 
 
 $config['employee'] = $CI->config->item('employee', 'search');
+unset($config['employee']['searchfields']['tel']);
 $config['employee']['resultjoin'] = "
 		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
 		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)

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

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

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

@@ -37,7 +37,8 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
 			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED
+			'searchStv' => self::PERM_LOGGED,
+			'searchPV' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -87,6 +88,15 @@ class Searchbar extends FHCAPI_Controller
 		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
 	}
 
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchPV()
+	{
+		return $this->searchAdvanced([ 'config' => 'searchPV' ]);
+	}
+
+
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */

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

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

application/controllers/components/Cis/Mylv.php

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

application/models/education/Lehrveranstaltung_model.php

@@ -1343,45 +1343,4 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
-
-	// used for cis4 mylv mitarbeiter
-	public function getLvsByMitarbeiterInSemester($mitarbeiter_uid, $sem_kurzbz) {
-		$qry = "SELECT * FROM (
-					SELECT DISTINCT ON (lehre.tbl_lehrveranstaltung.lehrveranstaltung_id) 
-						public.tbl_studiengang.studiengang_kz,
-						lehre.tbl_lehrveranstaltung.semester,
-						public.tbl_studiengang.bezeichnung as sg_bezeichnung,
-						public.tbl_studiengang.english as sg_bezeichnung_eng,
-						UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as studiengang_kuerzel,
-						lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,
-						lehre.tbl_lehrveranstaltung.bezeichnung,
-						lehre.tbl_lehrveranstaltung.bezeichnung_english as bezeichnung_eng,
-						lehre.tbl_lehrveranstaltung.farbe,
-						lehre.tbl_lehrveranstaltung.lvinfo,
-						lehre.tbl_lehrveranstaltung.benotung,
-						lehre.tbl_lehrveranstaltung.orgform_kurzbz,
-						lehre.tbl_lehrveranstaltung.sprache,
-						lehre.tbl_lehrveranstaltung.ects,
-						lehre.tbl_lehrveranstaltung.incoming
-					FROM
-						lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-											  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-											  JOIN public.tbl_studiengang USING(studiengang_kz)
-											  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
-					WHERE
-						tbl_lehreinheit.studiensemester_kurzbz = ?
-					AND mitarbeiter_uid = ?) as distincted_by_lva_id
-					JOIN (
-						SELECT lehrveranstaltung_id, TRUNC(SUM(lehre.tbl_lehreinheitmitarbeiter.semesterstunden)) as semesterstunden
-						FROM lehre.tbl_lehreinheit
-								 JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
-								 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-						WHERE tbl_lehreinheit.studiensemester_kurzbz = ?
-							AND mitarbeiter_uid = ?
-						GROUP BY lehrveranstaltung_id
-					) semesterstundenAggregatedSubquery USING(lehrveranstaltung_id)
-				ORDER BY studiengang_kuerzel, semester, bezeichnung";
-		
-		return $this->execReadOnlyQuery($qry, [$sem_kurzbz, $mitarbeiter_uid, $sem_kurzbz, $mitarbeiter_uid]);
-	}
 }

application/models/organisation/Studiensemester_model.php

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

public/css/components/MyLv.css

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

public/js/api/factory/addons.js

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

public/js/api/factory/searchbar.js

@@ -36,5 +36,12 @@ export default {
 			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
+	},
+	searchPV(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchPV',
+			params
+		};
 	}
 };

public/js/apps/Dashboard/Fhc.js

@@ -5,7 +5,7 @@ import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
 import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
-import Mylv from "../../components/Cis/Mylv/MyLv.js";
+import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
@@ -21,7 +21,6 @@ import Studium from "../../components/Cis/Studium/Studium.js";
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
-import ApiAuthinfo from "../../api/factory/authinfo.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -150,7 +149,7 @@ const router = VueRouter.createRouter({
 		{
 			path: `/Cis/MyLv/:studiensemester?`,
 			name: 'MyLv',
-			component: Mylv,
+			component: MylvStudent,
 			props: true,
 		},
 		{
@@ -232,9 +231,6 @@ const app = Vue.createApp({
 	data: () => ({
 		appSideMenuEntries: {},
 		renderers: null,
-		uid: '',
-		isStudent: null,
-		isMitarbeiter: null
 	}),
 	components: {},
 	computed: {
@@ -248,10 +244,7 @@ const app = Vue.createApp({
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
-			isMobile: this.isMobile,
-			uid: Vue.computed(() => this.uid),
-			isStudent: Vue.computed(() => this.isStudent),
-			isMitarbeiter: Vue.computed(() => this.isMitarbeiter)
+			isMobile: this.isMobile
 		}	
 	},
 	methods: {
@@ -328,14 +321,6 @@ const app = Vue.createApp({
 					this.renderers[rendertype].calendarEvent = calendarEvent;
 				}
 			});
-
-		await this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
 	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);

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

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

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

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

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

@@ -1,7 +1,6 @@
 import MylvSemesterStudiengang from "./Semester/Studiengang.js";
 
 export default {
-	name: 'Semester',
 	components: {
 		MylvSemesterStudiengang
 	},
@@ -37,8 +36,7 @@ export default {
 			return this.lvs.filter(lv => lv.studiengang_kz == studiengang.studiengang_kz && lv.semester == studiengang.semester);
 		}
 	},
-	template: `
-	<div class="mylv-semester" v-if="ready">
+	template: `<div class="mylv-semester" v-if="ready">
 		<mylv-semester-studiengang v-for="studiengang in studiengaenge" :key="studiengang.studiengang_kz" v-bind="studiengang" :lvs="lvsForStudiengang(studiengang)"/>
 	</div>
 	<div class="mylv-semester text-center" v-else>

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

@@ -2,7 +2,6 @@ import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
 export default {
-	name: 'Studiengang',
 	components: {
 		MylvSemesterStudiengangLv
 	},
@@ -32,8 +31,7 @@ export default {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
 		}
 	},
-	template: `
-	<div class="card mb-3">
+	template: `<div class="card mb-3">
 		<div class="card-body">
 			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>

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

@@ -1,4 +1,7 @@
 import LvPruefungen from "./Lv/Pruefungen.js";
+import LvInfo from "./Lv/Info.js";
+import Phrasen from "../../../../../mixins/Phrasen.js";
+import LvUebersicht from "../../LvUebersicht.js";
 
 import ApiLehre from '../../../../../api/factory/lehre.js';
 import ApiAddons from '../../../../../api/factory/addons.js';
@@ -6,11 +9,15 @@ import ApiAddons from '../../../../../api/factory/addons.js';
 // TODO(chris): L10n
 
 export default {
-	name: 'Lv',
-	inject: ['studien_semester', 'type'],
+	components:{
+		LvUebersicht,
+	},
+	mixins: [
+		Phrasen
+	],
+	inject: ['studien_semester'],
 	props: {
-		lehrveranstaltung_id: [Number, String],
-		semesterstunden: [Number, String],
+		lehrveranstaltung_id: Number,
 		bezeichnung: String,
 		bezeichnung_eng: String,
 		module: String,
@@ -28,13 +35,13 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String,
-		menu: [Array, String]
+		note_index: String
 	},
 	data: () => {
 		return {
 			pruefungenData: null,
 			info: null,
+			menu: null,
 			preselectedMenuItem: null,
 		}
 	},
@@ -58,6 +65,12 @@ export default {
 		emptyMenu(){
 			return !this.menu || !Array.isArray(this.menu) || Array.isArray(this.menu) && this.menu.length == 0;
 		},
+		bodyStyle() {return {};
+			/*const bodyStyle = {};
+			if (this.farbe)
+				bodyStyle['background-color'] = '#' + this.farbe;
+			return bodyStyle;*/
+		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
 			if(this.benotung && this.znotebez?.length) {
@@ -71,6 +84,7 @@ export default {
 		},
 	},
 	methods: {
+		
 		fetchMenu(lehrveranstaltung_id = this.lehrveranstaltung_id, studien_semester = this.studien_semester) {
 			return this.$api
 				.call(ApiAddons.getLvMenu(lehrveranstaltung_id, studien_semester))
@@ -82,18 +96,28 @@ export default {
 					this.menu = [];
 				});
 		},
-		c4_target(menuItem) {
-			if (menuItem.c4_moodle_links?.length > 0) return null;
-			return menuItem.c4_target ?? null;
-		},
+
 		c4_link(menuItem) {
 			if (!menuItem) return null;
 			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
 				return '#';
-			} else {
+			}
+			else {
 				return menuItem.c4_link ?? null;
 			}
 		},
+		openLvOption(menuItem){
+			if (menuItem.id == "core_menu_mailanstudierende"){
+				window.location.href = menuItem.c4_link;
+			} else if (menuItem.id == "core_menu_digitale_anwesenheitslisten") {
+				window.location.href = menuItem.c4_link;
+			} else{
+				this.preselectedMenuItem = menuItem;
+				Vue.nextTick(() => {
+					this.$refs.lvUebersicht.show();
+				});
+			}
+		},
 		openPruefungen() {
 			// early return if the pruefungenData is empty or not set
 			if (!this.LvHasPruefungenInformation) return;
@@ -102,65 +126,75 @@ export default {
 				pruefungenData: this.pruefungenData, 
 				bezeichnung: this.bezeichnung
 			});
+		},
+		openInfos() {
+			if (!this.info) {
+				this.info = true;
+				// TODO(chris): load all this params on ajax?
+				LvInfo.popup({
+					lehrveranstaltung_id: this.lehrveranstaltung_id, 
+					bezeichnung: this.bezeichnung,
+					bezeichnung_eng: this.bezeichnung_eng,
+					studiengang_kuerzel: this.studiengang_kuerzel,
+					semester: this.semester,
+					studien_semester: this.studien_semester,
+					orgform_kurzbz: this.orgform_kurzbz,
+					sprache: this.sprache,
+					ects: this.ects,
+					incoming: this.incoming
+				}).then(() => this.info = false).catch(() => this.info = false);
+			}
+		}
+	},
+	watch:{
+		studien_semester(newValue){
+			this.fetchMenu(this.lehrveranstaltung_id, newValue);
 		}
 	},
 	created() {
-		if(this.type == 'student') {
-			this.$api
-				.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
-				.then(res => res.data)
-				.then(pruefungen => {
-					this.pruefungenData = pruefungen;
-				});
-		}
+		this.$api
+			.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
+			.then(res => res.data)
+			.then(pruefungen => {
+				this.pruefungenData = pruefungen;
+			}); 
 	},
-	template: /*html*/`
-	<div class="mylv-semester-studiengang-lv card">
+	mounted() {
+		this.fetchMenu(this.lehrveranstaltung_id, this.studien_semester);
+	},
+	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
+		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
+			lehrveranstaltung_id: lehrveranstaltung_id,
+			studiensemester_kurzbz:studien_semester,
+			lehrfach_bez:studien_semester,
+			stg_kurzbzlang:studien_semester,
+		}"/>
+
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
 			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
-		<div v-if="!emptyMenu" class="card-body ">
+		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
 			<template v-if="menu">
 				<ul class="list-group border-top-0 border-bottom-0 rounded-0">
-					<li :type="menuItem.c4_link ? 'button' : null" 
-						v-for="(menuItem, index) in menu" :key="index" class="list-group-item border-0 " >
-						<div class="d-flex flex-row">
+					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 " >
+						<div class="d-flex flex-row"  :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null">
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a :id="menuItem.name"
+							<a
 							class="fhc-body text-decoration-none text-truncate"
-							:class="{ 'unavailable':!menuItem.c4_link }"
+							:id="'moodle_links_'+lehrveranstaltung_id"
+							:class="{ 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
 							</a>
-							
-							<div v-if="(menuItem.c4_moodle_links?.length || menuItem.c4_linkList?.length) && menuItem.c4_link" class="dropdown">
-								<button 
-									class="btn btn-sm dropdown-toggle dropdown-toggle-split border-0" 
-									type="button" 
-									data-bs-toggle="dropdown" 
-									aria-expanded="false">
-									<span class="visually-hidden">Toggle Dropdown</span>
-								</button>
-					
-								<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu dropdown-menu p-0">
-									<li v-for="item in menuItem.c4_moodle_links" :key="item.url">
-									   <a class="dropdown-item border-bottom" :href="item.url" target="#">{{ item.lehrform }}</a>
-									</li>
-								</ul>
-								
-								<ul v-else class="dropdown-menu dropdown-menu p-0">
-									<li v-for="([text, link], i) in menuItem.c4_linkList" :key="i">
-									   <a class="dropdown-item border-bottom" :href="link" target="#">{{ text }}</a>
-									</li>
-								</ul>
 							</div>
-				
-					   </div>
+							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
+								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
+							</ul>
 					</li>
 				</ul>
 			</template>
@@ -170,7 +204,7 @@ export default {
 				</div>
 			</template>
 		</div>
-		<div v-if="!emptyMenu && type == 'student'" class="card-footer">
+		<div v-if="!emptyMenu" class="card-footer">
 			<div class="row">
 				<!-- template for the LV if there are multiple pruefungen -->
 				<template v-if="LvHasPruefungenInformation">
@@ -188,12 +222,5 @@ export default {
 				</template>
 			</div>
 		</div>
-		<div v-else-if="!emptyMenu && type == 'employee'" class="card-footer">
-			<div class="row">
-				<div class="col-auto">
-					<span class="ps-1">{{ $p.t('lehre/semesterstunden') }}: {{ semesterstunden }}</span>
-				</div>
-			</div>
-		</div>
 	</div>`
 };

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

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

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

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

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

@@ -70,8 +70,8 @@ export const Raumsuche =  {
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
-			}]
-		};
+			}
+			]};
 	},
 	methods: {
 		tableResolve(resolve) {

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

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

system/phrasesupdate.php

@@ -53762,6 +53762,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_unassigned_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter ohne Zuordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unassigned employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',