add changes also to layouts classicFas, twoColumnsFormRight and TwoColumnsFormLeft

use PV Dropdowns Autocomplete for fields verfasser und bearbeiter
new function getDefaultVerfasser

application/config/stv.php

@@ -84,7 +84,7 @@ $config['tabs'] =
 			'showCountNotes' => true,
 
 			//if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'
-			'showErweitert' => false,
+			'showErweitert' => true,
 
 			//notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
 			'notizLayout' => 'popupModal'

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

@@ -114,7 +114,6 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
-
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events

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

@@ -167,9 +167,7 @@ class Studium extends FHCAPI_Controller
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
 			foreach($lehrveranstaltungen as $lehrv){
-				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
-				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
-				foreach($lvs as $lv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
 					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
 					$lv->lektoren = $lvLektoren;
 				}
@@ -288,7 +286,6 @@ SELECT tbl_lehrveranstaltung.*,
 		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
 		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){
 				return -1;
@@ -305,17 +302,12 @@ SELECT tbl_lehrveranstaltung.*,
 			}
 			else{
 				$parent =array_filter($carry, function($item)use($lehrv){
-					return isset($item->lehrveranstaltungen)
-						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
 				});
 				$parent = current($parent);
 				if($parent){
 					$parent->lehrveranstaltungen[] = $lehrv;
 				}
-				else{
-					// lehrveranstaltung without a modul: keep it on the top level
-					array_push($carry, $lehrv);
-				}
 			}
 			return $carry;
 		}, []);

application/controllers/api/frontend/v1/notiz/NotizPerson.php

@@ -18,7 +18,7 @@ class NotizPerson extends Notiz_Controller
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-			'getCountNotes' => ['admin:r', 'assistenz:r'],
+			'getCountNotes' => ['admin:r', 'assistenz:r']
 		]);
 
 		//Load Models

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

@@ -108,7 +108,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -154,8 +153,7 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);		
+		
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -215,7 +213,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(

application/core/Notiz_Controller.php

@@ -12,7 +12,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	public function __construct($permissions)
 	{
 		$default_permissions = [
-			'getUid' => self::DEFAULT_PERMISSION_R,
+			'getDefaultVerfasser' => self::DEFAULT_PERMISSION_R,
 			'getNotizen' => self::DEFAULT_PERMISSION_R,
 			'loadNotiz' => self::DEFAULT_PERMISSION_R,
 			'addNewNotiz' => self::DEFAULT_PERMISSION_RW,
@@ -21,7 +21,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			'loadDokumente' => self::DEFAULT_PERMISSION_R,
 			'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
 			'isBerechtigt' => self::DEFAULT_PERMISSION_R,
-			'getCountNotes' => self::DEFAULT_PERMISSION_R,
+			'getCountNotes' => self::DEFAULT_PERMISSION_R
 		];
 		
 		if(!is_array($permissions))
@@ -46,9 +46,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		]);
 	}
 
-	public function getUid()
+	public function getDefaultVerfasser()
 	{
-		$this->terminateWithSuccess(getAuthUID());
+		$uid = getAuthUID();
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->MitarbeiterModel->addSelect('p.person_id, p.nachname, p.vorname, p.titelpost, p.titelpre, ben.uid');
+		$this->MitarbeiterModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = public.tbl_mitarbeiter.mitarbeiter_uid)', 'LEFT');
+		$this->MitarbeiterModel->addJoin('public.tbl_person p', 'ON (p.person_id = ben.person_id)', 'LEFT');
+
+		$result = $this->MitarbeiterModel->loadWhere(
+			array('mitarbeiter_uid' => $uid)
+		);
+		if(hasData($result))
+			$data = getData($result);
+		$this->terminateWithSuccess(current($data));
 	}
 
 
@@ -106,7 +117,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
-	public function loadNotiz()
+/*	public function loadNotiz()
 	{
 		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 
@@ -118,6 +129,43 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
 		$this->NotizModel->addLimit(1);
 
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}*/
+
+	public function loadNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect('public.tbl_notiz.*');
+		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->NotizModel->addSelect('perb.person_id AS perb_person_id, perb.vorname AS perb_vorname, perb.nachname AS perb_nachname,
+			perb.titelpre AS perb_titelpre, perb.titelpost AS perb_titelpost, benb.uid AS perb_uid');
+		$this->NotizModel->addSelect('perv.person_id AS perv_person_id, perv.vorname AS perv_vorname, perv.nachname AS perv_nachname,
+			perv.titelpre AS perv_titelpre, perv.titelpost AS perv_titelpost,  benv.uid AS perv_uid');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+		$this->NotizModel->addJoin('public.tbl_benutzer benb', 'ON (benb.uid = public.tbl_notiz.bearbeiter_uid)', 'LEFT');
+		$this->NotizModel->addJoin('public.tbl_person perb', 'ON (perb.person_id = benb.person_id)', 'LEFT');
+		$this->NotizModel->addJoin('public.tbl_benutzer benv', 'ON (benv.uid = public.tbl_notiz.verfasser_uid)', 'LEFT');
+		$this->NotizModel->addJoin('public.tbl_person perv', 'ON (perv.person_id = benv.person_id)', 'LEFT');
+		$this->NotizModel->addLimit(1);
+
 		$result = $this->NotizModel->loadWhere(
 			array('notiz_id' => $notiz_id)
 		);
@@ -238,7 +286,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 	public function updateNotiz()
 	{
-
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
@@ -269,7 +316,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$uid = getAuthUID();
 		$titel = $post_data['titel'];
 		$text = $post_data['text'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : $post_data['bearbeiter_uid'];
+		$bearbeiter_uid = $post_data['bearbeiter'];
 		$erledigt = $post_data['erledigt'];
 		$start = $post_data['start'];
 		$ende = $post_data['ende'];
@@ -436,14 +483,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result));
 	}
 
-	public function getMitarbeiter($searchString)
+	public function getMitarbeiter()
 	{
+		$searchString = $this->input->get('searchString') ?? '';
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result ?: []);
 	}
 
 	public function getCountNotes($person_id)

application/libraries/StundenplanLib.php

@@ -94,13 +94,13 @@ class StundenplanLib
 		if (isError($benutzer_gruppen))
 			return $benutzer_gruppen;
 		$benutzer_gruppen = getData($benutzer_gruppen);
-		$this->_ci->addMeta('spezialgruppen', $benutzer_gruppen);
+
 		// getting the student_lehrverbaende of the student in the different studiensemester
 		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
 		if (isError($student_lehrverband))
 			return $student_lehrverband;
 		$student_lehrverband = getData($student_lehrverband);
-		$this->_ci->addMeta('studentlehrvebaende', $student_lehrverband);
+		
 		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
 			$start,
 			$end,
@@ -632,7 +632,6 @@ class StundenplanLib
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
-						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result);

application/libraries/tags/CoreMissingZgvTagLib.php

@@ -28,21 +28,10 @@ class CoreMissingZgvTagLib
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-
-		$this->ci->PrestudentModel->db->group_start();
-
-		$this->ci->PrestudentModel->db->where('zgvdatum', null);
-		$this->ci->PrestudentModel->db->where('typ', 'b');
-
-		$this->ci->PrestudentModel->db->or_group_start();
-		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
-		$this->ci->PrestudentModel->db->where('typ', 'm');
-		$this->ci->PrestudentModel->db->group_end();
-
-		$this->ci->PrestudentModel->db->group_end();
-
 		$result = $this->ci->PrestudentModel-> loadWhere(array(
-			'bn.aktiv' => true,
+			'bn.aktiv' => true, //check if necessary
+			'zgvdatum' => null,
+			'typ' => 'b',
 			'studiensemester_kurzbz' => $semester
 		));
 
@@ -71,36 +60,16 @@ class CoreMissingZgvTagLib
 		$semester = $params['studiensemester_kurzbz'];
 		$prestudent_id = $params['id'];
 
-		$this->ci->PrestudentModel->addSelect('prestudent_id');
-		$this->ci->PrestudentModel->addSelect('start as von');
-		$this->ci->PrestudentModel->addSelect('ende as bis');
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
-
-		//add studiensemester also here for manual rebuild
-		$this->ci->PrestudentModel->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
-
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-
-		$this->ci->PrestudentModel->db->group_start();
-
-		$this->ci->PrestudentModel->db->where('zgvdatum', null);
-		$this->ci->PrestudentModel->db->where('typ', 'b');
-
-		$this->ci->PrestudentModel->db->or_group_start();
-		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
-		$this->ci->PrestudentModel->db->where('typ', 'm');
-		$this->ci->PrestudentModel->db->group_end();
-
-		$this->ci->PrestudentModel->db->group_end();
-		$this->ci->PrestudentModel->db->limit(1);
-
-		$result = $this->ci->PrestudentModel-> loadWhere(array(
-			'bn.aktiv' => true,
+		$result = $this->ci->PrestudentModel->loadWhere(array(
+			'bn.aktiv' => true, //check if necessary
+			'zgvdatum' => null,
+			'typ' => 'b',
 			'studiensemester_kurzbz' => $semester,
 			'prestudent_id' => $prestudent_id
 		));
-
 		if(hasData($result))
 		{
 			return $result;

application/libraries/vertragsbestandteil/Gehaltsbestandteil.php

@@ -225,10 +225,6 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		    $grundbetrag = number_format($grundbetrag, 2, '.', '');
 		}
 		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
-		if(in_array('grundbetrag', $this->modifiedcolumns))
-		{
-			$this->setBetrag_valorisiert($grundbetrag);
-		}
 		$this->grundbetrag = $grundbetrag;
 		return $this;
 	}

application/models/crm/Student_model.php

@@ -204,7 +204,7 @@ class Student_model extends DB_Model
 
 		Events::trigger(
 			'generate_student_uid',
-			function ($value) use (&$uid) {
+			function ($value) use ($uid) {
 				$uid = $value;
 			},
 			$stgkzl,

application/models/organisation/Studiengang_model.php

@@ -457,7 +457,6 @@ class Studiengang_model extends DB_Model
 	 */
 	public function getLeitung($studiengang_kz = null)
 	{
-		$this->addDistinct();
 		$this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email, titelpre, titelpost, alias');
 		$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
 		$this->addJoin('public.tbl_benutzer', 'uid');

application/models/ressource/Stundenplan_model.php

@@ -604,17 +604,11 @@ class Stundenplan_model extends DB_Model
 		{
 			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
-				if(!array_key_exists($sem,$studentlehrverbaende) || count($studentlehrverbaende[$sem]) == 0)
+				if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
 				{
 					continue;
 				}
-				$studlvbds = array_filter(
-					$studentlehrverbaende[$sem],
-					function($value) use ($sem_date) {
-						return $value->studiensemester_kurzbz === $sem_date;
-					}
-				);
-				foreach($studlvbds as $key=>$lehrverband)
+				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
 				{
 					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband

application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php

@@ -16,7 +16,7 @@ $query = '
 			anrechnung.begruendung_id,
 			anrechnung.dms_id,
 			CASE
-				WHEN stg.oe_kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
+				WHEN stg.typ || stg.kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
 				ELSE FALSE
 			END "schreibberechtigt",
 			anrechnung.studiensemester_kurzbz,

application/views/system/infocenter/infocenterDetails.php

@@ -57,7 +57,7 @@
 				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 					<div class="col-lg-8">
 						<h3 class="page-header">
-							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/studvw/stdsem/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">

cis/private/lehre/notenliste.xls.php

@@ -351,7 +351,7 @@ if (!$berechtigung->isBerechtigt('admin')
 					{
 						$worksheet->write($lines,3,$elem->vorname);
 					}
-					$worksheet->writeString($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
+					$worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
 					$worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight);
 					$worksheet->write($lines,6, $note, $format_highlightright);
 

include/vertrag.class.php

@@ -121,7 +121,7 @@ class vertrag extends basis_db
 											JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 										WHERE
 											vertrag_id=tbl_vertrag.vertrag_id
-											AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>".$this->db_add_param($datum).")
+											AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>=".$this->db_add_param($datum).")
 								)
 						)";
 		}

public/css/components/Detailheader.css

@@ -62,16 +62,3 @@
     top:13%;"
     z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
 }*/
-
-.tag-hover:hover {
-    background-color: #e9ecef;
-}
-
-.green {
-    background-color: #e9ecef;
-}
-
-.btn-hover {
-    --bs-btn-hover-bg: #e9ecef; /* Neue Hintergrundfarbe beim Hover */
-    --bs-btn-hover-border-color: #e9ecef; /* Neue Rahmenfarbe beim Hover */
-}

public/css/tags.css

@@ -145,8 +145,3 @@
 	float: right;
 	margin-top: 3px;
 }
-
-.btn-hover {
-	--bs-btn-hover-bg:  #e9ecef;
-	--bs-btn-hover-border-color: #e9ecef;
-}

public/js/api/factory/notiz/person.js

@@ -28,6 +28,12 @@ export default {
 			url: 'api/frontend/v1/notiz/notizPerson/getUid/'
 		};
 	},
+	getDefaultVerfasser() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizPerson/getDefaultVerfasser/'
+		};
+	},
 	addNewNotiz(id, params) {
 		return {
 			method: 'post',
@@ -71,10 +77,11 @@ export default {
 			params
 		};
 	},
-	getMitarbeiter(event) {
+	getMitarbeiter(searchString) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/notiz/notizPerson/getMitarbeiter/' + event
+			url: 'api/frontend/v1/notiz/notizPerson/getMitarbeiter',
+			params: { searchString }
 		};
 	},
 	isBerechtigt(id, type_id) {

public/js/components/Calendar/LvPlan.js

@@ -174,9 +174,6 @@ export default {
 			>
 				{{ $p.t('lehre/noLvFound') }}
 			</div>
-			<div v-else-if="!renderers || !renderers[event.type]" class="placeholder-glow">
-				<span class="placeholder col-12"></span>
-			</div>
 			<div
 				v-else
 				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"

public/js/components/Calendar/Widget.js

@@ -79,9 +79,6 @@ export default {
 			>
 				{{ $p.t('lehre/noLvFound') }}
 			</div>
-			<div v-else-if="!renderers || !renderers[event.type]" class="placeholder-glow">
-				<span class="placeholder col-12"></span>
-			</div>
 			<component
 				v-else-if="mode == 'eventheader'"
 				:is="renderers[event.type]?.modalTitle"

public/js/components/Cis/Menu.js

@@ -28,7 +28,6 @@ export default {
 			urlMatchRankings:[],
 			navUserDropdown:null,
 			menuOpen:true,
-			openMenuHierarchy: [],
         };
     },
 	inject: ["isNarrow", "isMobile"],
@@ -36,7 +35,7 @@ export default {
 		return{
 			setActiveEntry: this.setActiveEntry,
 			addUrlCount: this.addUrlCount,
-			setOpenMenuHierarchy: this.setOpenMenuHierarchy,
+			makeParentContentActive: this.makeParentContentActive,
 		}
 	},
 	computed:{
@@ -83,6 +82,19 @@ export default {
 		handleHideNavUser(){
 			document.removeEventListener("click", this.checkSettingsVisibility);
 		},
+		makeParentContentActive(content_id, collection=this.entries, parent=null){
+			if(!collection) return;
+			if (typeof collection == 'object' && !Array.isArray(collection) && Object.entries(collection).length > 0) {
+				collection = Object.values(collection);
+			}
+			for(let entry of collection){
+				if(entry.content_id == content_id){
+					this.activeEntry = parent;
+				}
+				this.makeParentContentActive(content_id, entry.childs, entry.content_id);
+			}
+			
+		},
 		addUrlCount(count){
 			this.urlMatchRankings.push(count);
 		},
@@ -90,9 +102,6 @@ export default {
 		setActiveEntry(content_id){
 			this.activeEntry = content_id;
 		},
-		setOpenMenuHierarchy(openMenuHierarchy) {
-			this.openMenuHierarchy = openMenuHierarchy;
-		},
 	},
 	created(){
 		this.fetchMenu();
@@ -183,14 +192,7 @@ export default {
 				<div class="offcanvas-body p-0">
 					<div id="nav-main-menu" class="nav-menu-collapse collapse collapse-horizontal show">
 						<div class="flex-grow-1">
-							<cis-menu-entry
-								v-for="entry in entries"
-								:key="entry.content_id"
-								:highestMatchingUrlCount="highestMatchingUrlCount"
-								:activeContent="activeEntry"
-								:entry="entry"
-								:openMenuHierarchy="openMenuHierarchy"
-							/>
+							<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 						</div>
 					</div>
 				</div>

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

@@ -8,11 +8,6 @@ export default {
         },
 		activeContent: [String, Number],
 		highestMatchingUrlCount: Number,
-		openMenuHierarchy: Array,
-		precedingMenuHierarchy: {
-			type: Array,
-			default: [],
-		},
     },
     data: () => {
 		return {
@@ -20,7 +15,7 @@ export default {
 			urlCount:0,
         }
     },
-	inject: ['setActiveEntry', 'setOpenMenuHierarchy', 'addUrlCount'],
+	inject: ['makeParentContentActive', 'setActiveEntry','addUrlCount'],
 	watch:{
 		highestMatchingUrlCount: function(newValue)
 		{
@@ -30,27 +25,49 @@ export default {
 				this.setActiveEntry(this.entry.content_id);
 			}
 		},
-		openMenuHierarchy() {
-			if (!this.hasChilds) return;
-
-			if (this.$props.openMenuHierarchy.length && this.$props.openMenuHierarchy[0] === this.$props.entry.content_id) {
-				this.$props.entry.menu_open = true;				
-			} else {
-				this.$props.entry.menu_open = false;				
+		activeContent: function(newValue){
+			if(newValue == this.entry.content_id){
+				// wenn der Menupunkt nicht bereits offen ist
+				if (!this.entry.menu_open){
+					this.entry.menu_open = true;
+				}
+				
+			}else{
+				if (this.searchRecursiveChild(this.entry, 'content_id',newValue)) {
+					this.entry.menu_open = true;
+				} else {
+					this.entry.menu_open = false;
+				}
 			}
 		},
-		'entry.menu_open': function (isMenuOpen) {
-			if (!this.collapse)
-				return;
-
-			if (isMenuOpen) {
-				this.collapse.show();
-			} else {
-				this.collapse.hide();
+		'entry.menu_open': function (newValue,oldValue) {
+			if (newValue) 
+			{
+				// only invokes .show if this.collapse is not null
+				this.collapse && this.collapse.show();
+			} 
+			else 
+			{
+				// only invokes .hide if this.collapse is not null
+				this.collapse && this.collapse.hide();
+				if (this.activeContent == this.entry.content_id)
+				{
+					this.makeParentContentActive(this.entry.content_id);
+				}
 			}
 		},
 	},
     computed: {
+		active: function () {
+			if (this.entry.menu_open){
+				return true;
+			}
+			else if (this.activeContent) {
+				return this.activeContent == this.entry.content_id;
+			} else {
+				return false;
+			}
+		},
 		hasFullLink() {
 			return this.entry.url.startsWith(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router)
 		},
@@ -72,34 +89,25 @@ export default {
         },
         hasChilds() {
             return this.entry.childs && this.entry.childs.length !== 0;
-        },
-		menuHierarchy() {
-			return [...this.$props.precedingMenuHierarchy, this.$props.entry.content_id];
-		},
-		menuNodeHref() {
-			if (this.hasChilds) {
-				return this.$props.entry.menu_open && this.hasFullLink
-					? this.$props.entry.url
-					: null;
-			} else {
-				return this.$props.entry.url;
-			}
-		},
+        }
     },
     methods: {
 		getUrlMatchPoints(url,link){
 			let splitted_link = link.split('/');
 			let splitted_url = url.href.split('/');
+
 			let count = 0;
 
-			for (let part_url of splitted_url) {
-				for (let part_link of splitted_link) {
-					if (part_url === part_link) {
+			for(let part_url of splitted_url)
+			{
+				for (let part_link of splitted_link)
+				{
+					if(part_url == part_link)
+					{
 						count++;
 					}
 				}
 			}
-
 			this.urlCount = count;
 			this.addUrlCount(count);
 		},
@@ -111,11 +119,14 @@ export default {
 			let url_hash = url.hash;
 			url_hash = url_hash.replace(url_hash_spaceSymbol_regex, " ").replace(url_hash_sharpSymbol_regex,"");
 			
+			// if the url hash contains the titel of the menu 
+			// or if the url equals the link of a menu 
+			// then set the menu active 
 			if (url_hash == this.entry.titel || url.href == this.entry.url) {
 					this.setActiveEntry(this.entry.content_id);
-					this.setOpenMenuHierarchy(this.menuHierarchy);
 			}
 		},
+		// searches the childs of an entry recursively based on the value of a property
 		searchRecursiveChild(entry,property,value){
 			if (typeof entry.childs == 'object' && !Array.isArray(entry.childs) && Object.entries(entry.childs).length > 0){
 				entry.childs = Object.values(entry.childs);
@@ -132,23 +143,16 @@ export default {
 			}	
 			return false;
 		},
-        toggleCollapse() {
-			if (!this.$props.entry.menu_open) {
-				this.setOpenMenuHierarchy(this.menuHierarchy);
-			} else {
-				this.setOpenMenuHierarchy(this.precedingMenuHierarchy);
+        toggleCollapse(evt) {
+			if (this.active)
+			{
+				this.makeParentContentActive(this.entry.content_id); 
 			}
-        },
-		handleClickOnMenuNode() {
-			if (this.hasFullLink) {
-				this.setActiveEntry(this.$props.entry.content_id);
-				if (this.hasChilds) {
-					this.setOpenMenuHierarchy(this.menuHierarchy);
-				}
-			} else if (this.hasChilds) {
-				this.toggleCollapse();
+			else
+			{
+				this.setActiveEntry(this.entry.content_id);
 			}
-		},
+        }
     },
     mounted() {
         if (this.$refs.children) {
@@ -164,41 +168,41 @@ export default {
         INCLUDE
     </div>
     <template v-else>
-		<div class="btn-group w-100">
-			<a
-				@click="handleClickOnMenuNode($event)"
-				:href="menuNodeHref"
-				:target="target"
-				class="btn btn-default rounded-0 text-start"
-				:class="{
-					['btn-level-' + level]: true,
-					'fw-bold': $props.activeContent === $props.entry.content_id
-				}"
-				:style="'padding-left: calc(var(--bs-btn-padding-x) * ' + $props.level + ');'"
-			>
-				{{ entry.titel }}
-			</a>
-			<button
-				v-if="hasChilds"
-				@click.prevent="toggleCollapse()"
-				:aria-expanded="entry.menu_open"
-				class="btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0"
-				:class="{ collapsed: !entry.menu_open }"
-			>
-				<span class="visually-hidden">Toggle Dropdown</span>
-			</button>
-		</div>
-		<ul v-if="hasChilds" ref="children" class="nav w-100 collapse" >
-			<cis-menu-entry
-				v-for="child in entry.childs"
-				:key="child"
-				:highestMatchingUrlCount="highestMatchingUrlCount"
-				:activeContent="activeContent"
-				:entry="child"
-				:level="level + 1"
-				:openMenuHierarchy="$props.openMenuHierarchy.slice(1)"
-				:precedingMenuHierarchy="menuHierarchy"
-			/>
-		</ul>
+        <template v-if="hasChilds">
+			<div class="btn-group w-100">
+ 				<a :target="target" 
+ 					:href="(entry.menu_open && hasFullLink) ? entry.url : null"
+					@click="toggleCollapse"
+                    :class="{
+                        'btn btn-default rounded-0 text-start': true,
+                        ['btn-level-' + level]: true,
+						'fw-bold':active
+                    }">
+                    {{ entry.titel }}
+                </a>
+                <button @click.prevent="toggleCollapse" :aria-expanded="entry.menu_open"
+                    :class="{
+                        'btn btn-default rounded-0 dropdown-toggle dropdown-toggle-split flex-grow-0': true,
+                        collapsed: !entry.menu_open
+                    }">
+                    <span class="visually-hidden">Toggle Dropdown</span>
+                </button>
+            </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"/>
+            </ul>
+        </template>
+		<a v-else
+            :href="entry.url"
+            :target="target"
+            :class="{
+                'btn btn-default rounded-0 w-100 text-start': true,
+                ['btn-level-' + level]: true,
+				'fw-bold':active
+            }"
+            @mouseup="setActiveEntry(entry.content_id)">
+            {{ entry.titel }}
+        </a>
     </template>`
 };

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

@@ -206,8 +206,6 @@ export default {
 			});
 
 			this.lehrveranstaltungen.forEach((lehrveranstaltung)=>{
-				// a lehrveranstaltung without a modul has no children
-				if(!Array.isArray(lehrveranstaltung.lehrveranstaltungen)) return;
 				lehrveranstaltung.lehrveranstaltungen.sort((lv1,lv2)=>{
 					if (lv1.bezeichnung.toLowerCase() > lv2.bezeichnung.toLowerCase()) {
 						return 1;
@@ -395,16 +393,6 @@ export default {
 				</ul>
 			</div>
 		</div>
-		<div class="card" v-else-if="!Array.isArray(lehrveranstaltung.lehrveranstaltungen)">
-			<div class="card-body">
-				<ul class="list-group list-group-flush">
-					<li class="d-flex list-group-item">
-						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lehrveranstaltung)">{{isGermanLanguage ? lehrveranstaltung.bezeichnung : lehrveranstaltung.bezeichnung_english}}</a>
-						<p>{{lehrveranstaltung.lehrform_kurzbz}}</p>
-					</li>
-				</ul>
-			</div>
-		</div>
 	</template>
 	</div>
 

public/js/components/DetailHeader/DetailHeader.js

@@ -400,37 +400,32 @@ export default {
 
 				<div v-if="headerData.length == 1">
 					<div v-if="!isLoading" class="d-flex align-items-center gap-3">
-						<h2 class="h4 mt-2">
+						<h2 class="h4">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
 							{{headerData[0].nachname}}
 							<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
-
-						<div class="d-flex border rounded align-items-center ps-1">
-							<core-tag ref="tagComponent"
-								v-if="tagsEnabled"
-								:endpoint="tagEndpoint"
-								:values="prestudentIds"
-								:show-hover="true"
-								@added="addedTag"
-								@deleted="deletedTag"
-								@updated="updatedTag"
-								zuordnung_typ="prestudent_id"
-							></core-tag>
-							<div
-								role="button"
-								v-if="tagsEnabled"
-								@click="rebuildPrestudentTags"
-								class="btn btn-outline btn-sm btn-hover m-1"
-								:title="$p.t('tag','rebuild_tags') +  ' ' + currentSemester"
-								>
-								<i class="fa-solid fa-refresh pe-1"></i>
-								<span>{{currentSemester}}</span>
-							</div>
+						<core-tag ref="tagComponent"
+							v-if="tagsEnabled"
+							:endpoint="tagEndpoint"
+							:values="prestudentIds"
+							@added="addedTag"
+							@deleted="deletedTag"
+							@updated="updatedTag"
+							zuordnung_typ="prestudent_id"
+						></core-tag>
+						<div
+							role="button"
+							v-if="tagsEnabled"
+							@click="rebuildPrestudentTags"
+							class="btn btn-outline btn-light mb-1"
+							:title="'Automatische Tags fuer ' + currentSemester + ' neu laden'"
+							>
+							<i class="fa-solid fa-refresh pe-1"></i>
+							<span>{{currentSemester}}</span>
 						</div>
-
 						<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
 					</div>
 					<div v-else class="d-flex align-items-center gap-3">

public/js/components/Notiz/Notiz.js

@@ -4,7 +4,7 @@ import {CoreFilterCmpt} from "../filter/Filter.js";
 import BsModal from "../Bootstrap/Modal.js";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
-
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
 export default {
 	components: {
@@ -13,7 +13,8 @@ export default {
 		FormUploadDms,
 		FormForm,
 		FormInput,
-		BsModal
+		BsModal,
+		PvAutoComplete
 	},
 	props: {
 		endpoint: {
@@ -52,7 +53,6 @@ export default {
 			multiupload: true,
 			mitarbeiter: [],
 			filteredMitarbeiter: [],
-			zwischenvar: '',
 			editorInitialized: false,
 			editor: null,
 			notizData: {
@@ -85,7 +85,11 @@ export default {
 				showId: false,
 				showLastupdate: false
 			},
-			currentVerfasserUid: null
+			selectedBearbeiter: null,
+			selectedVerfasser: null,
+			abortController: {
+				mitarbeiter: null
+			}
 		}
 	},
 	computed: {
@@ -297,6 +301,15 @@ export default {
 		},
 		actionEditNotiz(notiz_id) {
 			this.loadNotiz(notiz_id).then(() => {
+				this.selectedBearbeiter = {
+					label: this.getLabelUid(this.notizData.perb_titelpre, this.notizData.perb_nachname, this.notizData.perb_vorname, this.notizData.perb_titelpost, this.notizData.perb_uid),
+					uid: this.notizData.perb_uid
+				}
+				this.selectedVerfasser = {
+					label: this.getLabelUid(this.notizData.perv_titelpre, this.notizData.perv_nachname, this.notizData.perv_vorname, this.notizData.perv_titelpost, this.notizData.perv_uid),
+					uid: this.notizData.perv_uid
+				}
+
 				if (this.notizen.notiz_id) {
 					this.notizData.typeId = this.typeId;
 					this.notizData.titel = this.notizen.titel;
@@ -308,8 +321,13 @@ export default {
 					this.notizData.bis = this.notizen.ende;
 					this.notizData.document = this.notizen.dms_id;
 					this.notizData.erledigt = this.notizen.erledigt;
-					this.notizData.intBearbeiter = this.notizen.bearbeiter_uid;
-					this.notizData.bearbeiter = this.notizen.bearbeiter_uid;
+					//this.notizData.bearbeiter_uid = this.notizen.bearbeiter_uid;
+					//for saving
+					//this.notizData.intBearbeiter = this.notizen.bearbeiter_uid;
+					//this.notizData.bearbeiter = this.notizen.bearbeiter_uid;
+					//new way
+					this.notizData.bearbeiter = this.selectedBearbeiter.uid;
+					this.notizData.verfasser = this.selectedVerfasser.uid;
 				}
 			})
 				.then(() => {
@@ -323,7 +341,9 @@ export default {
 				});
 		},
 		actionNewNotiz() {
+			console.log("auf plus");
 			this.resetFormData();
+			this.getDefaultVerfasser();
 			if(this.notizLayout == 'popupModal') {
 				this.$refs.NotizModal.show();
 			}
@@ -374,7 +394,6 @@ export default {
 					this.notizData = result.data;
 					this.notizData.typeId = this.typeId;
 					this.notizData.anhang = [];
-					this.currentVerfasserUid = result.data.verfasser_uid;
 					return result;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -431,24 +450,54 @@ export default {
 				bearbeiter: null,
 				anhang: [],
 			};
-			this.currentVerfasserUid = this.uid
+			this.selectedBearbeiter = null;
+			this.selectedVerfasser = null;
 		},
-		getUid() {
+		getDefaultVerfasser() {
 			return this.$api
-				.call(this.endpoint.getUid())
+				.call(this.endpoint.getDefaultVerfasser())
 				.then(result => {
-					this.currentVerfasserUid = result.data;
-					this.uid = result.data;
+					const verfasser = result.data;
+					this.selectedVerfasser = {
+						label: this.getLabelUid(verfasser.titelpre, verfasser.nachname, verfasser.vorname, verfasser.titelpost, verfasser.mitarbeiter_uid),
+						uid: verfasser.uid
+					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		search(event) {
+		searchMitarbeiter(event) {
+			if (this.abortController.mitarbeiter) {
+				this.abortController.mitarbeiter.abort();
+			}
+
+			this.abortController.mitarbeiter = new AbortController();
+
 			return this.$api
 				.call(this.endpoint.getMitarbeiter(event.query))
 				.then(result => {
-					this.filteredMitarbeiter = result.data.retval;
+					//this.filteredMitarbeiter = result.data.retval;
+					this.filteredMitarbeiter = [];
+					for (let mitarbeiter of result.data.retval) {
+						this.filteredMitarbeiter.push(
+							{
+								label: this.getLabelUid(
+									mitarbeiter.titelpre,
+									mitarbeiter.nachname,
+									mitarbeiter.vorname,
+									mitarbeiter.titelpost,
+									mitarbeiter.mitarbeiter_uid
+								),
+								uid: mitarbeiter.mitarbeiter_uid
+							}
+						);
+					}
 				});
 		},
+		getLabelUid(titelpre, nachname, vorname, titelpost, uid) {
+			if (!nachname && !vorname && !uid)
+				return '';
+			return nachname + ' ' + vorname + (titelpre ? ' ' + titelpre : '') + (titelpost ? ' ' + titelpost : '') + (uid ? ' (' + uid + ')' : '');
+		},
 		initTinyMCE() {
 			const vm = this;
 			tinymce.init({
@@ -491,7 +540,7 @@ export default {
 	},
 	created() {
 		this.initializeShowVariables();
-		this.getUid();
+		this.getDefaultVerfasser();
 	},
 	async mounted() {
 		if (this.showTinyMce) {
@@ -512,18 +561,14 @@ export default {
 				}
 			}
 		},
-		//Watcher für autocomplete Bearbeiter und Verfasser
-		'notizData.intBearbeiter': {
-			handler(newVal) {
-				if (typeof newVal === 'object') {
-					this.notizData.bearbeiter = newVal.mitarbeiter_uid;
-				}
-			},
-			deep: true
-		},
-
 		id() {
 			this.reload();
+		},
+		selectedBearbeiter(newVal) {
+			this.notizData.bearbeiter = newVal?.uid || null;
+		},
+		selectedVerfasser(newVal) {
+			this.notizData.verfasser = newVal?.uid || null;
 		}
 	},
 	beforeUnmount() {
@@ -621,9 +666,21 @@ export default {
 					<div class="row mb-3">
 						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','verfasser')}}</label>
 											
-						<div class="col-sm-3">
-							<input type="text" readonly="readonly" class="form-control" id="name" v-model="currentVerfasserUid">
-						</div>
+						<form-input
+							type="autocomplete"
+							container-class="col-3"
+							v-model="selectedVerfasser"
+							optionLabel="label"
+							optionValue="uid"
+							disabled
+							dropdown
+							forceSelection
+							name="bearbeiter"
+							:suggestions="filteredMitarbeiter"
+							@complete="searchMitarbeiter"
+							:min-length="3"
+							>
+						</form-input>
 						
 						<label for="von" class="form-label col-sm-1">{{$p.t('global','gueltigVon')}}</label>
 						<div class="col-sm-3">
@@ -644,21 +701,20 @@ export default {
 					<div class="row mb-3">
 						<label for="bis" class="form-label col-sm-2">{{$p.t('notiz','bearbeiter')}}</label>
 						
-						<div v-if="notizData.bearbeiter_uid" class="col-sm-3">
-							<input type="text" class="form-control" id="name" v-model="notizData.bearbeiter_uid">
-						</div>
-						
-						<div v-else class="col-sm-3">
-							<form-input
-								type="autocomplete"
-								v-model="notizData.intBearbeiter"
-								:suggestions="filteredMitarbeiter" 
-								@complete="search" 
-								optionLabel="mitarbeiter"
-								minlength="3"
+						<form-input
+							type="autocomplete"
+							container-class="col-3"
+							v-model="selectedBearbeiter"
+							optionLabel="label"
+							optionValue="uid"
+							dropdown
+							forceSelection
+							name="bearbeiter"
+							:suggestions="filteredMitarbeiter"
+							@complete="searchMitarbeiter"
+							:min-length="3"
 							>
-							</form-input>
-						</div>
+						</form-input>
 						
 						
 						<label for="bis" class="form-label col-sm-1">{{$p.t('global','gueltigBis')}}</label>
@@ -816,35 +872,36 @@ export default {
 							</div>
 							
 							<div class="row mb-3">
-								<form-input 
+								<form-input
+									type="autocomplete"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
-									type="text"
-									readonly="readonly"
-									v-model="currentVerfasserUid"
-									name="verfasser"
+									v-model="selectedVerfasser"
+									optionLabel="label"
+									optionValue="uid"
+									disabled
+									dropdown
+									forceSelection
+									name="bearbeiter"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
 								</form-input>
 
 								<form-input
-									v-if="notizData.bearbeiter_uid"
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
-									v-model="notizData.bearbeiter_uid"
-									minlength="3"
-									>
-								</form-input>
-								
-								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
 									type="autocomplete"
-									v-model="notizData.intBearbeiter"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
-									minlength="3"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="selectedBearbeiter"
+									optionLabel="label"
+									optionValue="uid"
+									dropdown
+									forceSelection
+									name="bearbeiter"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
 								</form-input>	
 							</div>
@@ -969,37 +1026,38 @@ export default {
 							
 					
 							<div class="row mb-3">
-								<form-input 
+								<form-input
+									type="autocomplete"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
-									type="text"
-									readonly="readonly"
-									v-model="currentVerfasserUid"
-									name="verfasser"
+									v-model="selectedVerfasser"
+									optionLabel="label"
+									optionValue="uid"
+									disabled
+									dropdown
+									forceSelection
+									name="bearbeiter"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
 								</form-input>
 								
 								<form-input
-									v-if="notizData.bearbeiter_uid"
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
-									v-model="notizData.bearbeiter_uid"
-									minlength="3"
-									>
-								</form-input>
-								
-								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
 									type="autocomplete"
-									v-model="notizData.intBearbeiter"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
-									minlength="3"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="selectedBearbeiter"
+									optionLabel="label"
+									optionValue="uid"
+									dropdown
+									forceSelection
+									name="bearbeiter"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
-								</form-input>	
+								</form-input>
 							</div>
 															
 							<div class="row mb-3">
@@ -1140,44 +1198,43 @@ export default {
 									>
 								</form-input>
 							</div>
-							
-					
+
 							<div class="row mb-3">
-								<form-input 
+								<form-input
+									type="autocomplete"
 									container-class="col-6"
 									:label="$p.t('notiz', 'verfasser')"
-									type="text"
-									readonly="readonly"
-									v-model="currentVerfasserUid"
-									name="verfasser"
-									>
-								</form-input>
-					
-								<form-input
-									v-if="notizData.bearbeiter_uid"
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
-									v-model="notizData.bearbeiter_uid"
+									v-model="selectedVerfasser"
+									optionLabel="label"
+									optionValue="uid"
+									disabled
+									dropdown
+									forceSelection
 									name="bearbeiter"
-									minlength="3"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
 								</form-input>
-								
+
 								<form-input
-									v-else
-									container-class="col-6"
-									:label="$p.t('notiz', 'bearbeiter')"
 									type="autocomplete"
-									v-model="notizData.intBearbeiter"
-									:suggestions="filteredMitarbeiter" 
-									@complete="search" 
-									optionLabel="mitarbeiter"
+									container-class="col-6"
+									:label="$p.t('notiz', 'bearbeiter')"
+									v-model="selectedBearbeiter"
+									optionLabel="label"
+									optionValue="uid"
+									dropdown
+									forceSelection
 									name="bearbeiter"
-									minlength="3"
+									:suggestions="filteredMitarbeiter"
+									@complete="searchMitarbeiter"
+									:min-length="3"
 									>
-								</form-input>	
+								</form-input>
+
 							</div>
-															
+
 							<div class="row mb-3">
 								<div class="col-2 pt-4 d-flex align-items-center">
 									<form-input

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

@@ -553,12 +553,8 @@ export default {
 			}
 
 			if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) {
-				const akadGradByGeschlecht = this.arrAkadGrad.find((item) => {
-					return item.geschlecht === this.student.geschlecht;
-				});
-
-				if(akadGradByGeschlecht)
-					this.formData.akadgrad_id = akadGradByGeschlecht.akadgrad_id;
+				if(this.student.geschlecht == 'w')
+					this.formData.akadgrad_id = this.arrAkadGrad[1].akadgrad_id;
 				else
 					this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
 			}

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

@@ -255,7 +255,7 @@ export default {
 							deleteButton.className = 'btn btn-outline-secondary';
 							const icon = document.createElement('i');
 							icon.className = 'fa fa-trash';
-							icon.title = this.$p.t('lehre/info_deleteMarkEntry');
+							icon.title = this.$p.t('ui/loeschen');
 							deleteButton.append(icon);
 							deleteButton.addEventListener('click', evt => {
 								evt.stopPropagation();

public/js/components/Stv/Studentenverwaltung/List.js

@@ -317,7 +317,6 @@ export default {
     "$p.user_language.value"(n, o) {
       if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
         this.translateTabulator();
-        this.$reloadList();
       }
     },
     "tagFilterState.selectedOptions": {
@@ -822,33 +821,18 @@ export default {
         @headerFilterOn="handleHeaderFilter"
       >
 
-    
-    	<template #actions>
-			<!-- <div>
-			<button
-			class="btn btn-outline-success sm mb-1"
-				:title="'Export ' + selectedPrestudents.length + ' prestudent(s) to Excel'"
-			>
-				<i class="fas fa-file-excel fa-xl"></i>
-			</button>
-			</div> -->
-			<template v-if="filter.length || headerFilterActive">
-				<div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
-					<p class="text-danger mb-0">
-						<strong>{{$p.t('filter','filterActive')}}</strong>
-					</p>
-
-					<button
-						class="btn btn-outline-danger sm"
-						:title="$p.t('filter/filterDelete')"
-						@click="resetFilter"
-					>
-						<span class="fa-solid fa-filter-circle-xmark"></span>
-					</button>
-				</div>
-			</template>
-		</template>
-    
+    <!--
+      <template #actions>
+        <div>
+          <button
+          class="btn btn-outline-success sm mb-1"
+            :title="'Export ' + selectedPrestudents.length + ' prestudent(s) to Excel'"
+          >
+            <i class="fas fa-file-excel fa-xl"></i>
+          </button>
+        </div>
+       </template>
+     -->
 
        <template #additional>
         <div class="pe-1">
@@ -858,37 +842,50 @@ export default {
         </div>
        </template>
 
-      <template #tags>
-        <div class="d-flex border rounded align-items-center ps-1">
-          <core-tag ref="tagComponent"
-            v-if="tagsEnabled"
-            :endpoint="tagEndpoint"
-            :values="selectedColumnValues"
-            @added="addedTag"
-            @deleted="deletedTag"
-            @updated="updatedTag"
-            zuordnung_typ="prestudent_id"
-            show-hover
-          ></core-tag>
+      <template #actions>
+        <core-tag ref="tagComponent"
+          v-if="tagsEnabled"
+          :endpoint="tagEndpoint"
+          :values="selectedColumnValues"
+          @added="addedTag"
+          @deleted="deletedTag"
+          @updated="updatedTag"
+          zuordnung_typ="prestudent_id"
+        ></core-tag>
+
+		<button
+			v-if="!selected.length"
+			class="btn btn-outline btn-light mb-1"
+			@click="rebuild(selected)"
+			:title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
+			>
+				<i class="fa-solid fa-refresh pe-1"></i> STG
+		</button>
+		<button
+			v-else
+			class="btn btn-outline btn-light mb-1"
+			@click="rebuild(selected)"
+			:title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
+			>
+				<i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
+		</button>
+
+        <template v-if="filter.length || headerFilterActive">
+        <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
+          <p class="text-danger mb-0">
+            <strong>{{$p.t('filter','filterActive')}}</strong>
+          </p>
 
           <button
-              v-if="!selected.length"
-              class="btn btn-outline btn-sm m-1 btn-hover"
-              @click="rebuild(selected)"
-              :title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
-              >
-                  <i class="fa-solid fa-refresh pe-1"></i> STG
-          </button>
-          <button
-              v-else
-              class="btn btn-outline btn-sm m-1 btn-hover"
-              @click="rebuild(selected)"
-              :title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
-              >
-                  <i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
+            class="btn btn-outline-danger sm"
+            :title="$p.t('filter/filterDelete')"
+            @click="resetFilter"
+          >
+            <span class="fa-solid fa-filter-circle-xmark"></span>
           </button>
         </div>
-		
+        </template>
+
       </template>
 
       <template #filter>
@@ -898,7 +895,6 @@ export default {
           </div>
         </div>
       </template>
-
       </core-filter-cmpt>
     </div>
     <list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>

public/js/components/Tag/Tag.js

@@ -28,10 +28,6 @@ export default {
 		confirmLimit: {
 			type: Number,
 			default: 20
-		},
-		showHover: {
-			type: Boolean,
-			default: false
 		}
 	},
 	data() {
@@ -232,8 +228,7 @@ export default {
 			<span :title="values.length === 0 ? 'Bitte Zeilen markieren' : ''">
 			<button @mouseover="showList = true" 
 					:disabled="!values || values.length === 0"
-					class="btn btn-sm"
-					:class="{'btn-hover': showHover}">
+					class="btn btn-sm">
 				<i class="fa-solid fa-tag fa-xl"></i>
 			</button>
 			</span>

public/js/components/filter/Filter.js

@@ -1094,7 +1094,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.search || $slots.actions || $slots.tags" class="d-flex gap-2 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.search || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -1107,7 +1107,6 @@ export const CoreFilterCmpt = {
 						<span v-else id="selected-info-text"> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
 					<slot name="actions" v-bind="{selected: tabulatorHasSelector ? selectedData : []}"></slot>
-					<slot name="tags"></slot>
 					<slot name="search"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">

system/phrasesupdate.php

@@ -62411,26 +62411,6 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'lehre',
-		'phrase' => 'info_deleteMarkEntry',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Noteneintrag entfernen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Remove grade entry',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 );