From 60e403a28b9e8d9cd5c429b4d06ec027eb8135d2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Aug 2025 14:18:51 +0200
Subject: [PATCH 001/189] update(Studium Phrases): inserts phrases for the
 studium component

---
 .../controllers/api/frontend/v1/Studium.php   |  31 +++---
 public/js/components/Cis/Mylv/LvUebersicht.js |   2 +-
 public/js/components/Cis/Studium/Studium.js   |  33 +++---
 system/phrasesupdate.php                      | 102 ++++++++++++++++++
 4 files changed, 140 insertions(+), 28 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index d17f0c1a1..dc72334a2 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -63,20 +63,21 @@ class Studium extends FHCAPI_Controller
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
 			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			
-			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-			$student_studiengang = $studentLehrverband->studiengang_kz;
-			$student_semester = $studentLehrverband->semester;
-			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
-			
-			if(!isset($parameter_studiensemester))
-			$parameter_studiensemester = $student_studiensemester;
-			if(!isset($parameter_studiengang))
-			$parameter_studiengang = $student_studiengang;
-			if(!isset($parameter_semester))
-			$parameter_semester = $student_semester;
-			if(!isset($parameter_studienplan))
-			$parameter_studienplan = $student_studienplan;
+			if($studentLehrverband){
+				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+				$student_studiengang = $studentLehrverband->studiengang_kz;
+				$student_semester = $studentLehrverband->semester;
+				$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
+				
+				if(!isset($parameter_studiensemester))
+				$parameter_studiensemester = $student_studiensemester;
+				if(!isset($parameter_studiengang))
+				$parameter_studiengang = $student_studiengang;
+				if(!isset($parameter_semester))
+				$parameter_semester = $student_semester;
+				if(!isset($parameter_studienplan))
+				$parameter_studienplan = $student_studienplan;
+			}
 		}  
 
 		if(isset($parameter_studiensemester)){
@@ -216,6 +217,8 @@ class Studium extends FHCAPI_Controller
 		$studienplaene = array_map(function($studienplan){
 			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
 			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
+			// bezeichnung_mehrsprachig
+			$studienplan->orgform_bezeichnung_english = $orgform->bezeichnung_mehrsprachig[1];
 			return $studienplan;
 		},$studienplaene);
 		return $studienplaene;
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 1ec93590f..df79275d0 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -100,7 +100,7 @@ export default  {
 			</template>
 			<template v-else>
 				<span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
-				<span v-else>Lehrveranstaltungs Übersicht</span>
+				<span v-else>{{$p.t('lehre','lvUebersicht')}}</span>
 			</template>
 
         </template>
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 1b7aff81b..68221af62 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -195,7 +195,11 @@ export default {
 		},
 		studiengangTitel(studiengang) {
 			if (!studiengang) return "";
-			return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+			if(this.isGermanLanguage){
+				return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+			}else{
+				return `${studiengang?.kurzbzlang} (${studiengang?.english})`;
+			}
 		},
 		studiensemesterTitel(studiensemester){
 			if (!studiensemester) return "";
@@ -213,9 +217,12 @@ export default {
 	},
 
 	computed:{
+		isGermanLanguage(){
+			return this.$p.user_language.value == "German"
+		},
 		selectedLehrveranstaltungTitel(){
 			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
-			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
+			return `${this.isGermanLanguage ? this.selectedLehrveranstaltung?.bezeichnung : this.selectedLehrveranstaltung?.bezeichnung_english} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
 		},
 		computedStudienOrdnung(){
 			if(!this.studienOrdnung) return null;
@@ -232,14 +239,14 @@ export default {
 			let result = [];
 			Object.entries(this.computedStudienOrdnung).forEach(([key,value])=>{
 				result.push({
-					bezeichnung: `Studienordnung: ${key}`,
+					bezeichnung: `${this.$p.t('studium', 'studienordnung') }: ${key}`,
 					disabled: true,
 				});
 				value.forEach((studienplan)=>{
 					result.push({
 						studienplan:studienplan,
 						diabled: false,
-						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${studienplan?.orgform_bezeichnung}, ${studienplan?.sprache} )`
+						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${this.isGermanLanguage ? studienplan?.orgform_bezeichnung : studienplan?.orgform_bezeichnung_english}, ${studienplan?.sprache} )`
 							
 					});
 				})
@@ -264,14 +271,14 @@ export default {
 		})
 
 	},
-	template: `
+	template: /*html*/`
 	<div>
-	<h2>Studium</h2>
+	<h2>{{$p.t('studium','studium')}}</h2>
 	<hr>
 	<lv-uebersicht ref="lvUebersicht" :titel="selectedLehrveranstaltungTitel" :event="selectedLehrveranstaltung" :studiensemester="selectedStudiensemester" v-if="selectedLehrveranstaltung">
 		<template #content>
 			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
-				<h4>Lektoren:</h4>
+				<h4>{{$p.t('studium','lektoren')}}:</h4>
 				<a :href="'mailto:'+lektor?.email" class="fhc-link-color mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
 			<h4>Menu:</h4>
@@ -279,7 +286,7 @@ export default {
 	</lv-uebersicht>
 	<div class="lvOptions">
 		<div>
-		<h6>Studiensemester:</h6>
+		<h6>{{$p.t('studium','studiensemester')}}:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -294,7 +301,7 @@ export default {
 		</div>
 
 		<div>
-		<h6>Studiengang:</h6>
+		<h6>{{$p.t('lehre','studiengang')}}:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -309,7 +316,7 @@ export default {
 		</div>
 
 		<div>
-		<h6>Semester:</h6>
+		<h6>{{$p.t('lehre','semester')}}:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -324,7 +331,7 @@ export default {
 		</div>
 
 		<div>
-		<h6>Studienordnung:</h6>
+		<h6>{{$p.t('studium','studienordnung')}}:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -345,13 +352,13 @@ export default {
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
-				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
+				<h5 class=" card-title">{{isGermanLanguage == 'German' ? lehrveranstaltung.bezeichnung : lehrveranstaltung.bezeichnung_english }}</h5>
 				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrform_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
 					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{isGermanLanguage == 'German' ? lv.bezeichnung : lv.bezeichnung_english}}</a>
 						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4a3cfd7ec..82d97da7c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30284,6 +30284,88 @@ array(
 		
 
 		//ProfilUpdate Phrasen ende
+		//Studium Phrasen start
+	array(
+		'app' => 'core',
+		'category' => 'studium',
+		'phrase' => 'studium',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studium',
+		'phrase' => 'studienordnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study regulation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studium',
+		'phrase' => 'lektoren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lektoren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lecturers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studium',
+		'phrase' => 'studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// Studium Phrasen Ende
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -36168,6 +36250,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvUebersicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungs Übersicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Overview',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From c10baca137ceac61a78996580d04c8e1501488bb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Aug 2025 13:44:35 +0200
Subject: [PATCH 002/189] update(Cis Menu deactive content): filters all
 content out of the cis menu that has not set the active flag

---
 public/js/components/Cis/Menu.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f073d5a38..d02a627af 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -61,11 +61,31 @@ export default {
 		}
 	},
 	methods: {
+		filterEntries(entries) {
+			if (!entries) return entries;
+
+			const filteredEntries = entries.filter((entry)=>{
+				if(entry.aktiv)
+					return true;
+				else 
+					return false;
+			})
+			
+			filteredEntries.forEach((filteredEntry,index) => {
+				if (Array.isArray(filteredEntry?.childs) && filteredEntry?.childs.length > 0) {
+					filteredEntries[index].childs =this.filterEntries(filteredEntry.childs);
+				}	
+				
+			});
+			
+			return filteredEntries;
+		},
 		fetchMenu() {
 			return this.$api
 				.call(ApiCisMenu.getMenu())
 				.then(res => res.data)
 				.then(menu => {
+					console.log(menu,"this is the menu")
 					this.entries = menu;
 				});
 		},
@@ -150,7 +170,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="nav-menu-collapse collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in filterEntries(entries)" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>

From f69016883c7fc9ed45522e3dc0be7cb135a49998 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 26 Aug 2025 12:00:56 +0200
Subject: [PATCH 003/189] update(Cis Menu Content aktiv): changes the menu
 content query so that only aktiv content is filtered and returned to the
 frontend

---
 application/models/content/Content_model.php |  4 ++--
 public/js/components/Cis/Menu.js             | 22 +-------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 278022b59..5051a0b06 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -236,7 +236,7 @@ class Content_model extends DB_Model
 							LEFT JOIN
 								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
 							WHERE
-								sichtbar=true
+								sichtbar=true AND c1.aktiv = true
 						) s2
 						LEFT JOIN
 							campus.tbl_contentsprache s3 USING(content_id, sprache)
@@ -277,7 +277,7 @@ class Content_model extends DB_Model
 			JOIN 
 				campus.tbl_contentsprache s USING(contentsprache_id)
 			LEFT JOIN 
-				campus.tbl_contentchild k ON(m.content_id=k.content_id)
+				campus.tbl_contentchild k ON(m.content_id=k.content_id) and c.aktiv = true
 			WHERE EXISTS (
 				SELECT 1 
 				FROM campus.tbl_contentgruppe 
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index d02a627af..f073d5a38 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -61,31 +61,11 @@ export default {
 		}
 	},
 	methods: {
-		filterEntries(entries) {
-			if (!entries) return entries;
-
-			const filteredEntries = entries.filter((entry)=>{
-				if(entry.aktiv)
-					return true;
-				else 
-					return false;
-			})
-			
-			filteredEntries.forEach((filteredEntry,index) => {
-				if (Array.isArray(filteredEntry?.childs) && filteredEntry?.childs.length > 0) {
-					filteredEntries[index].childs =this.filterEntries(filteredEntry.childs);
-				}	
-				
-			});
-			
-			return filteredEntries;
-		},
 		fetchMenu() {
 			return this.$api
 				.call(ApiCisMenu.getMenu())
 				.then(res => res.data)
 				.then(menu => {
-					console.log(menu,"this is the menu")
 					this.entries = menu;
 				});
 		},
@@ -170,7 +150,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="nav-menu-collapse collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in filterEntries(entries)" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>

From 9c8a1f564eab229b4b88f37287fdeec05b7fadb1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 29 Oct 2025 09:52:11 +0100
Subject: [PATCH 004/189] add sort functionality to bookmark widget

---
 .../controllers/api/frontend/v1/Bookmark.php  | 33 +++++++-
 public/js/api/factory/widget/bookmark.js      | 10 ++-
 public/js/components/DashboardWidget/Url.js   | 84 +++++++++++++++++++
 system/dbupdate_3.4.php                       |  3 +-
 ...57_dashboard_bookmark_neue_Spalte_sort.php | 41 +++++++++
 5 files changed, 166 insertions(+), 5 deletions(-)
 create mode 100644 system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index 3e646bb51..f925e9662 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -31,6 +31,7 @@ class Bookmark extends FHCAPI_Controller
             'delete' => self::PERM_LOGGED,
             'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
+			'changeOrder' => self::PERM_LOGGED,
         ]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
@@ -51,7 +52,7 @@ class Bookmark extends FHCAPI_Controller
 	 */
 	public function getBookmarks()
 	{
-        $this->BookmarkModel->addOrder("bookmark_id");
+        $this->BookmarkModel->addOrder("sort");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
         $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
@@ -99,8 +100,9 @@ class Bookmark extends FHCAPI_Controller
         $url = $this->input->post('url',true);
         $title = $this->input->post('title',true);
         $tag = $this->input->post('tag', true);
+		$sort = $this->input->post('sort', true);
 
-        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);
+        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL, 'sort'=>$sort,]);
 
         $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
@@ -134,5 +136,32 @@ class Bookmark extends FHCAPI_Controller
         $this->terminateWithSuccess($update_result);
 
     }
+
+	/**
+	 * changes sort of two bookmarks in the bookmark table
+	 * @access public
+	 * @return void
+	 */
+    public function changeOrder($bookmark_id1, $bookmark_id2)
+	{
+
+		$result1 = $this->BookmarkModel->load($bookmark_id1);
+		$data1 = $this->getDataOrTerminateWithError($result1);
+		$sort1 = current($data1)->sort;
+
+		$result2 = $this->BookmarkModel->load(["bookmark_id"=>$bookmark_id2]);
+		$data2 = $this->getDataOrTerminateWithError($result2);
+		$sort2 = current($data2)->sort;
+
+        $update_result1 = $this->BookmarkModel->update($bookmark_id1,['sort'=>$sort2,]);
+        $update_result[] = $this->getDataOrTerminateWithError($update_result1);
+
+		$update_result2 = $this->BookmarkModel->update($bookmark_id2,['sort'=>$sort1,]);
+        $update_result[] = $this->getDataOrTerminateWithError($update_result2);
+
+
+
+        $this->terminateWithSuccess($update_result);
+    }
 }
 
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index 9768e25ac..76c38cea7 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -35,11 +35,17 @@ export default {
 			params: { url, title }
 		};
 	},
-	insert({ url, title, tag }) {
+	insert({ url, title, tag, sort }) {
 		return {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/insert`,
-			params: { url, title, tag }
+			params: { url, title, tag, sort }
 		}; 
+	},
+	changeOrder(bookmark_id1, bookmark_id2) {
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/Bookmark/changeOrder/${bookmark_id1}/${bookmark_id2}`,
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 16eacab90..e07e55b18 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -23,6 +23,7 @@ export default {
 		bookmark_id: null,
 		title_input: "",
 		url_input: "",
+		sort: null,
 		validation: {
 			invalidURL: false,
 			invalidTitel: false,
@@ -42,6 +43,25 @@ export default {
 
 			return false;
 		},
+		newSort(){
+			if(this.shared.length == 0)
+				return 1;
+			else
+				return Math.max(...this.shared.map(b => b.sort)) + 1;
+		},
+		maxSort(){
+			if(this.shared.length == 0)
+				return 0;
+			else
+				return Math.max(...this.shared.map(b => b.sort));
+		},
+		minSort(){
+			if(this.shared.length == 0)
+				return 0;
+			else
+				return Math.min(...this.shared.map(b => b.sort));
+		},
+
 	},
 	methods: {
 		stopDrag(event){
@@ -94,11 +114,15 @@ export default {
 			// early return if validation failed
 			if (!this.isValidationSuccessfull()) return;
 
+			// get highest Sort
+			this.sort = this.newSort;
+
 			this.$api
 				.call(ApiBookmark.insert({
 					tag: this.config.tag,
 					title: this.title_input,
 					url: this.url_input,
+					sort: this.sort
 				}))
 				.then((res) => res.data)
 				.then((result) => {
@@ -150,6 +174,42 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		sortDown(bookmark_id){
+			const current = this.shared.find(b => b.bookmark_id === bookmark_id);
+
+			const next = this.shared
+				.filter(b => b.sort > current.sort)
+				.sort((a, b) => a.sort - b.sort)[0];
+
+			if (!next) {
+				console.log("lowest sort item, no change");
+				return;
+			}
+			this.changeOrder(current.bookmark_id, next.bookmark_id);
+		},
+		sortUp(bookmark_id){
+			const current = this.shared.find(b => b.bookmark_id === bookmark_id);
+
+			const next = this.shared
+				.filter(b => b.sort < current.sort)
+				.sort((a, b) => a.sort + b.sort)[0];
+
+			if (!next) {
+				console.log("highest sort item, no change");
+				return;
+			}
+			this.changeOrder(current.bookmark_id, next.bookmark_id);
+		},
+		changeOrder(bookmark_id_1, bookmark_id_2){
+			this.$api
+				.call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2))
+				.then((res) => res.data)
+				.then((result) => {
+					// refetch the bookmarks to see the updates
+					this.fetchBookmarks();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	async mounted() {
 		await this.fetchBookmarks();
@@ -163,6 +223,7 @@ export default {
         <div class="d-flex flex-column justify-content-between">
         	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
+
             <template v-if="shared">
 
                 <template v-if="!emptyBookmarks">
@@ -180,6 +241,29 @@ export default {
 							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" v-tooltip="{showDelay:1000,value:'delete bookmark'}" @click.prevent="removeLink(link.bookmark_id)">
 								<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
 							</a>
+							<!--SORT BOOKMARKS-->
+							<a
+								v-if="shared.length > 1"
+								type="button"
+								id="downsortBookmark"
+								href="#"
+								aria-label="sortdown bookmark"
+								v-tooltip="{showDelay:1000,value:'sort down bookmark'}"
+								@click.prevent="sortDown(link.bookmark_id)"
+								>
+								<i :class="[ 'fa', 'fa-arrow-down', 'me-1', link.sort === maxSort ? 'text-light pointer-events-none' : '' ]"></i>
+							</a>
+							<a
+								v-if="shared.length > 1"
+								type="button"
+								id="upsortBookmark"
+								href="#"
+								aria-label="sortup bookmark"
+								v-tooltip="{showDelay:1000,value:'sort up bookmark'}"
+								@click.prevent="sortUp(link.bookmark_id)"
+								>
+								<i :class="[ 'fa', 'fa-arrow-up', 'me-1', link.sort === minSort ? 'text-light pointer-events-none' : '' ]"></i>
+							</a>
 						</div>
 					</div>
                 </template>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index e51d83a70..553b2ed2b 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -84,6 +84,7 @@ require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
 require_once('dbupdate_3.4/66982_berufsschule.php');
 require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
+require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -452,7 +453,7 @@ $tabellen=array(
 	"wawi.tbl_rechnungsbetrag"  => array("rechnungsbetrag_id","rechnung_id","mwst","betrag","bezeichnung","ext_id"),
 	"wawi.tbl_aufteilung"  => array("aufteilung_id","bestellung_id","oe_kurzbz","anteil","insertamum","insertvon","updateamum","updatevon"),
 	"wawi.tbl_aufteilung_default"  => array("aufteilung_id","kostenstelle_id","oe_kurzbz","anteil","insertamum","insertvon","updateamum","updatevon"),
-	"dashboard.tbl_bookmark"  => array("bookmark_id","uid","url","title","tag","insertamum","insertvon","updateamum","updatevon"),
+	"dashboard.tbl_bookmark"  => array("bookmark_id","uid","url","title","tag","insertamum","insertvon","updateamum","updatevon","sort"),
 
 );
 
diff --git a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
new file mode 100644
index 000000000..384e49832
--- /dev/null
+++ b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
@@ -0,0 +1,41 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+//Add column sort to dashboard.tbl_bookmark
+if(!@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
+	$qry = "ALTER TABLE dashboard.tbl_bookmark ADD COLUMN sort integer DEFAULT NULL;
+			COMMENT ON COLUMN dashboard.tbl_bookmark.sort IS 'Sort Index for Bookmark.';
+			";
+
+	if (!$db->db_query($qry))
+		echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo '<br>Spalte sort zu Tabelle dashboard.tbl_bookmark hinzugefügt';
+
+}
+
+//add preliminary Sort for all bookmarks if NULL
+//TODO(manu) verfeinern, falls einzelne Werte NULL
+if(@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
+	$qry = "WITH ranked AS (
+		  SELECT
+			t1.bookmark_id,
+			(
+			  SELECT COUNT(*)
+			  FROM dashboard.tbl_bookmark t2
+			  WHERE t2.uid = t1.uid
+				AND t2.bookmark_id <= t1.bookmark_id
+			) AS rn
+		  FROM dashboard.tbl_bookmark t1
+		)
+		UPDATE dashboard.tbl_bookmark t
+		SET sort = ranked.rn
+		FROM ranked
+		WHERE t.bookmark_id = ranked.bookmark_id
+		  AND t.sort IS NULL;";
+
+	if (!$db->db_query($qry))
+		echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo '<br>Tabelle dashboard.tbl_bookmark: Spalte sort mit vorläufiger Sortierung befüllt';
+}
\ No newline at end of file

From 9c79d728e8a7983b9844353b6d55c0db5e3b4278 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 29 Oct 2025 11:52:46 +0100
Subject: [PATCH 005/189] import component primevue.chips

---
 application/views/CisRouterView/CisRouterView.php |  3 ++-
 public/js/components/DashboardWidget/Url.js       | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index ab22fbb81..4a0e02620 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -22,7 +22,7 @@ $includesArray = array(
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
 		'public/css/Cis4/Cms.css',
-		'public/css/Cis4/Studium.css',
+		'public/css/Cis4/Studium.css'
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
@@ -30,6 +30,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/npm-asset/primevue/chips/chips.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index e07e55b18..6409650b3 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -17,7 +17,9 @@ export default {
 	components:{
 		CoreForm,
 		FormInput,
-		BsModal
+		BsModal,
+		PvChips: primevue.chips,
+		PvAutoComplete: primevue.autocomplete
 	},
 	data: () => ({
 		bookmark_id: null,
@@ -218,12 +220,14 @@ export default {
 		// 
 		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
 	},
+
+
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
         	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
-
-
+        	
+			<PvChips></PvChips>
             <template v-if="shared">
 
                 <template v-if="!emptyBookmarks">

From 707d00b2805b9938074be7fffe8c5797924e1992 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 31 Oct 2025 13:53:16 +0100
Subject: [PATCH 006/189] add functionality insert, update and delete Tags of
 Bookmarks

---
 .../controllers/api/frontend/v1/Bookmark.php  |  31 +++-
 .../models/dashboard/Bookmark_model.php       |  17 ++-
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/js/api/factory/widget/bookmark.js      |  12 +-
 public/js/components/DashboardWidget/Url.js   | 143 ++++++++++++++++--
 ...57_dashboard_bookmark_neue_Spalte_sort.php |  18 +++
 6 files changed, 202 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index f925e9662..e152907b3 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -29,10 +29,11 @@ class Bookmark extends FHCAPI_Controller
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
             'delete' => self::PERM_LOGGED,
-            'insert' => self::PERM_LOGGED,
+			'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
 			'changeOrder' => self::PERM_LOGGED,
-        ]);
+			'getAllBookmarkTags' => self::PERM_LOGGED,
+		]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
 
@@ -100,6 +101,9 @@ class Bookmark extends FHCAPI_Controller
         $url = $this->input->post('url',true);
         $title = $this->input->post('title',true);
         $tag = $this->input->post('tag', true);
+		if (is_array($tag)) {
+			$tag = json_encode($tag); // convert PHP array to JSON string
+		}
 		$sort = $this->input->post('sort', true);
 
         $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL, 'sort'=>$sort,]);
@@ -125,11 +129,15 @@ class Bookmark extends FHCAPI_Controller
 
         $url = $this->input->post('url',true);
         $title = $this->input->post('title',true);
+		$tag = $this->input->post('tag', true);
+		if (is_array($tag)) {
+			$tag = json_encode($tag);
+		}
 
 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');
 
-        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);
+        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title, 'tag'=>$tag, 'updateamum'=>$now]);
 
         $update_result = $this->getDataOrTerminateWithError($update_result);
 
@@ -159,9 +167,22 @@ class Bookmark extends FHCAPI_Controller
 		$update_result2 = $this->BookmarkModel->update($bookmark_id2,['sort'=>$sort1,]);
         $update_result[] = $this->getDataOrTerminateWithError($update_result2);
 
-
-
         $this->terminateWithSuccess($update_result);
     }
+
+	/**
+	 * get all the bookmark tags associated to a user
+	 * @access public
+	 * @return void
+	 */
+	public function getAllBookmarkTags()
+	{
+		$this->BookmarkModel->addOrder("sort");
+		$result = $this->BookmarkModel->getAllBookmarkTags($this->uid);
+
+		$bookmarks = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($bookmarks));
+	}
 }
 
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
index 5efacc26b..8c70faf04 100644
--- a/application/models/dashboard/Bookmark_model.php
+++ b/application/models/dashboard/Bookmark_model.php
@@ -12,7 +12,20 @@ class Bookmark_model extends DB_Model
 		$this->pk = 'bookmark_id';
 	}
 
+	/**
+	 * returns all bookmark tags of a user
+	 */
+	public function getAllBookmarkTags($uid)
+	{
+		$qry = "
+			SELECT array_agg(DISTINCT tag) AS data
+			FROM (
+			  SELECT jsonb_array_elements_text(tag) AS tag
+			  FROM dashboard.tbl_bookmark
+			  WHERE uid = ?
+			) t;
+		";
 
-	
-
+		return $this->execQuery($qry, array('uid' => $uid));
+	}
 }
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 4a0e02620..badb2eda2 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -31,6 +31,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
 		'vendor/npm-asset/primevue/chips/chips.min.js',
+		'vendor/npm-asset/primevue/multiselect/multiselect.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index 76c38cea7..d9e8c2a2a 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -28,11 +28,11 @@ export default {
 			url: `/api/frontend/v1/Bookmark/delete/${bookmark_id}`
 		};
 	},
-	update({ bookmark_id, url, title, tag=null }) {
+	update({ bookmark_id, url, title, tag }) {
 		return {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/update/${bookmark_id}`,
-			params: { url, title }
+			params: { url, title, tag }
 		};
 	},
 	insert({ url, title, tag, sort }) {
@@ -47,5 +47,11 @@ export default {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/changeOrder/${bookmark_id1}/${bookmark_id2}`,
 		};
-	}
+	},
+	getAllBookmarkTags() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Bookmark/getAllBookmarkTags'
+		};
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 6409650b3..b5158e3c0 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -19,7 +19,7 @@ export default {
 		FormInput,
 		BsModal,
 		PvChips: primevue.chips,
-		PvAutoComplete: primevue.autocomplete
+		PvMultiSelect: primevue.multiselect
 	},
 	data: () => ({
 		bookmark_id: null,
@@ -30,8 +30,11 @@ export default {
 			invalidURL: false,
 			invalidTitel: false,
 		},
+		tagsArray: [
+		],
+		selectedTags: [],
+		newTag: null,
 	}),
-
 	computed: {
 		tagName() {
 			return this.config.tag !== undefined && this.config.tag.length > 0
@@ -63,6 +66,9 @@ export default {
 			else
 				return Math.min(...this.shared.map(b => b.sort));
 		},
+		tagsInput(){
+			return this.selectedTags.map(item => item.tag);
+		},
 
 	},
 	methods: {
@@ -71,7 +77,8 @@ export default {
 		},
 		clearInputs(){
 			this.title_input = "";
-			this.url_input = "";	
+			this.url_input = "";
+			this.selectedTags = [];
 		},
 		openCreateModal() {
 			this.$refs.createModal.show()
@@ -80,23 +87,27 @@ export default {
 			this.title_input = bookmark.title;
 			this.url_input = bookmark.url;
 			this.bookmark_id = bookmark.bookmark_id;
-			this.$refs.editModal.show()
+			this.selectedTags = this.prepareTag(bookmark.tag);
+
+			this.$refs.editModal.show();
 		},
 		editBookmark(event){
 			event.preventDefault();
 			if(!this.bookmark_id || !this.url_input || !this.title_input) return;
-			
+
 			this.$api
 				.call(ApiBookmark.update({
 					bookmark_id: this.bookmark_id,
 					title: this.title_input,
 					url: this.url_input,
+					tag: this.tagsInput,
 				}))
 				.then((res) => res.data)
 				.then((result) => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated"));
 					// refetch the bookmarks to see the updates
 					this.fetchBookmarks();
+					this.getAllBookmarkTags();
 					// reset the values for the title and url inputs
 					this.clearInputs();
 					this.$refs.editModal.hide();
@@ -121,7 +132,8 @@ export default {
 
 			this.$api
 				.call(ApiBookmark.insert({
-					tag: this.config.tag,
+					//tag: this.config.tag,
+					tag: this.tagsInput,
 					title: this.title_input,
 					url: this.url_input,
 					sort: this.sort
@@ -131,6 +143,7 @@ export default {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
 					// refetch the bookmarks to see the updates
 					this.fetchBookmarks();
+					this.getAllBookmarkTags();
 					this.$refs.createModal.hide();
 					// reset the values for the title and url inputs
 					this.clearInputs();
@@ -202,6 +215,15 @@ export default {
 			}
 			this.changeOrder(current.bookmark_id, next.bookmark_id);
 		},
+		addNewTag(){
+			if(this.newTag != null && this.newTag.length) {
+				this.tagsArray.push({tag: this.newTag, code: this.newTag});
+				this.selectedTags.push({tag: this.newTag, code: this.newTag});
+				this.newTag = null;
+			}
+			else
+				this.$fhcAlert.alertError("Eingabe eines Zeichens erforderlich!");
+		},
 		changeOrder(bookmark_id_1, bookmark_id_2){
 			this.$api
 				.call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2))
@@ -211,10 +233,46 @@ export default {
 					this.fetchBookmarks();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		hasTags(link) {
+			if (!link || !link.tag) return false;
+
+			let tags = link.tag;
+			if (typeof tags === 'string') {
+				try {
+					tags = JSON.parse(tags)
+				} catch {
+					return false;
+				}
+			}
+			return Array.isArray(tags) && tags.length > 0;
+		},
+		prepareTag(bookmarkArr){
+			// parse if string
+			const parsedArr = Array.isArray(bookmarkArr)
+				? bookmarkArr
+				: JSON.parse(bookmarkArr);
+
+			const result = parsedArr.map(tag => ({
+				tag,
+				code: tag
+			}));
+
+			return result;
+		},
+		getAllBookmarkTags(){
+			this.$api
+				.call(ApiBookmark.getAllBookmarkTags())
+				.then((res) => res.data)
+				.then((result) => {
+					this.tagsArray = this.prepareTag(result.data);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	async mounted() {
 		await this.fetchBookmarks();
+		this.getAllBookmarkTags();
 	},
 	created() {
 		// 
@@ -224,17 +282,24 @@ export default {
 
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
+    
+
         <div class="d-flex flex-column justify-content-between">
         	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
-        	
-			<PvChips></PvChips>
-            <template v-if="shared">
 
+            <template v-if="shared">
                 <template v-if="!emptyBookmarks">
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
-						<a target="_blank" :href="link.url">
+						<a target="_blank" :href="link.url" class="me-1">
 							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}
 						</a>
+						<span
+							v-if="hasTags(link)"
+							 :title="link.tag"
+							 style="color: silver;"
+							>
+								<i class="fa fa-solid fa-tag text-gray-500" aria-hidden="true"></i>
+							</span>
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
@@ -292,8 +357,36 @@ export default {
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
 			</template>
 			<template #default>
+
 				<form-input  :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
 				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
+
+				<label class="mt-2">Tags</label>
+				<div class="mt-2 row">
+					<div class="col-6">
+					  <form-input
+						v-model="newTag"
+						placeholder="Add new tag"
+						@keyup.enter="addNewTag"
+						class="w-full"
+					  />
+					</div>
+					<div class="col-2">
+				  		<button class="btn btn-secondary" @click="addNewTag">+</button>
+				  	</div>
+				</div>
+				<div class="mt-2">
+					<PvMultiSelect
+						v-model="selectedTags"
+						id="tagUrl"
+						:options="tagsArray"
+						optionLabel="tag"
+						display="chip"
+						placeholder="Selected Tags for URL"
+						:maxSelectedLabels="3"
+						class="w-full md:w-20rem mt-1"
+						/>
+				</div>
 			</template>
 			<template #footer>
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
@@ -307,8 +400,37 @@ export default {
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
 			</template>
 			<template #default>
+
 				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
 				<form-input label="Url" title="Url" id="insertUrl" v-model="url_input" name="url"></form-input>
+
+				<label class="mt-2">Tags</label>
+				<div class="mt-2 row">
+					<div class="col-6">
+					  <form-input
+						v-model="newTag"
+						placeholder="Add new tag"
+						@keyup.enter="addNewTag"
+						class="w-full"
+					  />
+					</div>
+					<div class="col-2">
+				  		<button class="btn btn-secondary" @click="addNewTag">+</button>
+				  	</div>
+				</div>
+				<div class="mt-2">
+					<PvMultiSelect 
+						v-model="selectedTags"
+						id="tagUrl"
+						:options="tagsArray"
+						optionLabel="tag"
+						display="chip"
+						placeholder="Selected Tags for URL"
+						:maxSelectedLabels="3"
+						class="w-full md:w-20rem mt-1"
+						/>
+				</div>
+
 			</template>
 			<template #footer>
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
@@ -318,6 +440,7 @@ export default {
 	`,
 };
 
+
 /*
 Link JSON structure:
 { 
diff --git a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
index 384e49832..c19299048 100644
--- a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
+++ b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
@@ -38,4 +38,22 @@ if(@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
 		echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
 	else
 		echo '<br>Tabelle dashboard.tbl_bookmark: Spalte sort mit vorläufiger Sortierung befüllt';
+}
+
+//set column tag to type JSONB
+if($result = @$db->db_query("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='dashboard'
+								AND TABLE_NAME='tbl_bookmark' AND COLUMN_NAME = 'tag'
+								AND DATA_TYPE='character varying' AND character_maximum_length='255';"))
+{
+	$qry = "
+		ALTER TABLE dashboard.tbl_bookmark
+		ALTER COLUMN tag TYPE jsonb
+		USING tag::jsonb;
+			  ";
+
+	if (!$db->db_query($qry))
+		echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo '<br>Tabelle dashboard.tbl_bookmark: Spalte tag auf Typ JSONB geändert';
+
 }
\ No newline at end of file

From df63b8c1b78293bf636850f56fae61970fa9d443 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 5 Nov 2025 11:09:16 +0100
Subject: [PATCH 007/189] use PvAutocomplete instead Chips, start FilterTags

---
 application/controllers/dashboard/Config.php  |  65 ++++-
 .../dashboard/Dashboard_Override_model.php    |  54 ++++
 public/js/api/factory/widget/bookmark.js      |   8 +
 public/js/components/Dashboard/Item.js        |   3 +-
 .../js/components/DashboardWidget/Abstract.js |   5 +-
 public/js/components/DashboardWidget/Url.js   | 275 ++++++++++++++----
 6 files changed, 336 insertions(+), 74 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index f6db9509f..46b15058a 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -11,16 +11,18 @@ class Config extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index'							=> 'dashboard/benutzer:r',
-				'dummy'							=> 'dashboard/benutzer:r',
-				'genWidgetId'					=> 'dashboard/benutzer:rw',
-				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
-				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
-				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
-				'funktionen'					=> 'dashboard/admin:r',
-				'preset'						=> 'dashboard/admin:r',
-				'presetBatch'					=> 'dashboard/admin:r'
+				'index'									=> 'dashboard/benutzer:r',
+				'dummy'									=> 'dashboard/benutzer:r',
+				'genWidgetId'							=> 'dashboard/benutzer:rw',
+				'addWidgetsToPreset'					=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'				=> 'dashboard/admin:rw',
+				'addWidgetsToUserOverride'				=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'			=> 'dashboard/benutzer:rw',
+				'funktionen'							=> 'dashboard/admin:r',
+				'preset'								=> 'dashboard/admin:r',
+				'presetBatch'							=> 'dashboard/admin:r',
+				'insertAndUpdateTagsForBookmarksUser'	=> 'dashboard/benutzer:rw',
+				'getTagFilter'							=> 'dashboard/benutzer:rw',
 			)
 		);
 		
@@ -213,4 +215,47 @@ class Config extends Auth_Controller
 
 		return $this->outputJsonSuccess($result);
 	}
+
+	//TODO(Manu) move to Bookmark controller
+	public function insertAndUpdateTagsForBookmarksUser()
+	{
+		$widgetId = $this->input->get('widget_id');
+		$funktion_kurzbz = $this->input->get('funktion_kurzbz');
+		$uid = $this->AuthLib->getAuthObj()->username;
+		$tags =  $this->input->get('tags');
+
+		$this->load->model('dashboard/Dashboard_Override_model', 'Dashboard_OverrideModel');
+
+		$result = $this->Dashboard_OverrideModel->addTagFilter($widgetId, $uid, $funktion_kurzbz, $tags);
+
+		$this->outputJsonSuccess($result ?: []);
+	}
+
+	//TODO(Manu) move to Bookmark controller
+	public function getTagFilter()
+	{
+		$widgetId = $this->input->get('widget_id');
+		$funktion_kurzbz = $this->input->get('funktion_kurzbz');
+		$uid = $this->AuthLib->getAuthObj()->username;
+		//$dashboard_kurzbz = 1;
+
+
+		$this->load->model('dashboard/Dashboard_Override_model', 'Dashboard_OverrideModel');
+
+/*		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override)) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+		}
+
+		$override_decoded = json_decode($override->override, true);
+
+		return $this->outputJsonSuccess($override_decoded ?: []);*/
+
+		$result = $this->Dashboard_OverrideModel->getTagFilter($widgetId, $uid, $funktion_kurzbz);
+
+		$this->outputJsonSuccess($result ?: []);
+
+
+	}
 }
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
index d7a12bb42..f82878109 100644
--- a/application/models/dashboard/Dashboard_Override_model.php
+++ b/application/models/dashboard/Dashboard_Override_model.php
@@ -23,4 +23,58 @@ class Dashboard_Override_model extends DB_Model
 	{
 		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'uid'=> $uid));
 	}
+
+	/**
+	 * Get Overrides of given uid and funktion_kurzbz and widget_id
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	//TODO(MANU) move to bookmark model
+	public function getTagFilter($widgetId, $uid, $funktion_kurzbz)
+	{
+	//	$qry = "SELECT override -> ? -> 'widgets' -> ? -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = ?";
+
+	//	$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
+
+		//unter config
+		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'config' -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
+/*		$qry = <<<SQL
+			SELECT
+			  override -> ?
+					   -> 'widgets'
+					   -> ?
+					   -> 'tags' AS tags
+			FROM dashboard.tbl_dashboard_benutzer_override
+			WHERE uid = ?
+			SQL;*/
+
+		//return $qry;
+
+		return $this->execQuery($qry);
+	//	return $this->execQuery($qry, array($funktion_kurzbz, $widgetId, $uid));
+	}
+
+	//TODO(MANU) move to bookmark model
+	public function addTagFilter($widgetId, $uid, $funktion_kurzbz, $tags)
+	{
+		if (is_array($tags)) {
+			$tags = json_encode($tags); // convert PHP array to JSON string
+		}
+		$params = [$funktion_kurzbz, $widgetId, $tags, $uid];
+
+		$qry = "
+				UPDATE dashboard.tbl_dashboard_benutzer_override
+				SET override = jsonb_set(
+					COALESCE(override, '{}'::jsonb),
+					format('{%s,widgets,%s,config,tags}',? , ?)::text[],
+					?::jsonb,
+					true
+				)
+				WHERE uid = ?
+			";
+	//	return $qry;
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index d9e8c2a2a..e7bd99c69 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -54,4 +54,12 @@ export default {
 			url: '/api/frontend/v1/Bookmark/getAllBookmarkTags'
 		};
 	},
+	//TODO(Manu) getTagFilter and addTagFilter
+	//in bookmark_model
+/*	updateBenutzeroverride() {
+		return{
+			method: 'post',
+			url: `/api/frontend/v1/Bookmark/update/${bookmark_id}`,
+			params: {url, title, tag}
+}*/
 };
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index d2ad4ae75..805682bd4 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -189,8 +189,9 @@ export default {
 				</div>
 			</Transition>
 		</div>
+		<!-- TODO Manu rename/remove-->
 		<div v-if="ready" class="card-body overflow-hidden p-0">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" :widget-id="widgetID" :manu2="widgetID" :widgetConfig="config" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index e9f87490d..a35c72eff 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -5,7 +5,10 @@ export default {
 		"height",
 		"configMode",
 		"sharedData",
-		"widgetInfo"
+		"widgetInfo",
+		"widgetId", //check
+		"manu2", //TODO(Manu) check/remove
+		"widgetConfig"
 	],
 	emits: [
 		"setConfig",
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b5158e3c0..82ef01e61 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -4,6 +4,7 @@ import BsModal from "../Bootstrap/Modal.js";
 import AbstractWidget from './Abstract.js';
 
 import ApiBookmark from '../../api/factory/widget/bookmark.js';
+import ApiDashboard from '../../api/factory/cis/dashboard.js'; //nutzt aber nicht viel
 
 export default {
 	name: "WidgetsUrl",
@@ -12,6 +13,10 @@ export default {
 		editModeIsActive: {
 			type: Boolean,
 			default: false
+		},
+		sectionName: {
+			type: String,
+			default: false
 		}
 	},
 	components:{
@@ -19,7 +24,8 @@ export default {
 		FormInput,
 		BsModal,
 		PvChips: primevue.chips,
-		PvMultiSelect: primevue.multiselect
+		PvMultiSelect: primevue.multiselect,
+		PvAutoComplete: primevue.autocomplete,
 	},
 	data: () => ({
 		bookmark_id: null,
@@ -30,10 +36,17 @@ export default {
 			invalidURL: false,
 			invalidTitel: false,
 		},
-		tagsArray: [
-		],
+		tagsArray: [],
 		selectedTags: [],
 		newTag: null,
+		selectedFilters: [], //die aber im benutzer_override speichern
+		items:[],
+		value: '',
+		//viewData: []
+		ArrayAC: [],
+		selectedTagsAC: [],
+		tagsInput2: [],
+		filteredArrayAC: [],
 	}),
 	computed: {
 		tagName() {
@@ -69,7 +82,9 @@ export default {
 		tagsInput(){
 			return this.selectedTags.map(item => item.tag);
 		},
-
+		filterInput(){
+			return this.selectedFilters.map(item => item.tag);
+		},
 	},
 	methods: {
 		stopDrag(event){
@@ -87,7 +102,9 @@ export default {
 			this.title_input = bookmark.title;
 			this.url_input = bookmark.url;
 			this.bookmark_id = bookmark.bookmark_id;
-			this.selectedTags = this.prepareTag(bookmark.tag);
+			//but the JSON string to array
+			this.selectedTagsAC = JSON.parse(bookmark.tag);
+		//	this.selectedTags = this.prepareTag(bookmark.tag);
 
 			this.$refs.editModal.show();
 		},
@@ -100,7 +117,8 @@ export default {
 					bookmark_id: this.bookmark_id,
 					title: this.title_input,
 					url: this.url_input,
-					tag: this.tagsInput,
+					tag: this.selectedTagsAC,
+					//tag: this.tagsInput, //old version
 				}))
 				.then((res) => res.data)
 				.then((result) => {
@@ -133,7 +151,8 @@ export default {
 			this.$api
 				.call(ApiBookmark.insert({
 					//tag: this.config.tag,
-					tag: this.tagsInput,
+					//tag: this.tagsInput, //old version
+					tag: this.selectedTagsAC,
 					title: this.title_input,
 					url: this.url_input,
 					sort: this.sort
@@ -186,6 +205,7 @@ export default {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
 					// refetch the bookmarks to see the updates
 					this.fetchBookmarks();
+					this.getAllBookmarkTags();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -265,27 +285,190 @@ export default {
 				.call(ApiBookmark.getAllBookmarkTags())
 				.then((res) => res.data)
 				.then((result) => {
+					//Variante Chips
 					this.tagsArray = this.prepareTag(result.data);
+
+					//Variante Autocomplete
+/*
+					this.ArrayAC = result.data;
+						console.log("type of " + typeof this.ArrayAC);
+						console.log(Array.isArray(this.ArrayAC));*/
+				//	this.ArrayAC = Object.values(result.data);
+				//	this.ArrayAC = Object.keys(result.data);
+						this.ArrayAC = result.data; //in object umwandeln
+/*					this.ArrayAC = {...this.ArrayAC};
+
+					console.log("type of " + typeof this.ArrayAC);
+					console.log(Array.isArray(this.ArrayAC)); // true*/
+/*					Array.isArray(result.data)
+						? result.data
+						: JSON.parse(result.data); */
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-		}
+		},
+		addBookmarkFilter(){
+			console.log("in addFilterLogic: save in benutzeroverride " +  this.selectedFilters.map(tag => tag.tag).join(", "));
+
+			console.log("widget_id " + this.manu2);
+			console.log("tags " + this.filterInput);
+
+			console.log(`${this.apiurl}/dashboard/Config/insertAndUpdateTagsForBookmarksUser`, {
+				db: "CIS",
+				funktion_kurzbz: this.sectionName,
+				widget_id: this.manu2,
+				tags: this.filterInput
+			});
+
+			axios.post(this.apiurl + '/dashboard/Config/insertAndUpdateTagsForBookmarksUser', {
+				db: "CIS",
+				funktion_kurzbz: this.sectionName,
+				widget_id: this.manu2,
+				tags: this.filterInput
+			})
+				.then(res => {
+					console.log("API Response:", res.data);
+				})
+				.catch(err => {
+					console.error("ERROR:", err);
+				});
+		},
+		getTagFilter(widget_id){
+
+/*			console.log(`${this.apiurl}/dashboard/Config/getTagFilter`, {
+				db: "CIS",
+				funktion_kurzbz: this.sectionName,
+				widget_id: widget_id
+			});*/
+
+			axios.get(this.apiurl + '/dashboard/Config/getTagFilter', {
+				params: {
+					db: "CIS",
+					funktion_kurzbz: this.sectionName,
+					widget_id: widget_id
+				}
+			})
+				.then(res => {
+				//	console.log("API Response:", res.data);
+
+					//old version
+/*					const raw = res.data?.retval?.retval?.[0]?.tags;
+					const filterArray = raw ? JSON.parse(raw) : [];
+					this.selectedFilters = this.prepareTag(filterArray);*/
+
+
+					//unter config
+					const rawTags = res.data.retval.retval[0].tags; // string
+					const filterArray = JSON.parse(rawTags);
+					//this.selectedFilters = res.data.retval;
+					this.selectedFilters = this.prepareTag(filterArray);
+				})
+				.catch(err =>
+					console.error('ERROR: ', err));
+		},
+		//Variante mit AutocompleteFeld
+/*		search(event) {
+			this.ArrayAC = this.ArrayAC.map((item) => item) || event;
+		},*/
+		search(event) {
+			const query = event.query ?? ""; // PrimeVue liefert query
+
+			// Filter ArrayAC nach eingegebenem Text
+			this.filteredArrayAC = this.ArrayAC.filter(item =>
+				item.toLowerCase().includes(query.toLowerCase())
+			);
+
+			// Wenn kein Treffer → manuellen Text erlauben
+			if (this.filteredArrayAC.length === 0 && query) {
+				this.filteredArrayAC = [query];
+			}
+
+			console.log("Filtered suggestions:", this.filteredArrayAC);
+
+		},
+/*		addCustomTag(event) {
+			const value = event.value;  // das ist der vom User eingegebene Text
+			console.log("Custom Tag:", value);
+
+			// Füge den neuen Tag zu selectedTags hinzu
+		//	this.selectedTags = [...this.selectedTags, value];
+			const newTag = { tag: value };
+
+			// Optional: Füge den Tag auch in ArrayAC hinzu, damit er zukünftig auswählbar ist
+			if (!this.tagsArray.includes(value)) {
+				this.tagsArray.push(value);
+			}
+
+
+
+		}*/
 	},
 	async mounted() {
 		await this.fetchBookmarks();
 		this.getAllBookmarkTags();
+		if(this.manu2) {
+			this.getTagFilter(this.manu2);
+		}
+/*		console.log("config " + this.config);
+		console.log("widgetID " + this.widgetId);*/
+	//	console.log("apiurl " + this.apiurl );
+/*		console.log("widgetinfo " + this.widgetInfo);
+		console.log("config " + this.config);
+		console.log(JSON.stringify(this.config));
+		console.log("width " + this.width);
+		console.log("height " + this.height);
+		console.log("configMode " + this.configMode);
+		console.log("sharedData " + this.sharedData);
+		console.log(JSON.stringify(this.sharedData));*/
+
+		//console.log( this.config.map(tag => tag.tag).join(", "));
+/*		console.log("manu " + this.manu);
+		console.log("manu2 " + this.manu2);
+		console.log("widgetID " + this.widgetID);*/
 	},
 	created() {
 		// 
-		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
+		// this.$emit('setConfig', true); // -> use this to enable widget config mode if needed
+
+		/*
+
+		widgetId: {{widgetId}}
+		    	{{manu2}} {{sectionName}}
+		 */
 	},
 
 
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
-    
 
-        <div class="d-flex flex-column justify-content-between">
-        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+
+		<div class="d-flex flex-column justify-content-between">
+        
+        <!--TODO Manu eigener button mit modal für Filter, Autocomplete Variante !-->
+			<!-- div class="mt-2 row">
+				<div class="col-10">
+					<PvMultiSelect
+						v-model="selectedFilters"
+						id="tagFilterUrl"
+						:options="tagsArray"
+						optionLabel="tag"
+						display="chip"
+						placeholder="Show only tags"
+						:maxSelectedLabels="3"
+						class="p-inputtext-sm w-100 me-2"
+						/>
+				</div>
+				<div class="col-1">
+					<button
+						class="btn btn-secondary"
+						@click="addBookmarkFilter"
+						title="nach Tags filtern"
+						>
+						<i class="fa-solid fa-filter"></i>
+					</button>
+				</div>
+			</div -->
+		</div>
+		<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
             <template v-if="shared">
                 <template v-if="!emptyBookmarks">
@@ -341,15 +524,15 @@ export default {
                     <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
                 </div>
 
-            </template>
 
             <template v-else>
                 <p v-for="i in 4" class="placeholder-glow">
                     <span class="placeholder" :class="{'col-9' : true}"></span>
                 </p>
             </template>
-        </div>
-    </div>
+            
+         </template>
+	</div>
 	<!--EDIT MODAL-->
 	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
@@ -362,31 +545,15 @@ export default {
 				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
 
 				<label class="mt-2">Tags</label>
-				<div class="mt-2 row">
-					<div class="col-6">
-					  <form-input
-						v-model="newTag"
-						placeholder="Add new tag"
-						@keyup.enter="addNewTag"
-						class="w-full"
-					  />
-					</div>
-					<div class="col-2">
-				  		<button class="btn btn-secondary" @click="addNewTag">+</button>
-				  	</div>
-				</div>
 				<div class="mt-2">
-					<PvMultiSelect
-						v-model="selectedTags"
-						id="tagUrl"
-						:options="tagsArray"
-						optionLabel="tag"
-						display="chip"
-						placeholder="Selected Tags for URL"
-						:maxSelectedLabels="3"
-						class="w-full md:w-20rem mt-1"
+					<PvAutoComplete
+						v-model="selectedTagsAC"
+						multiple
+						dropdown
+						:suggestions="filteredArrayAC"
+						@complete="search" 
 						/>
-				</div>
+				</div>				
 			</template>
 			<template #footer>
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
@@ -405,31 +572,15 @@ export default {
 				<form-input label="Url" title="Url" id="insertUrl" v-model="url_input" name="url"></form-input>
 
 				<label class="mt-2">Tags</label>
-				<div class="mt-2 row">
-					<div class="col-6">
-					  <form-input
-						v-model="newTag"
-						placeholder="Add new tag"
-						@keyup.enter="addNewTag"
-						class="w-full"
-					  />
-					</div>
-					<div class="col-2">
-				  		<button class="btn btn-secondary" @click="addNewTag">+</button>
-				  	</div>
-				</div>
 				<div class="mt-2">
-					<PvMultiSelect 
-						v-model="selectedTags"
-						id="tagUrl"
-						:options="tagsArray"
-						optionLabel="tag"
-						display="chip"
-						placeholder="Selected Tags for URL"
-						:maxSelectedLabels="3"
-						class="w-full md:w-20rem mt-1"
-						/>
-				</div>
+					<PvAutoComplete
+						v-model="selectedTagsAC"
+						multiple
+						dropdown
+						:suggestions="filteredArrayAC"
+						@complete="search" 
+					/>
+				</div>					
 
 			</template>
 			<template #footer>

From a26bdfe38585a26b99924194d205c60825762167 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Nov 2025 09:19:35 +0100
Subject: [PATCH 008/189] add filter function for Tags, refactoring and
 restyling, add phrases and dbupdate

---
 .../controllers/api/frontend/v1/Bookmark.php  | 139 +++++++
 application/controllers/dashboard/Config.php  |  43 --
 .../models/dashboard/Bookmark_model.php       |  63 +++
 .../dashboard/Dashboard_Override_model.php    |  54 ---
 public/js/api/factory/widget/bookmark.js      |  32 +-
 public/js/components/Dashboard/Item.js        |   2 +-
 .../js/components/DashboardWidget/Abstract.js |   5 +-
 public/js/components/DashboardWidget/Url.js   | 377 ++++++++----------
 ...57_dashboard_bookmark_neue_Spalte_sort.php |  18 +-
 system/phrasesupdate.php                      | 201 ++++++++++
 10 files changed, 616 insertions(+), 318 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index e152907b3..4482159db 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -33,6 +33,10 @@ class Bookmark extends FHCAPI_Controller
 			'update' => self::PERM_LOGGED,
 			'changeOrder' => self::PERM_LOGGED,
 			'getAllBookmarkTags' => self::PERM_LOGGED,
+			'getTagFilter' => self::PERM_LOGGED,
+			'addAndUpdateTagFilter' => self::PERM_LOGGED,
+			'isInOverride' => self::PERM_LOGGED,
+			'addWidgetToOverride' => self::PERM_LOGGED,
 		]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
@@ -184,5 +188,140 @@ class Bookmark extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(current($bookmarks));
 	}
+
+	/**
+	 * get all tagFilter of a certain bookmark widget
+	 * @access public
+	 * @return void
+	 */
+	public function getTagFilter($widgetId, $sectionName)
+	{
+		$result = $this->BookmarkModel->getTagFilter($widgetId, $this->uid, $sectionName);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+	/**
+	 * get all tagFilter of a certain bookmark widget
+	 * @access public
+	 * @return void
+	 */
+	public function addAndUpdateTagFilter($widgetId, $sectionName)
+	{
+		$tags = $this->input->post('tags',true);
+		if (is_array($tags))
+		{
+			$tags = json_encode($tags);
+		}
+		$result = $this->BookmarkModel->addAndUpdateTagFilter($widgetId, $this->uid, $sectionName, $tags);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * checks if a widget has already an entry in the benutzeroverride
+	 * @access public
+	 * @return void
+	 */
+	public function isInOverride($widgetId, $sectionName)
+	{
+		$result = $this->BookmarkModel->checkOrAddToOverride($widgetId, $this->uid, $sectionName);
+
+		$data = getData($result);
+		if(!$data)
+			$this->terminateWithSuccess([false, 0]);
+
+		$id = current($data)->widgetid;
+		$id = trim($id, '"');
+
+		if ($id != $widgetId)
+			$this->terminateWithSuccess([false, 1]);
+		else
+			$this->terminateWithSuccess([true, null]);
+	}
+	/**
+	 * adds widget benutzeroverride
+	 * @access public
+	 * @return void
+	 */
+	public function addWidgetToOverride($widgetId, $sectionName, $mode, $x, $y, $h, $w)
+	{
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$dashboard_kurzbz = "CIS";
+		$structure = [
+			"custom" => [
+				"widgets" => []
+			],
+			"general" => [
+				"widgets" => [
+					$widgetId => [
+						"widget" => 3,
+						"config" => new stdClass(),
+						"place" => [
+							"3" => [
+								"x" => $x,
+								"y" => $y,
+								"w" => $w,
+								"h" => $h
+							]
+						],
+						"widgetid" => $widgetId,
+						"custom" => 1,
+						"id" => "insertByBookmarkwidget"
+					]
+				]
+			]
+		];
+		$jsonOverrideNew = json_encode($structure, JSON_UNESCAPED_UNICODE);
+
+		//no existing benutzeroverride
+		if($mode == 0)
+		{
+			$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $this->uid);
+
+			$override->override = $jsonOverrideNew;
+
+			$result = $this->DashboardLib->insertOrUpdateOverride($override);
+
+			$this->terminateWithSuccess($result);
+
+		}
+		//benutzeroverride existing, but widget not included
+		elseif($mode == 1)
+		{
+			$overrideExisting = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $this->uid);
+			$override = json_decode($overrideExisting->override, true); // decode as Array
+
+			$newWidget = [
+				"widget" => 3,
+				"config" => new stdClass(),
+				"place" => [
+					"3" => [
+						"x" => $x,
+						"y" => $y,
+						"w" => $w,
+						"h" => $h
+					]
+				],
+				"widgetid" => $widgetId,
+				"custom" => 1,
+				"id" => "insertByBookmarkwidget"
+			];
+
+			$override['general']['widgets'][$widgetId] = $newWidget;
+
+			$jsonOverrideUpdated = json_encode($override, JSON_UNESCAPED_UNICODE);
+			$overrideExisting->override = $jsonOverrideUpdated;
+
+			$result = $this->DashboardLib->insertOrUpdateOverride($overrideExisting);
+
+			$this->terminateWithSuccess($result);
+		}
+		else
+			$this->terminateWithError("Error: no known mode");
+	}
+
 }
 
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 46b15058a..dcd759d4c 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -215,47 +215,4 @@ class Config extends Auth_Controller
 
 		return $this->outputJsonSuccess($result);
 	}
-
-	//TODO(Manu) move to Bookmark controller
-	public function insertAndUpdateTagsForBookmarksUser()
-	{
-		$widgetId = $this->input->get('widget_id');
-		$funktion_kurzbz = $this->input->get('funktion_kurzbz');
-		$uid = $this->AuthLib->getAuthObj()->username;
-		$tags =  $this->input->get('tags');
-
-		$this->load->model('dashboard/Dashboard_Override_model', 'Dashboard_OverrideModel');
-
-		$result = $this->Dashboard_OverrideModel->addTagFilter($widgetId, $uid, $funktion_kurzbz, $tags);
-
-		$this->outputJsonSuccess($result ?: []);
-	}
-
-	//TODO(Manu) move to Bookmark controller
-	public function getTagFilter()
-	{
-		$widgetId = $this->input->get('widget_id');
-		$funktion_kurzbz = $this->input->get('funktion_kurzbz');
-		$uid = $this->AuthLib->getAuthObj()->username;
-		//$dashboard_kurzbz = 1;
-
-
-		$this->load->model('dashboard/Dashboard_Override_model', 'Dashboard_OverrideModel');
-
-/*		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
-		if (empty($override)) {
-			http_response_code(404);
-			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
-		}
-
-		$override_decoded = json_decode($override->override, true);
-
-		return $this->outputJsonSuccess($override_decoded ?: []);*/
-
-		$result = $this->Dashboard_OverrideModel->getTagFilter($widgetId, $uid, $funktion_kurzbz);
-
-		$this->outputJsonSuccess($result ?: []);
-
-
-	}
 }
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
index 8c70faf04..931fe7064 100644
--- a/application/models/dashboard/Bookmark_model.php
+++ b/application/models/dashboard/Bookmark_model.php
@@ -28,4 +28,67 @@ class Bookmark_model extends DB_Model
 
 		return $this->execQuery($qry, array('uid' => $uid));
 	}
+
+	/**
+	 * Get Overrides of given uid and funktion_kurzbz and widget_id
+	 * @param integer $widget_id
+	 * @param string $uid
+	 * @param string $funktion_kurzbz
+	 * @return array
+	 */
+	public function getTagFilter($widgetId, $uid, $funktion_kurzbz)
+	{
+		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'config' -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
+
+		return $this->execQuery($qry);
+	}
+
+	/*
+	 * updates Tagfilter
+	 * checks and changes type of config
+	 * if config == array -> change to object
+	 */
+	public function addAndUpdateTagFilter($widgetId, $uid, $funktion_kurzbz, $tags)
+	{
+		$params = [
+			$funktion_kurzbz, $widgetId,
+			$funktion_kurzbz, $widgetId,
+			$funktion_kurzbz, $widgetId,
+			$funktion_kurzbz, $widgetId,
+			$tags,
+			$uid
+		];
+
+		$qry = "
+			UPDATE dashboard.tbl_dashboard_benutzer_override
+			SET override = jsonb_set(
+				-- check if config is object
+				jsonb_set(
+					COALESCE(override, '{}'::jsonb),
+					format('{%s,widgets,%s,config}', ?, ?)::text[],
+					CASE
+						WHEN jsonb_typeof(override #> format('{%s,widgets,%s,config}', ?, ?)::text[]) = 'array'
+						THEN '{}'::jsonb
+						ELSE COALESCE((override #> format('{%s,widgets,%s,config}', ?, ?)::text[])::jsonb, '{}'::jsonb)
+					END,
+					true
+				),
+				-- insert tags
+				format('{%s,widgets,%s,config,tags}', ?, ?)::text[],
+				?::jsonb,
+				true
+			)
+			WHERE uid = ?
+		";
+
+		return $this->execQuery($qry, $params);
+	}
+
+	public function checkOrAddToOverride($widgetId, $uid, $funktion_kurzbz)
+	{
+		$params = [$funktion_kurzbz, $widgetId, $uid];
+		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'widgetid' as widgetid FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/application/models/dashboard/Dashboard_Override_model.php b/application/models/dashboard/Dashboard_Override_model.php
index f82878109..d7a12bb42 100644
--- a/application/models/dashboard/Dashboard_Override_model.php
+++ b/application/models/dashboard/Dashboard_Override_model.php
@@ -23,58 +23,4 @@ class Dashboard_Override_model extends DB_Model
 	{
 		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'uid'=> $uid));
 	}
-
-	/**
-	 * Get Overrides of given uid and funktion_kurzbz and widget_id
-	 * @param integer dashboard_id
-	 * @param string $uid
-	 * @return array
-	 */
-	//TODO(MANU) move to bookmark model
-	public function getTagFilter($widgetId, $uid, $funktion_kurzbz)
-	{
-	//	$qry = "SELECT override -> ? -> 'widgets' -> ? -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = ?";
-
-	//	$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
-
-		//unter config
-		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'config' -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
-/*		$qry = <<<SQL
-			SELECT
-			  override -> ?
-					   -> 'widgets'
-					   -> ?
-					   -> 'tags' AS tags
-			FROM dashboard.tbl_dashboard_benutzer_override
-			WHERE uid = ?
-			SQL;*/
-
-		//return $qry;
-
-		return $this->execQuery($qry);
-	//	return $this->execQuery($qry, array($funktion_kurzbz, $widgetId, $uid));
-	}
-
-	//TODO(MANU) move to bookmark model
-	public function addTagFilter($widgetId, $uid, $funktion_kurzbz, $tags)
-	{
-		if (is_array($tags)) {
-			$tags = json_encode($tags); // convert PHP array to JSON string
-		}
-		$params = [$funktion_kurzbz, $widgetId, $tags, $uid];
-
-		$qry = "
-				UPDATE dashboard.tbl_dashboard_benutzer_override
-				SET override = jsonb_set(
-					COALESCE(override, '{}'::jsonb),
-					format('{%s,widgets,%s,config,tags}',? , ?)::text[],
-					?::jsonb,
-					true
-				)
-				WHERE uid = ?
-			";
-	//	return $qry;
-
-		return $this->execQuery($qry, $params);
-	}
 }
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index e7bd99c69..9379b42b2 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -17,6 +17,7 @@
 
 export default {
 	getBookmarks() {
+
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Bookmark/getBookmarks'
@@ -54,12 +55,29 @@ export default {
 			url: '/api/frontend/v1/Bookmark/getAllBookmarkTags'
 		};
 	},
-	//TODO(Manu) getTagFilter and addTagFilter
-	//in bookmark_model
-/*	updateBenutzeroverride() {
-		return{
+	getTagFilter(widgetId, sectionName){
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/Bookmark/getTagFilter/${widgetId}/${sectionName}`
+		};
+	},
+	addTagFilter(widgetId, sectionName, tags){
+		return {
 			method: 'post',
-			url: `/api/frontend/v1/Bookmark/update/${bookmark_id}`,
-			params: {url, title, tag}
-}*/
+			url: `/api/frontend/v1/Bookmark/addAndUpdateTagFilter/${widgetId}/${sectionName}`,
+			params: { tags }
+		};
+	},
+	isInOverride(widgetId, sectionName){
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/Bookmark/isInOverride/${widgetId}/${sectionName}`
+		};
+	},
+	addWidgetToOverride(widgetId, sectionName, mode, x, y, h, w){
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/Bookmark/addWidgetToOverride/${widgetId}/${sectionName}/${mode}/${x}/${y}/${h}/${w}`,
+		};
+	}
 };
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 805682bd4..c30ff644d 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -191,7 +191,7 @@ export default {
 		</div>
 		<!-- TODO Manu rename/remove-->
 		<div v-if="ready" class="card-body overflow-hidden p-0">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" :widget-id="widgetID" :manu2="widgetID" :widgetConfig="config" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" :widget-id="widgetID" :item_data="item_data" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index a35c72eff..0b6a1151f 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -6,9 +6,8 @@ export default {
 		"configMode",
 		"sharedData",
 		"widgetInfo",
-		"widgetId", //check
-		"manu2", //TODO(Manu) check/remove
-		"widgetConfig"
+		"widgetId",
+		"item_data"
 	],
 	emits: [
 		"setConfig",
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 82ef01e61..6e7ffeeb3 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -4,7 +4,6 @@ import BsModal from "../Bootstrap/Modal.js";
 import AbstractWidget from './Abstract.js';
 
 import ApiBookmark from '../../api/factory/widget/bookmark.js';
-import ApiDashboard from '../../api/factory/cis/dashboard.js'; //nutzt aber nicht viel
 
 export default {
 	name: "WidgetsUrl",
@@ -36,17 +35,14 @@ export default {
 			invalidURL: false,
 			invalidTitel: false,
 		},
-		tagsArray: [],
+		tagsArrayMS: [],
+		tagsArrayAC: [],
 		selectedTags: [],
 		newTag: null,
-		selectedFilters: [], //die aber im benutzer_override speichern
-		items:[],
-		value: '',
-		//viewData: []
-		ArrayAC: [],
-		selectedTagsAC: [],
-		tagsInput2: [],
-		filteredArrayAC: [],
+		selectedFilters: [],
+		filter: [],
+		filteredArray: [],
+		sharedFiltered: {},
 	}),
 	computed: {
 		tagName() {
@@ -71,16 +67,13 @@ export default {
 			if(this.shared.length == 0)
 				return 0;
 			else
-				return Math.max(...this.shared.map(b => b.sort));
+				return Math.max(...this.sharedFiltered.map(b => b.sort));
 		},
 		minSort(){
 			if(this.shared.length == 0)
 				return 0;
 			else
-				return Math.min(...this.shared.map(b => b.sort));
-		},
-		tagsInput(){
-			return this.selectedTags.map(item => item.tag);
+				return Math.min(...this.sharedFiltered.map(b => b.sort));
 		},
 		filterInput(){
 			return this.selectedFilters.map(item => item.tag);
@@ -102,9 +95,7 @@ export default {
 			this.title_input = bookmark.title;
 			this.url_input = bookmark.url;
 			this.bookmark_id = bookmark.bookmark_id;
-			//but the JSON string to array
-			this.selectedTagsAC = JSON.parse(bookmark.tag);
-		//	this.selectedTags = this.prepareTag(bookmark.tag);
+			this.selectedTags = JSON.parse(bookmark.tag);
 
 			this.$refs.editModal.show();
 		},
@@ -117,15 +108,14 @@ export default {
 					bookmark_id: this.bookmark_id,
 					title: this.title_input,
 					url: this.url_input,
-					tag: this.selectedTagsAC,
-					//tag: this.tagsInput, //old version
+					tag: this.selectedTags,
 				}))
 				.then((res) => res.data)
 				.then((result) => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated"));
 					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
 					this.getAllBookmarkTags();
+					this.fetchBookmarks();
 					// reset the values for the title and url inputs
 					this.clearInputs();
 					this.$refs.editModal.hide();
@@ -150,9 +140,7 @@ export default {
 
 			this.$api
 				.call(ApiBookmark.insert({
-					//tag: this.config.tag,
-					//tag: this.tagsInput, //old version
-					tag: this.selectedTagsAC,
+					tag: this.selectedTags,
 					title: this.title_input,
 					url: this.url_input,
 					sort: this.sort
@@ -161,15 +149,14 @@ export default {
 				.then((result) => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
 					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
 					this.getAllBookmarkTags();
+					this.fetchBookmarks();
 					this.$refs.createModal.hide();
 					// reset the values for the title and url inputs
 					this.clearInputs();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-
 		isValidationSuccessfull() {
 			// validate the input fields
 			if (this.title_input.length === 0) {
@@ -189,6 +176,10 @@ export default {
 				.then((res) => res.data)
 				.then((result) => {
 					this.shared = result;
+
+					this.$nextTick(() => {
+						this.sharedFiltered = this.filterBookmarksByTags(this.shared);
+					});
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -209,10 +200,19 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		sortDown(bookmark_id){
-			const current = this.shared.find(b => b.bookmark_id === bookmark_id);
+		filterBookmarksByTags(bookmarks) {
+			const filter = this.filter;
+			if (!filter || filter.length === 0 || filter == "[]") return bookmarks;
 
-			const next = this.shared
+			return bookmarks.filter(b => {
+				const tags = JSON.parse(b.tag || "[]");
+				return tags.some(tag => filter.includes(tag));
+			});
+		},
+		sortDown(bookmark_id){
+			const current = this.sharedFiltered.find(b => b.bookmark_id === bookmark_id);
+
+			const next = this.sharedFiltered
 				.filter(b => b.sort > current.sort)
 				.sort((a, b) => a.sort - b.sort)[0];
 
@@ -223,9 +223,9 @@ export default {
 			this.changeOrder(current.bookmark_id, next.bookmark_id);
 		},
 		sortUp(bookmark_id){
-			const current = this.shared.find(b => b.bookmark_id === bookmark_id);
+			const current = this.sharedFiltered.find(b => b.bookmark_id === bookmark_id);
 
-			const next = this.shared
+			const next = this.sharedFiltered
 				.filter(b => b.sort < current.sort)
 				.sort((a, b) => a.sort + b.sort)[0];
 
@@ -237,12 +237,12 @@ export default {
 		},
 		addNewTag(){
 			if(this.newTag != null && this.newTag.length) {
-				this.tagsArray.push({tag: this.newTag, code: this.newTag});
+				this.tagsArrayMS.push({tag: this.newTag, code: this.newTag});
 				this.selectedTags.push({tag: this.newTag, code: this.newTag});
 				this.newTag = null;
 			}
 			else
-				this.$fhcAlert.alertError("Eingabe eines Zeichens erforderlich!");
+				this.$fhcAlert.alertError(this.$p.t("bookmark", "errorInputNecessary"));
 		},
 		changeOrder(bookmark_id_1, bookmark_id_2){
 			this.$api
@@ -265,10 +265,11 @@ export default {
 					return false;
 				}
 			}
-			return Array.isArray(tags) && tags.length > 0;
+			if (Array.isArray(tags) && tags.length > 0) {
+				return tags.join(' ');
+			}
 		},
 		prepareTag(bookmarkArr){
-			// parse if string
 			const parsedArr = Array.isArray(bookmarkArr)
 				? bookmarkArr
 				: JSON.parse(bookmarkArr);
@@ -285,200 +286,141 @@ export default {
 				.call(ApiBookmark.getAllBookmarkTags())
 				.then((res) => res.data)
 				.then((result) => {
-					//Variante Chips
-					this.tagsArray = this.prepareTag(result.data);
+					//Version Chips
+					this.tagsArrayMS = this.prepareTag(result.data);
 
-					//Variante Autocomplete
-/*
-					this.ArrayAC = result.data;
-						console.log("type of " + typeof this.ArrayAC);
-						console.log(Array.isArray(this.ArrayAC));*/
-				//	this.ArrayAC = Object.values(result.data);
-				//	this.ArrayAC = Object.keys(result.data);
-						this.ArrayAC = result.data; //in object umwandeln
-/*					this.ArrayAC = {...this.ArrayAC};
-
-					console.log("type of " + typeof this.ArrayAC);
-					console.log(Array.isArray(this.ArrayAC)); // true*/
-/*					Array.isArray(result.data)
-						? result.data
-						: JSON.parse(result.data); */
+					//Version Autocomplete
+					this.tagsArrayAC = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		addBookmarkFilter(){
-			console.log("in addFilterLogic: save in benutzeroverride " +  this.selectedFilters.map(tag => tag.tag).join(", "));
+		openFilterModal(){
+			this.$refs.filterModal.show();
+		},
+		async handleAddingTagFilter(widgetId){
 
-			console.log("widget_id " + this.manu2);
-			console.log("tags " + this.filterInput);
+			const result = await this.isInOverride(widgetId);
 
-			console.log(`${this.apiurl}/dashboard/Config/insertAndUpdateTagsForBookmarksUser`, {
-				db: "CIS",
-				funktion_kurzbz: this.sectionName,
-				widget_id: this.manu2,
-				tags: this.filterInput
-			});
+			if (!result) {
+				return;
+			}
+			const [status, reason] = result;
 
-			axios.post(this.apiurl + '/dashboard/Config/insertAndUpdateTagsForBookmarksUser', {
-				db: "CIS",
-				funktion_kurzbz: this.sectionName,
-				widget_id: this.manu2,
-				tags: this.filterInput
-			})
-				.then(res => {
-					console.log("API Response:", res.data);
+			if (status) {
+				this.addTagFilter(widgetId);
+			} else {
+				this.addWidgetToOverride(widgetId, reason);
+			}
+		},
+		addTagFilter(widgetId){
+			this.$api
+				.call(ApiBookmark.addTagFilter(widgetId, this.sectionName, this.filterInput))
+				.then((res) => res.data)
+				.then((result) => {
+					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
+					this.$refs.filterModal.hide();
+					this.getTagFilter(this.widgetId);
+
+					this.$nextTick(() => {
+						this.getAllBookmarkTags();
+					});
+					this.fetchBookmarks();
 				})
-				.catch(err => {
-					console.error("ERROR:", err);
-				});
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		async isInOverride(widgetId) {
+			try {
+				const res = await this.$api.call(ApiBookmark.isInOverride(widgetId, this.sectionName));
+				const result = res.data;
+				return result;
+			} catch (err) {
+				this.$fhcAlert.handleSystemError(err);
+				return null;
+			}
+		},
+		addWidgetToOverride(widgetId, reason){
+			this.$api
+				.call(ApiBookmark.addWidgetToOverride(
+					widgetId,
+					this.sectionName,
+					reason,
+					this.item_data.x,
+					this.item_data.y,
+					this.item_data.h,
+					this.item_data.w
+				))
+				.then((res) => res.data)
+				.then((result) => {
+					this.addTagFilter(widgetId);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		getTagFilter(widget_id){
-
-/*			console.log(`${this.apiurl}/dashboard/Config/getTagFilter`, {
-				db: "CIS",
-				funktion_kurzbz: this.sectionName,
-				widget_id: widget_id
-			});*/
-
-			axios.get(this.apiurl + '/dashboard/Config/getTagFilter', {
-				params: {
-					db: "CIS",
-					funktion_kurzbz: this.sectionName,
-					widget_id: widget_id
-				}
-			})
-				.then(res => {
-				//	console.log("API Response:", res.data);
-
-					//old version
-/*					const raw = res.data?.retval?.retval?.[0]?.tags;
-					const filterArray = raw ? JSON.parse(raw) : [];
-					this.selectedFilters = this.prepareTag(filterArray);*/
-
-
-					//unter config
-					const rawTags = res.data.retval.retval[0].tags; // string
-					const filterArray = JSON.parse(rawTags);
-					//this.selectedFilters = res.data.retval;
-					this.selectedFilters = this.prepareTag(filterArray);
+			this.$api
+				.call(ApiBookmark.getTagFilter(widget_id, this.sectionName))
+				.then((res) => res.data)
+				.then((result) => {
+					const rawTags = result.tags; // string
+					this.filter = rawTags;
+					if(rawTags != null) {
+						this.rawTagsParsed = JSON.parse(rawTags);
+						this.selectedFilters = this.prepareTag(this.rawTagsParsed);
+					}
+					this.fetchBookmarks();
 				})
-				.catch(err =>
-					console.error('ERROR: ', err));
+				.catch(this.$fhcAlert.handleSystemError);
 		},
-		//Variante mit AutocompleteFeld
-/*		search(event) {
-			this.ArrayAC = this.ArrayAC.map((item) => item) || event;
-		},*/
 		search(event) {
-			const query = event.query ?? ""; // PrimeVue liefert query
+			const query = event.query ?? "";
 
-			// Filter ArrayAC nach eingegebenem Text
-			this.filteredArrayAC = this.ArrayAC.filter(item =>
+			// Filter for text
+			this.filteredArray = this.tagsArrayAC.filter(item =>
 				item.toLowerCase().includes(query.toLowerCase())
 			);
 
-			// Wenn kein Treffer → manuellen Text erlauben
-			if (this.filteredArrayAC.length === 0 && query) {
-				this.filteredArrayAC = [query];
+			// input if search not successful
+			if (this.filteredArray.length === 0 && query) {
+				this.filteredArray = [query];
 			}
-
-			console.log("Filtered suggestions:", this.filteredArrayAC);
-
 		},
-/*		addCustomTag(event) {
-			const value = event.value;  // das ist der vom User eingegebene Text
-			console.log("Custom Tag:", value);
-
-			// Füge den neuen Tag zu selectedTags hinzu
-		//	this.selectedTags = [...this.selectedTags, value];
-			const newTag = { tag: value };
-
-			// Optional: Füge den Tag auch in ArrayAC hinzu, damit er zukünftig auswählbar ist
-			if (!this.tagsArray.includes(value)) {
-				this.tagsArray.push(value);
-			}
-
-
-
-		}*/
 	},
 	async mounted() {
+		if(this.widgetId) {
+			this.getTagFilter(this.widgetId);
+		}
 		await this.fetchBookmarks();
 		this.getAllBookmarkTags();
-		if(this.manu2) {
-			this.getTagFilter(this.manu2);
-		}
-/*		console.log("config " + this.config);
-		console.log("widgetID " + this.widgetId);*/
-	//	console.log("apiurl " + this.apiurl );
-/*		console.log("widgetinfo " + this.widgetInfo);
-		console.log("config " + this.config);
-		console.log(JSON.stringify(this.config));
-		console.log("width " + this.width);
-		console.log("height " + this.height);
-		console.log("configMode " + this.configMode);
-		console.log("sharedData " + this.sharedData);
-		console.log(JSON.stringify(this.sharedData));*/
-
-		//console.log( this.config.map(tag => tag.tag).join(", "));
-/*		console.log("manu " + this.manu);
-		console.log("manu2 " + this.manu2);
-		console.log("widgetID " + this.widgetID);*/
 	},
 	created() {
-		// 
 		// this.$emit('setConfig', true); // -> use this to enable widget config mode if needed
-
-		/*
-
-		widgetId: {{widgetId}}
-		    	{{manu2}} {{sectionName}}
-		 */
 	},
 
 
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
 
-
-		<div class="d-flex flex-column justify-content-between">
-        
-        <!--TODO Manu eigener button mit modal für Filter, Autocomplete Variante !-->
-			<!-- div class="mt-2 row">
-				<div class="col-10">
-					<PvMultiSelect
-						v-model="selectedFilters"
-						id="tagFilterUrl"
-						:options="tagsArray"
-						optionLabel="tag"
-						display="chip"
-						placeholder="Show only tags"
-						:maxSelectedLabels="3"
-						class="p-inputtext-sm w-100 me-2"
-						/>
-				</div>
-				<div class="col-1">
-					<button
-						class="btn btn-secondary"
-						@click="addBookmarkFilter"
-						title="nach Tags filtern"
-						>
-						<i class="fa-solid fa-filter"></i>
-					</button>
-				</div>
-			</div -->
+		<div class="d-flex mt-2">
+		  <button class="btn btn-outline-secondary btn-sm flex-grow-1 me-2" @click="openCreateModal">
+			{{$p.t('bookmark','newLink')}}
+		  </button>
+		  <button v-if="selectedFilters.length" class="btn btn-secondary btn-sm" :title="this.$p.t('bookmark/editFilter')" @click="openFilterModal">
+			<i class="fa-solid fa-filter-circle-xmark"></i>
+		  </button>  
+		  <button v-else class="btn btn-outline-secondary btn-sm" :title="this.$p.t('bookmark/filterByTags')" @click="openFilterModal">
+			<i class="fa-solid fa-filter"></i>
+		  </button>
 		</div>
-		<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
-            <template v-if="shared">
+            <template v-if="sharedFiltered">
+
                 <template v-if="!emptyBookmarks">
-					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
+					<div v-for="link in sharedFiltered" :key="link.id" class="d-flex mt-2">
 						<a target="_blank" :href="link.url" class="me-1">
 							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}
 						</a>
 						<span
 							v-if="hasTags(link)"
-							 :title="link.tag"
+							 :title="hasTags(link)"
 							 style="color: silver;"
 							>
 								<i class="fa fa-solid fa-tag text-gray-500" aria-hidden="true"></i>
@@ -486,32 +428,32 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a type="button" href="#" @click.prevent="openEditModal(link)" aria-label="edit bookmark" v-tooltip="{showDelay:1000,value:'edit bookmark'}">
+							<a type="button" href="#" @click.prevent="openEditModal(link)" aria-label="edit bookmark" :title="this.$p.t('bookmark/editBookmark')">
 								<i class="fa fa-edit me-1" aria-hidden="true"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" v-tooltip="{showDelay:1000,value:'delete bookmark'}" @click.prevent="removeLink(link.bookmark_id)">
+							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" :title="this.$p.t('bookmark/deleteBookmark')" @click.prevent="removeLink(link.bookmark_id)">
 								<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
 							</a>
 							<!--SORT BOOKMARKS-->
 							<a
-								v-if="shared.length > 1"
+								v-if="sharedFiltered.length > 1"
 								type="button"
 								id="downsortBookmark"
 								href="#"
 								aria-label="sortdown bookmark"
-								v-tooltip="{showDelay:1000,value:'sort down bookmark'}"
+								:title="this.$p.t('bookmark/sortDownwards')"
 								@click.prevent="sortDown(link.bookmark_id)"
 								>
 								<i :class="[ 'fa', 'fa-arrow-down', 'me-1', link.sort === maxSort ? 'text-light pointer-events-none' : '' ]"></i>
 							</a>
 							<a
-								v-if="shared.length > 1"
+								v-if="sharedFiltered.length > 1"
 								type="button"
 								id="upsortBookmark"
 								href="#"
 								aria-label="sortup bookmark"
-								v-tooltip="{showDelay:1000,value:'sort up bookmark'}"
+								:title="this.$p.t('bookmark/sortToTop')"
 								@click.prevent="sortUp(link.bookmark_id)"
 								>
 								<i :class="[ 'fa', 'fa-arrow-up', 'me-1', link.sort === minSort ? 'text-light pointer-events-none' : '' ]"></i>
@@ -541,16 +483,16 @@ export default {
 			</template>
 			<template #default>
 
-				<form-input  :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
+				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
 				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
 
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
 					<PvAutoComplete
-						v-model="selectedTagsAC"
+						v-model="selectedTags"
 						multiple
 						dropdown
-						:suggestions="filteredArrayAC"
+						:suggestions="filteredArray"
 						@complete="search" 
 						/>
 				</div>				
@@ -574,10 +516,10 @@ export default {
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
 					<PvAutoComplete
-						v-model="selectedTagsAC"
+						v-model="selectedTags"
 						multiple
 						dropdown
-						:suggestions="filteredArrayAC"
+						:suggestions="filteredArray"
 						@complete="search" 
 					/>
 				</div>					
@@ -588,6 +530,41 @@ export default {
 			</template>
 		</bs-modal>
 	</teleport>
+	<!--FILTER MODAL-->
+	<teleport to="body">
+		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="filterModal">
+			<template #title>
+				<h2>{{$p.t('bookmark','headerFilterBookmark')}}</h2>
+			</template>
+			<template #default>
+
+			<div class="mt-2 row">
+				<div class="col-10">
+					<PvMultiSelect
+						v-model="selectedFilters"
+						id="tagFilterUrl"
+						:options="tagsArrayMS"
+						optionLabel="tag"
+						display="chip"
+						:placeholder="$p.t('bookmark','noFilter')"
+						:maxSelectedLabels="3"
+						class="p-inputtext-sm w-100 me-2"
+						/>
+				</div>
+			</div>				
+
+			</template>
+			<template #footer>
+				<button
+					class="btn btn-secondary"
+					@click="handleAddingTagFilter(widgetId)"
+					:title="$p.t('bookmark','filterByTags')"
+					>
+					OK
+				</button>
+			</template>
+		</bs-modal>
+	</teleport>
 	`,
 };
 
diff --git a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
index c19299048..ccef52686 100644
--- a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
+++ b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
@@ -12,12 +12,9 @@ if(!@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
 	else
 		echo '<br>Spalte sort zu Tabelle dashboard.tbl_bookmark hinzugefügt';
 
-}
-
-//add preliminary Sort for all bookmarks if NULL
-//TODO(manu) verfeinern, falls einzelne Werte NULL
-if(@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
-	$qry = "WITH ranked AS (
+	//add preliminary Sort for all bookmarks if NULL
+	if(@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
+		$qry = "WITH ranked AS (
 		  SELECT
 			t1.bookmark_id,
 			(
@@ -34,10 +31,11 @@ if(@$db->db_query("SELECT sort FROM dashboard.tbl_bookmark LIMIT 1")) {
 		WHERE t.bookmark_id = ranked.bookmark_id
 		  AND t.sort IS NULL;";
 
-	if (!$db->db_query($qry))
-		echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
-	else
-		echo '<br>Tabelle dashboard.tbl_bookmark: Spalte sort mit vorläufiger Sortierung befüllt';
+		if (!$db->db_query($qry))
+			echo '<strong>dashboard.tbl_bookmark ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo '<br>Tabelle dashboard.tbl_bookmark: Spalte sort mit vorläufiger Sortierung befüllt';
+	}
 }
 
 //set column tag to type JSONB
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d3833dc9..bd90ef995 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -34514,6 +34514,207 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'editFilter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'filterByTags',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nach Tags Filtern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'filter by Tags',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'sortDownwards',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nach unten verschieben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sort downwards',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'sortToTop',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nach oben verschieben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sort to top',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'deleteBookmark',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lesezeichen löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete Bookmark',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'editBookmark',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lesezeichen bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit Bookmark',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'filterUpdated',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filteraktion erfolgreich durchgeführt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'filter updated successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'errorInputNecessary',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eingabe eines Zeichens erforderlich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'One character must be entered',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'noFilter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Filter für Lesezeichen ausgewählt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No bookmark filter entered',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'headerFilterBookmark',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lesezeichen filtern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter Bookmarks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// BOOKMARK PHRASEN END ----------------------------------------------------------------------
 	array(
 		'app' => 'core',
 		'category' => 'global',

From a8c4fc760742b58d58df0239324b376c61125a92 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 20 Nov 2025 14:06:12 +0100
Subject: [PATCH 009/189] CIS4 #69146 Lvplan for View
 StG/Semester/Verband/Gruppe         - new API Endpoint lvPlan/eventsStgOrg   
      - new view Cis/LvPlan/StgOrg         - new component LvPlan/StgOrg.js   
      - new overview Cis/OverviewLvPlan with Dropdown 	- phrases

---
 application/config/routes.php                 |   3 +
 .../controllers/Cis/OverviewLvPlan.php        |  39 ++++
 application/controllers/Cis/StgOrgLvPlan.php  |  39 ++++
 .../controllers/api/frontend/v1/LvPlan.php    | 103 +++++++++-
 application/libraries/StundenplanLib.php      |  18 ++
 .../models/ressource/Stundenplan_model.php    |  78 ++++++++
 public/js/api/factory/lvPlan.js               |  29 ++-
 public/js/apps/Dashboard/Fhc.js               |  22 +++
 .../components/Cis/LvPlan/OverviewLvPlan.js   | 170 ++++++++++++++++
 public/js/components/Cis/LvPlan/StgOrg.js     | 187 ++++++++++++++++++
 system/phrasesupdate.php                      | 103 +++++++++-
 11 files changed, 782 insertions(+), 9 deletions(-)
 create mode 100644 application/controllers/Cis/OverviewLvPlan.php
 create mode 100644 application/controllers/Cis/StgOrgLvPlan.php
 create mode 100644 public/js/components/Cis/LvPlan/OverviewLvPlan.js
 create mode 100644 public/js/components/Cis/LvPlan/StgOrg.js

diff --git a/application/config/routes.php b/application/config/routes.php
index eba6688ff..3ed3c8323 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -64,6 +64,9 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
+//Routes for Lvplan Verband and page for dropdown Stg/Semester/Verband/Gruppe
+$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
+$route['Cis/OverviewLvPlan/.*'] = 'Cis/OverviewLvPlan/index/$1';
 
 // Studierendenverwaltung List Routes
 $route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
diff --git a/application/controllers/Cis/OverviewLvPlan.php b/application/controllers/Cis/OverviewLvPlan.php
new file mode 100644
index 000000000..5fe9d9779
--- /dev/null
+++ b/application/controllers/Cis/OverviewLvPlan.php
@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class OverviewLvPlan extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OverviewLvPlan']);
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/Cis/StgOrgLvPlan.php b/application/controllers/Cis/StgOrgLvPlan.php
new file mode 100644
index 000000000..834d49d55
--- /dev/null
+++ b/application/controllers/Cis/StgOrgLvPlan.php
@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class StgOrgLvPlan extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'StgOrgLvPlan']);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 28b48e3f1..8a73dcaa4 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -41,7 +41,12 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED
+			'getLv' => self::PERM_LOGGED,
+			'eventsStgOrg' => self::PERM_LOGGED,
+			'fetchFerienEvents' => self::PERM_LOGGED,
+			'getStudiengaenge' => self::PERM_LOGGED,
+			'getLehrverband' => self::PERM_LOGGED,
+
 		]);
 
         $this->load->library('LogLib');
@@ -83,7 +88,7 @@ class LvPlan extends FHCAPI_Controller
 		// form validation
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-		
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -100,7 +105,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-		
+
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -109,6 +114,49 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
+	/**
+	 * fetches LvPlan for studiengang / semester / verband / gruppe
+	 *
+	 * @access public
+	 */
+	public function eventsStgOrg()
+	{
+		$this->load->library('StundenplanLib');
+
+		// form validation
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
+
+		if (!$this->form_validation->run())
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+			$stgOrgEvents = [];
+			$ferienEvents = [];
+		}
+
+		else
+		{
+			$start_date = $this->input->post('start_date', true);
+			$end_date = $this->input->post('end_date', true);
+			$stg_kz = $this->input->post('stg_kz', true);
+			$sem = $this->input->post('sem', true);
+			$verband = $this->input->post('verband', true);
+			$gruppe = $this->input->post('gruppe', true);
+
+			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
+			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
+
+			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
+			$ferienEvents = $this->getDataOrTerminateWithError($result);
+		}
+
+		$this->terminateWithSuccess(array_merge(
+			$stgOrgEvents,
+			$ferienEvents
+		));
+	}
+
 	/**
 	 * fetches LvPlan and Ferien events together for the lv
 	 *
@@ -137,7 +185,6 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -287,6 +334,48 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current($result));
 	}
 
+	public function getStudiengaenge()
+	{
+		$this->load->model('organisation/Studiengang_model','StudiengangModel');
+
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+		$result = $this->StudiengangModel->loadWhere([
+			'aktiv' => true
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($data);
+	}
+
+	public function getLehrverband($studiengang_kz, $semester=null, $verband=null)
+	{
+		$this->load->model('organisation/Lehrverband_model','LehrverbandModel');
+
+		$where = [
+			'aktiv' => true,
+			'studiengang_kz' => $studiengang_kz,
+		];
+
+		if ($semester !== null  && $semester !== 'null') {
+			$where['semester'] = $semester;
+		}
+		if ($verband !== null  && $verband !== 'null') {
+			$where['verband'] = $verband;
+		}
+
+		$this->LehrverbandModel->addOrder('studiengang_kz');
+		$this->LehrverbandModel->addOrder('semester');
+		$this->LehrverbandModel->addOrder('verband');
+		$this->LehrverbandModel->addOrder('gruppe');
+		$result = $this->LehrverbandModel->loadWhere($where);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($data);
+	}
+
 	/**
 	 * fetch moodle events
 	 *
@@ -338,7 +427,7 @@ class LvPlan extends FHCAPI_Controller
 
 		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-		
+
 		if ($currentStudiensemester) {
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
 
@@ -347,7 +436,7 @@ class LvPlan extends FHCAPI_Controller
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-			
+
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -357,7 +446,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-		
+
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 7ed64da2c..5e4b4e453 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -445,6 +445,24 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
+	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+
+		return success($stundenplan_data);
+	}
+
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 389be582d..168ba1bda 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -388,6 +388,84 @@ class Stundenplan_model extends DB_Model
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}
+
+	/**
+	 * queries Stundenplan and filters by studiengang, semester, verband gruppe
+	 *
+	 * @return void
+	 */
+	public function getStundenplanStudiengang($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe) {
+
+		$qry_params = [$start_date, $end_date, $stg_kz];
+
+		$qry = "
+		SELECT
+			'lehreinheit' as type, beginn, ende, datum,
+			CONCAT(lehrfach,'-',lehrform) as topic,
+			array_agg(DISTINCT lektor) as lektor,
+			array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+			string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
+			array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
+			titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		FROM
+			(
+				SELECT unr,datum,beginn, ende,
+					   CASE
+						   WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+						   ELSE sp.lektor
+						   END as lektor,
+					   CASE
+						   WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+						   ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
+						   END as gruppen_kuerzel,
+					   (SELECT bezeichnung
+						FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz IN(
+							SELECT oe_kurzbz
+							FROM lehre.tbl_lehrveranstaltung
+							WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+						)) as organisationseinheit,
+					   sp.ort_kurzbz, sp.studiengang_kz, sp.titel,sp.lehreinheit_id,sp.lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
+				FROM (
+						 SELECT sp.*
+						 FROM lehre.vw_stundenplan sp
+						 WHERE
+							 sp.datum >= ?
+						   AND sp.datum <= ?
+					 ) sp
+						 JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+						WHERE studiengang_kz = ? ";
+
+		if($sem != NULL)
+		{
+			$qry_params[] = $sem;
+			$qry .= " AND (semester = ? OR semester IS NULL)";
+		}
+		if($verband != NULL)
+		{
+			$qry_params[] = $verband;
+			$qry .= " AND (verband = ? OR verband IS NULL OR verband = '0' OR verband = '')";
+		}
+		if($gruppe != NULL)
+		{
+			$qry_params[] = $gruppe;
+			$qry .= " AND (gruppe = ? OR gruppe IS NULL	OR gruppe = '0' OR gruppe = '')	";
+		}
+		$qry.= " AND (
+			gruppe_kurzbz is null OR EXISTS(
+			   SELECT 1
+			  FROM
+				public.tbl_gruppe WHERE gruppe_kurzbz = sp.gruppe_kurzbz AND direktinskription = false
+			)
+		  )";
+
+		$qry.= "	) as subquery
+
+		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		ORDER BY datum, beginn; ";
+
+		return $this->execReadOnlyQuery($qry, $qry_params);
+	}
 	
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 0b179c9ba..01c7253d6 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -92,5 +92,32 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
 		};
-	}
+	},
+	eventsStgOrg(start_date, end_date, stg_kz, sem, verband, gruppe) {
+		console.log("stg_Kz" + stg_kz + " sem " + sem + " vb " + verband + " gr " + gruppe);
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsStgOrg',
+			params: { start_date, end_date, stg_kz, sem, verband, gruppe }
+		};
+	},
+	getStudiengaenge(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/getStudiengaenge'
+		}
+	},
+	getLehrverband(stg_kz, sem){
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}`
+		}
+	},
+	getGruppe(stg_kz, sem, verband){
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
+		}
+	},
+
 };
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 190ed1a93..4a19695ae 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -16,6 +16,8 @@ import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
+import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
+import OverviewLvPlan from "../../components/Cis/LvPlan/OverviewLvPlan.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -190,6 +192,26 @@ const router = VueRouter.createRouter({
 				};
 			}
 		},
+		{
+			path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?`,
+			name: 'StgOrgLvPlan',
+			component: StgOrgLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis/OverviewLvPlan`,
+			name: 'OverviewLvPlan',
+			component: OverviewLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
 		{
 			path: `/Cis4`,
 			name: 'Cis4',
diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
new file mode 100644
index 000000000..4a7cdec60
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
@@ -0,0 +1,170 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+
+export default {
+	name: "OverviewLvPlan",
+	components: {
+		FormForm,
+		FormInput,
+	},
+	props: {
+		viewData: Object,
+		propsViewData: Object
+	},
+	data() {
+		return {
+			formData:  {
+				stgkz: null,
+				semester: null,
+				verband: null,
+				gruppe: null,
+			},
+			listStg: [],
+			listSem: [],
+			listVerband: [],
+			listGroup: [],
+			dataLvStudiengang: {}
+		};
+	},
+	methods: {
+		loadLvPlan(){
+			if(!this.formData.stgkz){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
+				return;
+			}
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode: "Week",
+					focus_date: this.currentDay,
+					stgkz: this.formData.stgkz,
+					sem: this.formData.semester,
+					verband: this.formData.verband,
+					gruppe: this.formData.gruppe,
+				}
+			});
+		},
+		loadListSem(){
+			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+			this.loadListVerband();
+		},
+		loadListVerband(){
+			this.$api
+				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.verband);
+					this.listVerband = [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""
+					))]
+					.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+			this.loadListGroup();
+		},
+		loadListGroup(){
+			this.$api
+				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.gruppe);
+					this.listGroup =  [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""))]
+						.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	computed: {
+		maxSemester(){
+			const currentStg = this.listStg.find(
+				item => item.studiengang_kz === this.formData.stgkz
+			);
+			return currentStg.max_semester;
+		},
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+	},
+	created(){
+		this.$api
+			.call(ApiLvPlan.getStudiengaenge())
+			.then(result => {
+				this. listStg = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div cis-lvplan-stg-org-ues d-flex flex-column h-100>
+		<div class="mt-3">
+	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.stgkz"
+	 				@change="loadListSem(formData.stgkz)"
+	 				>
+					<option value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
+					<option
+						v-for="stg in listStg"
+						:key="stg.studiengang_kz"
+						:value="stg.studiengang_kz"
+						>
+						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.semester"
+	 				@change="loadListVerband()"
+	 				>
+						<option value="null" selected>Semester</option>
+						<option
+							v-for="sem in listSem"
+							:key="sem"
+							:value="sem"
+							>
+							{{ sem }}
+						</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.verband"
+	 				@change="loadListGroup()"
+	 				>
+	 					<option value="null" selected>{{ $p.t('lehre/verband') }} </option>
+					<option
+						v-for="verband in listVerband"
+						:key="verband"
+						:value="verband"
+						>
+						{{ verband }}
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.gruppe"
+	 				>
+	 				<option value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
+						<option
+							v-for="group in listGroup"
+							:key="group"
+							:value="group"
+							>
+							{{ group }}
+						</option>
+	 			</form-input>
+				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
+
+	 		</form-form>
+	 	</div>
+	 </div>
+	 `,
+};
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
new file mode 100644
index 000000000..b6e4a37b4
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -0,0 +1,187 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week';
+
+export default {
+	name: 'LvPlanStgOrg',
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	components: {
+		FhcCalendar,
+	},
+	props: {
+		viewData: Object,
+		propsViewData: Object
+	},
+	data() {
+		return {
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false,
+			listStg: [],
+			currentStgBezeichnung: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=' + type
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode,
+					focus_date,
+					stgkz: this.propsViewData.stgkz,
+					sem: this.propsViewData.sem,
+					verband: this.propsViewData.verband,
+					gruppe: this.propsViewData.gruppe,
+				}
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+				//local for test
+/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
+			];
+		},
+		backToDropdown(){
+			this.$router.push({
+				name: "OverviewLvPlan",
+			});
+		}
+	},
+	created(){
+		this.$api
+			.call(ApiAuthinfo.getAuthInfo())
+			.then(res => {
+				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
+			});
+
+		if(this.propsViewData.stgkz) {
+			this.$api
+				.call(ApiLvPlan.getStudiengaenge())
+				.then(result => {
+					const currentStg = result.data.find(
+						item => item.studiengang_kz == this.propsViewData.stgkz
+					);
+					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	template: `
+	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
+		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
+		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
+			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
+			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
+			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
+			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
+		</p>
+		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
+
+		<fhc-calendar
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			class="responsive-calendar"
+		>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+				>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
+				</div>
+			</div>
+		</fhc-calendar>
+	</div>
+	`,
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 096d5086c..8a4b34dc9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51467,7 +51467,108 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
-	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
+	// ###  	LvPlanStgOrg 		START 		###
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'noStgProvided',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'kein Studiengang hinterlegt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'no degree-program provided',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'headerLvPlanLvVerband',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lv-Plan Lehrverband',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course-Plan Teaching Association',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'chooseStg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiengang auswählen...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select a degree-program...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'loadLvPlan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrverband laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Load Course-Plan',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'backToDropdown',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurück zum Auswahl-Dropdown',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Back to Dropdown',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ### 		LvPlanStgOrg 		END 		###
 );
 
 

From 5e929df966afad8ad404896e314f79c7d1704548 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 25 Nov 2025 12:01:49 +0100
Subject: [PATCH 010/189] stgOrg: calendar and dropdown selection on one page

---
 .../controllers/api/frontend/v1/LvPlan.php    |   4 +-
 .../components/Cis/LvPlan/OverviewLvPlan.js   |  13 +-
 public/js/components/Cis/LvPlan/StgOrg.js     | 287 +++++++++++++++---
 .../js/components/Cis/LvPlan/StgOrg_DEPR.js   | 187 ++++++++++++
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |   2 +-
 5 files changed, 450 insertions(+), 43 deletions(-)
 create mode 100644 public/js/components/Cis/LvPlan/StgOrg_DEPR.js

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 8a73dcaa4..d0f4fa7ba 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -358,10 +358,10 @@ class LvPlan extends FHCAPI_Controller
 			'studiengang_kz' => $studiengang_kz,
 		];
 
-		if ($semester !== null  && $semester !== 'null') {
+		if ($semester !== null  && $semester !== 'null' && $semester !== 'undefined') {
 			$where['semester'] = $semester;
 		}
-		if ($verband !== null  && $verband !== 'null') {
+		if ($verband !== null  && $verband !== 'null' && $verband !== 'undefined') {
 			$where['verband'] = $verband;
 		}
 
diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
index 4a7cdec60..dafdc13f5 100644
--- a/public/js/components/Cis/LvPlan/OverviewLvPlan.js
+++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
@@ -17,7 +17,7 @@ export default {
 		return {
 			formData:  {
 				stgkz: null,
-				semester: null,
+				sem: null,
 				verband: null,
 				gruppe: null,
 			},
@@ -25,7 +25,7 @@ export default {
 			listSem: [],
 			listVerband: [],
 			listGroup: [],
-			dataLvStudiengang: {}
+		//	dataLvStudiengang: {}
 		};
 	},
 	methods: {
@@ -34,13 +34,14 @@ export default {
 				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
 				return;
 			}
+			console.log(this.$route.name, this.$route.params);
 			this.$router.push({
 				name: "StgOrgLvPlan",
 				params: {
 					mode: "Week",
 					focus_date: this.currentDay,
 					stgkz: this.formData.stgkz,
-					sem: this.formData.semester,
+					sem: this.formData.sem,
 					verband: this.formData.verband,
 					gruppe: this.formData.gruppe,
 				}
@@ -52,7 +53,7 @@ export default {
 		},
 		loadListVerband(){
 			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, this.formData.verband))
 				.then(result => {
 					const data = result.data;
 					const mappedData = data.map(item => item.verband);
@@ -68,7 +69,7 @@ export default {
 		},
 		loadListGroup(){
 			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.sem, this.formData.verband))
 				.then(result => {
 					const data = result.data;
 					const mappedData = data.map(item => item.gruppe);
@@ -122,7 +123,7 @@ export default {
 	 			</form-input>
 	 			<form-input
 	 				type="select"
-	 				v-model="formData.semester"
+	 				v-model="formData.sem"
 	 				@change="loadListVerband()"
 	 				>
 						<option value="null" selected>Semester</option>
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index b6e4a37b4..f7deff692 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -1,3 +1,5 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../.././../api/factory/lvPlan.js';
@@ -7,12 +9,9 @@ export const DEFAULT_MODE_LVPLAN = 'Week';
 
 export default {
 	name: 'LvPlanStgOrg',
-	inject: {
-		cisRoot: {
-			from: 'cisRoot'
-		},
-	},
 	components: {
+		FormForm,
+		FormInput,
 		FhcCalendar,
 	},
 	props: {
@@ -21,17 +20,46 @@ export default {
 	},
 	data() {
 		return {
+			localProps: {},
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
 			isStudent: false,
+			currentStgBezeichnung: null,
+			formData:  {
+				stgkz: null,
+				sem: null,
+				verband: null,
+				gruppe: null,
+			},
 			listStg: [],
-			currentStgBezeichnung: null
+			listSem: [1,2,3,4,5,6,7,8,9,10],
+			listVerband: [],
+			listGroup: [],
+			rangeIntervalFirst: null
 		};
 	},
-	computed:{
+	computed: {
+		maxSemester(){
+			const currentStg = this.listStg.find(
+				item => item.studiengang_kz === this.formData.stgkz
+			);
+			return currentStg.max_semester;
+		},
+		//use local props, for viewDataProps cannot be changed
+/*		currentDay() {
+			if (!this.localProps?.focus_date || isNaN(new Date(this.localProps.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.localProps.focus_date;
+		},
+
+		currentMode() {
+			if (!this.localProps?.mode || !['day', 'week', 'month'].includes(this.localProps.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.localProps.mode;
+		},*/
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
 				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
@@ -78,14 +106,94 @@ export default {
 		}
 	},
 	methods: {
+		loadLvPlan(){
+			if(!this.formData.stgkz){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
+				return;
+			}
+
+/*			if(this.rangeIntervalFirst) {
+				console.log("in range IntervalFirst ");
+				this.updateRange(this.rangeIntervalFirst);
+			}
+
+			console.log("formParameters: "  + this.formData.stgkz + " focusdate" + this.currentDay);*/
+
+/*			const newFocus = luxon.DateTime.fromISO(this.propsViewData.focus_date)
+				.setZone(this.viewData.timezone)
+				.toISODate() + "_";*/ // minimaler Unterschied
+
+			//also use router push here
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode: this.currentMode,
+					focus_date: this.currentDay,
+					stgkz: this.formData.stgkz,
+					sem: this.formData.sem,
+					verband: this.formData.verband,
+					gruppe: this.formData.gruppe,
+				},
+			});
+
+			//wenn sich formvariablen ändern?
+			if(this.rangeIntervalFirst) {
+				console.log("in range IntervalFirst second try ");
+				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
+				const end   = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate();
+				console.log("start und end" + start + " - " + end);
+				this.getPromiseFunc(start, end);
+			}
+
+		},
+		loadListSem(){
+			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+			this.loadListVerband();
+		},
+		loadListVerband(){
+			this.$api
+				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.verband);
+					this.listVerband = [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""
+					))]
+						.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+			this.loadListGroup();
+		},
+		loadListGroup(){
+			this.$api
+				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.gruppe);
+					this.listGroup =  [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""))]
+						.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		handleChangeDate(day, newMode) {
+			console.log("in handleChangeDate: day: " + day + " newMode " + newMode);
 			return this.handleChangeMode(newMode, day);
 		},
 		handleChangeMode(newMode, day) {
-			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			console.log("in handleChangeMode: day: " + day + " newMode " + newMode);
+			console.log(this.$route.name, this.$route.params);
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
 			const focus_date = day.toISODate();
 
-			this.$router.push({
+			console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe);
+
+
+/*			this.$router.push({
 				name: "StgOrgLvPlan",
 				params: {
 					mode,
@@ -95,9 +203,52 @@ export default {
 					verband: this.propsViewData.verband,
 					gruppe: this.propsViewData.gruppe,
 				}
+			});*/
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode,
+					focus_date,
+					stgkz: this.formData.stgkz,
+					sem: this.formData.sem,
+					verband: this.formData.verband,
+					gruppe: this.formData.gruppe,
+				},
 			});
+
+			//try for reload
+			if(this.rangeIntervalFirst) {
+				console.log("in range IntervalFirst second try ");
+				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
+				const end   = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate();
+				console.log("start und end" + start + " - " + end);
+				this.getPromiseFunc(start, end);
+			}
+
 		},
 		updateRange(rangeInterval) {
+			console.log("in updateRange " + rangeInterval);
+
+			//initialise at first run
+			if(!this.rangeIntervalFirst) {
+				this.rangeIntervalFirst = rangeInterval;
+				console.log("new local RI " + this.rangeIntervalFirst);
+			}
+
+
+/*			const startOfWeek = rangeInterval.end.startOf('week').toISODate();
+
+			console.log("in updateRange", startOfWeek);*/
+/*
+			if (!rangeInterval || !rangeInterval.end || !rangeInterval.end.startOf) {
+				console.warn("updateRange: invalid rangeInterval", rangeInterval);
+				return;
+			}
+
+			const startOfWeek = rangeInterval.end.startOf('week').toISODate();
+
+			console.log("in updateRange", startOfWeek);*/
 			this.$api
 				.call(ApiLvPlan.studiensemesterDateInterval(
 					rangeInterval.end.startOf('week').toISODate()
@@ -109,17 +260,18 @@ export default {
 				});
 		},
 		getPromiseFunc(start, end) {
+			console.log("start " + start + "  end " + end);
+			console.log(this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe);
+			console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe);
+
 			return [
-				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+				//this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+				//variante die von außen funktioniert
+/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),*/
 				//local for test
-/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
+				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
 			];
 		},
-		backToDropdown(){
-			this.$router.push({
-				name: "OverviewLvPlan",
-			});
-		}
 	},
 	created(){
 		this.$api
@@ -130,30 +282,95 @@ export default {
 				this.isStudent = res.data.isStudent;
 			});
 
-		if(this.propsViewData.stgkz) {
-			this.$api
-				.call(ApiLvPlan.getStudiengaenge())
-				.then(result => {
-					const currentStg = result.data.find(
-						item => item.studiengang_kz == this.propsViewData.stgkz
-					);
-					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiLvPlan.getStudiengaenge())
+			.then(result => {
+				this. listStg = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		//this.localProps = { ...this.propsViewData };
+
+		if(this.propsViewData) {
+			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
+			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
+			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
+			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
 		}
 	},
+	/*
+
+				v-if="propsViewData && propsViewData.stgkz"
+						{{propsViewData}} || {{formData}} || {{viewData}}
+	 */
+
 	template: `
 	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
-		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
-		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
-			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
-			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
-			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
-			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
-		</p>
-		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
+
+		<div class="mt-3">
+	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.stgkz"
+	 				@change="loadListSem(formData.stgkz)"
+	 				>
+					<option value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
+					<option
+						v-for="stg in listStg"
+						:key="stg.studiengang_kz"
+						:value="stg.studiengang_kz"
+						>
+						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.sem"
+	 				@change="loadListVerband()"
+	 				>
+						<option value="null" selected>Semester</option>
+						<option
+							v-for="sem in listSem"
+							:key="sem"
+							:value="sem"
+							>
+							{{ sem }}
+						</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.verband"
+	 				@change="loadListGroup()"
+	 				>
+	 					<option value="null" selected>{{ $p.t('lehre/verband') }} </option>
+					<option
+						v-for="verband in listVerband"
+						:key="verband"
+						:value="verband"
+						>
+						{{ verband }}
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.gruppe"
+	 				>
+	 				<option value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
+						<option
+							v-for="group in listGroup"
+							:key="group"
+							:value="group"
+							>
+							{{ group }}
+						</option>
+	 			</form-input>
+				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
+
+	 		</form-form>
+	 	</div>
 
 		<fhc-calendar
+			v-if="propsViewData && propsViewData.stgkz"
 			ref="calendar"
 			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
@@ -184,4 +401,6 @@ export default {
 		</fhc-calendar>
 	</div>
 	`,
+
+
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/LvPlan/StgOrg_DEPR.js b/public/js/components/Cis/LvPlan/StgOrg_DEPR.js
new file mode 100644
index 000000000..02606a1db
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/StgOrg_DEPR.js
@@ -0,0 +1,187 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week';
+
+export default {
+	name: 'LvPlanStgOrg',
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	components: {
+		FhcCalendar,
+	},
+	props: {
+		viewData: Object,
+		propsViewData: Object
+	},
+	data() {
+		return {
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false,
+			listStg: [],
+			currentStgBezeichnung: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=' + type
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode,
+					focus_date,
+					stgkz: this.propsViewData.stgkz,
+					sem: this.propsViewData.sem,
+					verband: this.propsViewData.verband,
+					gruppe: this.propsViewData.gruppe,
+				}
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+				//local for test
+				/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
+			];
+		},
+		backToDropdown(){
+			this.$router.push({
+				name: "OverviewLvPlan",
+			});
+		}
+	},
+	created(){
+		this.$api
+			.call(ApiAuthinfo.getAuthInfo())
+			.then(res => {
+				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
+			});
+
+		if(this.propsViewData.stgkz) {
+			this.$api
+				.call(ApiLvPlan.getStudiengaenge())
+				.then(result => {
+					const currentStg = result.data.find(
+						item => item.studiengang_kz == this.propsViewData.stgkz
+					);
+					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	template: `
+	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
+		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
+		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
+			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
+			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
+			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
+			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
+		</p>
+		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
+
+		<fhc-calendar
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			class="responsive-calendar"
+		>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+				>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
+				</div>
+			</div>
+		</fhc-calendar>
+	</div>
+	`,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index badbf537f..d4ddeaf60 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -31,7 +31,7 @@ export default {
 						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
 						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
 					].join(": "));
-				} else {console.log(this.event.lektor);
+				} else {//console.log(this.event.lektor);
 					tooltipArray.push([
 						this.$p.t('lehre/lektor'),
 						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")

From 6c2a2e4665f57b5da31edf39535c43afe32888ca Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 27 Nov 2025 18:15:38 +0100
Subject: [PATCH 011/189] work in progress, add reset function to EventLoader
 composable, to be able to reload when external parameters are changed

---
 public/js/apps/Dashboard/Fhc.js           |  2 +-
 public/js/components/Calendar/LvPlan.js   |  8 ++++++--
 public/js/components/Cis/LvPlan/StgOrg.js |  8 ++++++++
 public/js/composables/EventLoader.js      | 17 ++++++++++++++---
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 4a19695ae..e14396cc3 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -193,7 +193,7 @@ const router = VueRouter.createRouter({
 			}
 		},
 		{
-			path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?`,
+			path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?/:stgkz?/:sem?/:verband?/:gruppe?`,
 			name: 'StgOrgLvPlan',
 			component: StgOrgLvPlan,
 			props(route) {
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index e0e918f01..6b4257853 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -88,12 +88,15 @@ export default {
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
 			this.$emit('update:range', rangeInterval);
+		},
+		resetEventLoader() {
+			this.reset();
 		}
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
 		
-		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
 
 		Vue.watch(lv, newValue => {
 			context.emit('update:lv', newValue);
@@ -102,7 +105,8 @@ export default {
 		return {
 			rangeInterval,
 			events,
-			lv
+			lv,
+			reset
 		};
 	},
 	created() {
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index f7deff692..807d47e26 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -136,7 +136,10 @@ export default {
 				},
 			});
 
+			this.$refs['calendar'].resetEventLoader();
+
 			//wenn sich formvariablen ändern?
+/*
 			if(this.rangeIntervalFirst) {
 				console.log("in range IntervalFirst second try ");
 				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
@@ -145,6 +148,8 @@ export default {
 				this.getPromiseFunc(start, end);
 			}
 
+				*/
+
 		},
 		loadListSem(){
 			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
@@ -218,6 +223,7 @@ export default {
 			});
 
 			//try for reload
+			/*
 			if(this.rangeIntervalFirst) {
 				console.log("in range IntervalFirst second try ");
 				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
@@ -225,6 +231,7 @@ export default {
 				console.log("start und end" + start + " - " + end);
 				this.getPromiseFunc(start, end);
 			}
+			*/
 
 		},
 		updateRange(rangeInterval) {
@@ -372,6 +379,7 @@ export default {
 		<fhc-calendar
 			v-if="propsViewData && propsViewData.stgkz"
 			ref="calendar"
+			v-model:lv="formData"
 			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 7360d0286..e20cbd3a2 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -111,7 +111,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};
 
-	Vue.watchEffect(() => {
+	const reload = () => {
 		const range = Vue.toValue(rangeInterval);
 		if (!(range instanceof luxon.Interval))
 			return;
@@ -132,7 +132,18 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 					}
 				})
 			});
-	})
+	};
 
-	return { events: allEvents, lv }
+	Vue.watchEffect(reload);
+	
+	const reset = () => {
+		loading_id = 0;
+		events.value = [];
+		loadingEvents.value = [];
+		eventsLoaded.splice(0, eventsLoaded.length);
+
+		reload();
+	}
+
+	return { events: allEvents, lv, reset }
 }
\ No newline at end of file

From f0641ddd6de591adc06bbd3980144538e8540b7f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Dec 2025 17:30:11 +0100
Subject: [PATCH 012/189] refactor Dropdown - load dropdown only if dropdown
 before was chosen - validation if field in between is empty - ensure no null
 value gets into route

---
 public/js/api/factory/lvPlan.js           |   1 -
 public/js/components/Cis/LvPlan/StgOrg.js | 153 ++++++----------------
 system/phrasesupdate.php                  |  40 ++++++
 3 files changed, 78 insertions(+), 116 deletions(-)

diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 01c7253d6..33e82cff9 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -94,7 +94,6 @@ export default {
 		};
 	},
 	eventsStgOrg(start_date, end_date, stg_kz, sem, verband, gruppe) {
-		console.log("stg_Kz" + stg_kz + " sem " + sem + " vb " + verband + " gr " + gruppe);
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/lvPlan/eventsStgOrg',
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index 807d47e26..3a1d58fb7 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -48,18 +48,6 @@ export default {
 			);
 			return currentStg.max_semester;
 		},
-		//use local props, for viewDataProps cannot be changed
-/*		currentDay() {
-			if (!this.localProps?.focus_date || isNaN(new Date(this.localProps.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-			return this.localProps.focus_date;
-		},
-
-		currentMode() {
-			if (!this.localProps?.mode || !['day', 'week', 'month'].includes(this.localProps.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
-			return this.localProps.mode;
-		},*/
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
 				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
@@ -112,48 +100,49 @@ export default {
 				return;
 			}
 
-/*			if(this.rangeIntervalFirst) {
-				console.log("in range IntervalFirst ");
-				this.updateRange(this.rangeIntervalFirst);
+			if(!this.formData.sem && (this.formData.verband || this.formData.gruppe)){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
+				return;
 			}
 
-			console.log("formParameters: "  + this.formData.stgkz + " focusdate" + this.currentDay);*/
+			if(!this.formData.verband && this.formData.gruppe){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
+				return;
+			}
 
-/*			const newFocus = luxon.DateTime.fromISO(this.propsViewData.focus_date)
-				.setZone(this.viewData.timezone)
-				.toISODate() + "_";*/ // minimaler Unterschied
+			const params = {
+				mode: this.currentMode,
+				focus_date: this.currentDay,
+				stgkz: this.formData.stgkz,
+				sem: this.formData.sem,
+				verband: this.formData.verband,
+				gruppe: this.formData.gruppe,
+			};
+
+			//ensure logic: no value after a null value in route
+			if(params.sem == null)
+			{
+				params.verband = null;
+				params.gruppe = null;
+			}
+			if(params.verband == null) {
+				params.gruppe = null;
+			}
+
+			//delete all null values to avoid null in router
+			Object.keys(params).forEach(
+				key => params[key] == null && delete params[key]
+			);
 
-			//also use router push here
 			this.$router.push({
 				name: "StgOrgLvPlan",
-				params: {
-					mode: this.currentMode,
-					focus_date: this.currentDay,
-					stgkz: this.formData.stgkz,
-					sem: this.formData.sem,
-					verband: this.formData.verband,
-					gruppe: this.formData.gruppe,
-				},
+				params,
 			});
 
 			this.$refs['calendar'].resetEventLoader();
-
-			//wenn sich formvariablen ändern?
-/*
-			if(this.rangeIntervalFirst) {
-				console.log("in range IntervalFirst second try ");
-				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
-				const end   = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate();
-				console.log("start und end" + start + " - " + end);
-				this.getPromiseFunc(start, end);
-			}
-
-				*/
-
 		},
 		loadListSem(){
 			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-			this.loadListVerband();
 		},
 		loadListVerband(){
 			this.$api
@@ -169,7 +158,6 @@ export default {
 						.sort();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-			this.loadListGroup();
 		},
 		loadListGroup(){
 			this.$api
@@ -186,30 +174,12 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		handleChangeDate(day, newMode) {
-			console.log("in handleChangeDate: day: " + day + " newMode " + newMode);
 			return this.handleChangeMode(newMode, day);
 		},
 		handleChangeMode(newMode, day) {
-			console.log("in handleChangeMode: day: " + day + " newMode " + newMode);
-			console.log(this.$route.name, this.$route.params);
 			const mode = newMode[0].toUpperCase() + newMode.slice(1);
 			const focus_date = day.toISODate();
 
-			console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe);
-
-
-/*			this.$router.push({
-				name: "StgOrgLvPlan",
-				params: {
-					mode,
-					focus_date,
-					stgkz: this.propsViewData.stgkz,
-					sem: this.propsViewData.sem,
-					verband: this.propsViewData.verband,
-					gruppe: this.propsViewData.gruppe,
-				}
-			});*/
-
 			this.$router.push({
 				name: "StgOrgLvPlan",
 				params: {
@@ -221,41 +191,8 @@ export default {
 					gruppe: this.formData.gruppe,
 				},
 			});
-
-			//try for reload
-			/*
-			if(this.rangeIntervalFirst) {
-				console.log("in range IntervalFirst second try ");
-				const start = luxon.DateTime.fromISO(this.rangeIntervalFirst.start).toISODate();
-				const end   = luxon.DateTime.fromISO(this.rangeIntervalFirst.end).toISODate();
-				console.log("start und end" + start + " - " + end);
-				this.getPromiseFunc(start, end);
-			}
-			*/
-
 		},
 		updateRange(rangeInterval) {
-			console.log("in updateRange " + rangeInterval);
-
-			//initialise at first run
-			if(!this.rangeIntervalFirst) {
-				this.rangeIntervalFirst = rangeInterval;
-				console.log("new local RI " + this.rangeIntervalFirst);
-			}
-
-
-/*			const startOfWeek = rangeInterval.end.startOf('week').toISODate();
-
-			console.log("in updateRange", startOfWeek);*/
-/*
-			if (!rangeInterval || !rangeInterval.end || !rangeInterval.end.startOf) {
-				console.warn("updateRange: invalid rangeInterval", rangeInterval);
-				return;
-			}
-
-			const startOfWeek = rangeInterval.end.startOf('week').toISODate();
-
-			console.log("in updateRange", startOfWeek);*/
 			this.$api
 				.call(ApiLvPlan.studiensemesterDateInterval(
 					rangeInterval.end.startOf('week').toISODate()
@@ -267,15 +204,7 @@ export default {
 				});
 		},
 		getPromiseFunc(start, end) {
-			console.log("start " + start + "  end " + end);
-			console.log(this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe);
-			console.log(this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe);
-
 			return [
-				//this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
-				//variante die von außen funktioniert
-/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),*/
-				//local for test
 				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
 			];
 		},
@@ -296,8 +225,6 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		//this.localProps = { ...this.propsViewData };
-
 		if(this.propsViewData) {
 			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
 			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
@@ -305,12 +232,6 @@ export default {
 			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
 		}
 	},
-	/*
-
-				v-if="propsViewData && propsViewData.stgkz"
-						{{propsViewData}} || {{formData}} || {{viewData}}
-	 */
-
 	template: `
 	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
 
@@ -321,7 +242,7 @@ export default {
 	 				v-model="formData.stgkz"
 	 				@change="loadListSem(formData.stgkz)"
 	 				>
-					<option value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
+					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
 					<option
 						v-for="stg in listStg"
 						:key="stg.studiengang_kz"
@@ -334,8 +255,9 @@ export default {
 	 				type="select"
 	 				v-model="formData.sem"
 	 				@change="loadListVerband()"
+	 				@click="loadListSem(formData.stgkz)"
 	 				>
-						<option value="null" selected>Semester</option>
+						<option :value="null" selected>Semester</option>
 						<option
 							v-for="sem in listSem"
 							:key="sem"
@@ -348,8 +270,9 @@ export default {
 	 				type="select"
 	 				v-model="formData.verband"
 	 				@change="loadListGroup()"
+
 	 				>
-	 					<option value="null" selected>{{ $p.t('lehre/verband') }} </option>
+	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
 					<option
 						v-for="verband in listVerband"
 						:key="verband"
@@ -362,7 +285,7 @@ export default {
 	 				type="select"
 	 				v-model="formData.gruppe"
 	 				>
-	 				<option value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
+	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
 						<option
 							v-for="group in listGroup"
 							:key="group"
@@ -377,7 +300,7 @@ export default {
 	 	</div>
 
 		<fhc-calendar
-			v-if="propsViewData && propsViewData.stgkz"
+			v-show="propsViewData && propsViewData.stgkz"
 			ref="calendar"
 			v-model:lv="formData"
 			:timezone="viewData.timezone"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bfffc4aee..1ea8d95d0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51768,6 +51768,46 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'error_SemMissing',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Semester wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select a semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'LvPlan',
+		'phrase' => 'error_VerbandMissing',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verband wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select a verband',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		LvPlanStgOrg 		END 		###
 );
 

From ed69bd74ed1585afde3d8767ffdd09fc3c37f91e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Dec 2025 10:39:41 +0100
Subject: [PATCH 013/189] apply validation logic for dropdowns also for
 OverviewLvPlan.js

---
 .../components/Cis/LvPlan/OverviewLvPlan.js   | 63 +++++++++++++------
 public/js/components/Cis/LvPlan/StgOrg.js     |  1 -
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
index dafdc13f5..01615ab60 100644
--- a/public/js/components/Cis/LvPlan/OverviewLvPlan.js
+++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
@@ -22,34 +22,57 @@ export default {
 				gruppe: null,
 			},
 			listStg: [],
-			listSem: [],
+			listSem: [1,2,3,4,5,6,7,8,9,10],
 			listVerband: [],
 			listGroup: [],
-		//	dataLvStudiengang: {}
 		};
 	},
 	methods: {
-		loadLvPlan(){
-			if(!this.formData.stgkz){
+		loadLvPlan() {
+			if (!this.formData.stgkz) {
 				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
 				return;
 			}
-			console.log(this.$route.name, this.$route.params);
+			if (!this.formData.sem && (this.formData.verband || this.formData.gruppe)) {
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
+				return;
+			}
+
+			if (!this.formData.verband && this.formData.gruppe) {
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
+				return;
+			}
+
+			const params = {
+				mode: this.currentMode,
+				focus_date: this.currentDay,
+				stgkz: this.formData.stgkz,
+				sem: this.formData.sem,
+				verband: this.formData.verband,
+				gruppe: this.formData.gruppe,
+			};
+
+			//ensure logic: no value after a null value in route
+			if (params.sem == null) {
+				params.verband = null;
+				params.gruppe = null;
+			}
+			if (params.verband == null) {
+				params.gruppe = null;
+			}
+
+			//delete all null values to avoid null in router
+			Object.keys(params).forEach(
+				key => params[key] == null && delete params[key]
+			);
+
 			this.$router.push({
 				name: "StgOrgLvPlan",
-				params: {
-					mode: "Week",
-					focus_date: this.currentDay,
-					stgkz: this.formData.stgkz,
-					sem: this.formData.sem,
-					verband: this.formData.verband,
-					gruppe: this.formData.gruppe,
-				}
+				params,
 			});
 		},
 		loadListSem(){
 			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-			this.loadListVerband();
 		},
 		loadListVerband(){
 			this.$api
@@ -65,7 +88,6 @@ export default {
 					.sort();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-			this.loadListGroup();
 		},
 		loadListGroup(){
 			this.$api
@@ -105,14 +127,14 @@ export default {
 	},
 	template: `
 	<div cis-lvplan-stg-org-ues d-flex flex-column h-100>
-		<div class="mt-3">
+				<div class="mt-3">
 	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
 	 			<form-input
 	 				type="select"
 	 				v-model="formData.stgkz"
 	 				@change="loadListSem(formData.stgkz)"
 	 				>
-					<option value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
+					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
 					<option
 						v-for="stg in listStg"
 						:key="stg.studiengang_kz"
@@ -125,8 +147,9 @@ export default {
 	 				type="select"
 	 				v-model="formData.sem"
 	 				@change="loadListVerband()"
+	 				@click="loadListSem(formData.stgkz)"
 	 				>
-						<option value="null" selected>Semester</option>
+						<option :value="null" selected>Semester</option>
 						<option
 							v-for="sem in listSem"
 							:key="sem"
@@ -140,7 +163,7 @@ export default {
 	 				v-model="formData.verband"
 	 				@change="loadListGroup()"
 	 				>
-	 					<option value="null" selected>{{ $p.t('lehre/verband') }} </option>
+	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
 					<option
 						v-for="verband in listVerband"
 						:key="verband"
@@ -153,7 +176,7 @@ export default {
 	 				type="select"
 	 				v-model="formData.gruppe"
 	 				>
-	 				<option value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
+	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
 						<option
 							v-for="group in listGroup"
 							:key="group"
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index 3a1d58fb7..996a599d3 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -270,7 +270,6 @@ export default {
 	 				type="select"
 	 				v-model="formData.verband"
 	 				@change="loadListGroup()"
-
 	 				>
 	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
 					<option

From 4b29e7bf8d163e881e65ad037738b76812c7d0b6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 Jan 2026 09:41:04 +0100
Subject: [PATCH 014/189] - refactoring js to avoid click events on option
 elements for working in chrome - backend: load fallback parameters later if
 needed to avoid warning

---
 .../controllers/api/frontend/v1/Studium.php   | 22 +++++++----
 public/js/components/Cis/Studium/Studium.js   | 38 +++++++++++++++----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index d17f0c1a1..1ec84ea8a 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -64,17 +64,25 @@ class Studium extends FHCAPI_Controller
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
 			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
 			
+/*			//load later if needed to avoid warning
 			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
 			$student_studiengang = $studentLehrverband->studiengang_kz;
-			$student_semester = $studentLehrverband->semester;
+			$student_semester = $studentLehrverband->semester;*/
+
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			
-			if(!isset($parameter_studiensemester))
-			$parameter_studiensemester = $student_studiensemester;
-			if(!isset($parameter_studiengang))
-			$parameter_studiengang = $student_studiengang;
-			if(!isset($parameter_semester))
-			$parameter_semester = $student_semester;
+			if(!isset($parameter_studiensemester)) {
+				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+				$parameter_studiensemester = $student_studiensemester;
+			}
+			if(!isset($parameter_studiengang)) {
+				$student_studiengang = $studentLehrverband->studiengang_kz;
+				$parameter_studiengang = $student_studiengang;
+			}
+			if(!isset($parameter_semester)) {
+				$student_semester = $studentLehrverband->semester;
+				$parameter_semester = $student_semester;
+			}
 			if(!isset($parameter_studienplan))
 			$parameter_studienplan = $student_studienplan;
 		}  
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 1b7aff81b..106e9a329 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -88,6 +88,27 @@ export default {
 			studienordnung.selectedIndex = newSelectIndex;
 			this.changeSelectedStudienPlan(studienordnung.value);
 		},
+		onStudiensemesterChange(event) {
+			const value = event.target.value;
+			this.setHash(value);
+			this.changeSelectedStudienSemester(value);
+
+		},
+		onStudiengangChange(event) {
+			const value = event.target.value;
+			this.setHash(value);
+			this.changeSelectedStudienGang(value);
+		},
+		onSemesterChange(event) {
+			const value = event.target.value;
+			this.setHash(value);
+			this.changeSelectedSemester(value);
+		},
+		onStudienordnungChange(event) {
+			const value = event.target.value;
+			this.setHash(value);
+			this.changeSelectedStudienPlan(value);
+		},
 		
 		storeDataToLocalStorage(key,value){
 			localStorage.setItem(key, value);
@@ -160,6 +181,7 @@ export default {
 			this.studiengaenge = studiengang.all;
 			this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
 
+
 			this.semester = semester.all;
 			this.selectedSemester = semester?.preselected;
 
@@ -284,8 +306,8 @@ export default {
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+			<select ref="studiensemester" v-model="selectedStudiensemester"  @change="onStudiensemesterChange" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')">
+				<option v-for="semester in studienSemester"  :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -299,8 +321,8 @@ export default {
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" @change="onStudiengangChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
+				<option v-for="studiengang in studiengaenge"  :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -314,8 +336,8 @@ export default {
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
+			<select ref="semester" v-model="selectedSemester" class="form-select"  @change="onSemesterChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
+				<option v-for="sem in semester" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -329,8 +351,8 @@ export default {
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
+			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select"  @change="onStudienordnungChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
+				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" :key="ordnung?.studienplan?.bezeichnung" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>

From 96dbec3218442f01aae88df34839222ebfefbb32 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 Jan 2026 10:33:53 +0100
Subject: [PATCH 015/189] refactor: use new api and factory

---
 public/js/api/factory/cis/studium.js        | 26 +++++++++++++++++++++
 public/js/components/Cis/Studium/Studium.js | 26 +++++++++++++--------
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 public/js/api/factory/cis/studium.js

diff --git a/public/js/api/factory/cis/studium.js b/public/js/api/factory/cis/studium.js
new file mode 100644
index 000000000..eed78a9ba
--- /dev/null
+++ b/public/js/api/factory/cis/studium.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAllStudienSemester(studiensemester, studiengang, semester, studienplan) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/Studium/getStudienAllSemester/',
+			params: {studiensemester, studiengang, semester, studienplan}
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 106e9a329..9c8f606df 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,5 +1,6 @@
 import LvUebersicht from "../Mylv/LvUebersicht.js";
 
+import ApiCisStudium from '../../../api/factory/cis/studium';
 
 export default {
 	data(){
@@ -118,28 +119,32 @@ export default {
 			return value;
 		},
 		changeSelectedStudienSemester(studiensemester_kurzbz) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+			return this.$api
+				.call(ApiCisStudium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung))
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienGang(studiengang_kz) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+			return this.$api
+				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz,  this.selectedSemester, this.selectedStudienordnung))
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedSemester(semester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
+			return this.$api
+				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung))
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienPlan(studienplan_id) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
+			return this.$api
+				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id))
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
@@ -278,12 +283,13 @@ export default {
 		const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
 
 		// only fetch default data if no data is stored in the local storage
-		
-		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
-		.then(data => data.data)
-		.then(res => {
-			this.extractPropertyValues(res);
-		})
+
+		this.$api
+			.call(ApiCisStudium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung))
+			.then(data => data.data)
+			.then(res => {
+				this.extractPropertyValues(res);
+			})
 
 	},
 	template: `

From 39a96885d27b7253d683e0474d6f76c3f60ef4e0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 Jan 2026 17:28:03 +0100
Subject: [PATCH 016/189] refactor v-for to avoid warning multiple keys, add
 name

---
 public/js/components/Cis/Studium/Studium.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 9c8f606df..af7692bbc 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -27,6 +27,7 @@ export default {
 
 		}
 	},
+	name: "OverviewStudiengaenge",
 	components: {
 		LvUebersicht,
 	},
@@ -343,7 +344,7 @@ export default {
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select"  @change="onSemesterChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="sem in semester" :key="semester" :value="sem">{{sem}}. Semester</option>
+				<option v-for="sem in semester" :key="sem" :value="sem">{{sem}}. Semester</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -358,7 +359,7 @@ export default {
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select"  @change="onStudienordnungChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" :key="ordnung?.studienplan?.bezeichnung" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
+				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" :key="ordnung?.studienplan?.studienplan_id" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>

From a5188ce24a0cc2121418f53b4bda5d470c9930b9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 22 Jan 2026 10:45:15 +0100
Subject: [PATCH 017/189] new component AverageGrade showing no grades if
 zeugnisnote is not existing yet

---
 .../Cis/Mylv/Semester/Studiengang.js          |   8 +-
 .../Mylv/Semester/Studiengang/AverageGrade.js |  94 ++++++++++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |   6 +-
 system/phrasesupdate.php                      | 142 ++++++++++++++++++
 4 files changed, 245 insertions(+), 5 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js

diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 15d210796..7e09f67b0 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -1,9 +1,11 @@
 import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
+import MylvSemesterStudiengangAverageGrade from "./Studiengang/AverageGrade.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
 export default {
 	components: {
-		MylvSemesterStudiengangLv
+		MylvSemesterStudiengangLv,
+		MylvSemesterStudiengangAverageGrade
 	},
 	mixins: [
 		Phrasen
@@ -29,9 +31,10 @@ export default {
 	methods: {
 		note(lv) {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
-		}
+		},
 	},
 	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>
@@ -41,6 +44,7 @@ export default {
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
+			<mylv-semester-studiengang-average-grade :lvs="lvs" />
 		</div>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js b/public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js
new file mode 100644
index 000000000..5fcc6262a
--- /dev/null
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js
@@ -0,0 +1,94 @@
+import Phrasen from "../../../../../mixins/Phrasen.js";
+
+export default {
+	mixins: [
+		Phrasen
+	],
+	props: {
+		lvs: Array,
+	},
+	data: ( ) =>{
+		return {
+			gradeAverage: null,
+			gradeWeightedAverage: null,
+			existingGrades: false
+		}
+	},
+	methods: {
+		calculateAverages(){
+			let sum = 0;
+			let count = 0;
+			let sumWeighted = 0;
+			let sumEcts = 0;
+
+			this.lvs.forEach((lv) => {
+				if ((lv.znote >= 1 && lv.znote <= 5) && lv.znote!= null) {
+					this.existingGrades = true;
+					sum+= lv.znote;
+					count++;
+					sumWeighted += lv.znote * Number(lv.ects);
+					sumEcts += Number(lv.ects);
+				}
+			});
+			this.gradeAverage = (sum/count).toFixed(2);
+			this.gradeWeightedAverage = (sumWeighted/sumEcts).toFixed(2);
+		}
+	},
+	watch: {
+		lvs: {
+			handler() {
+				this.calculateAverages();
+			},
+			deep: true,
+			immediate: true
+		}
+	},
+	mounted(){
+		this.calculateAverages();
+	},
+	template: /*html*/`
+	<div class="card mylv-semester-studiengang-grades">
+
+		<div class="card-header text-center">
+			<h6>{{$p.t('lehre/notenstatistik')}}</h6>
+		</div>
+
+		<div v-if="existingGrades">
+			<table class="card-body table w-auto mx-auto">
+			  <tbody>
+				<tr>
+				  <td class="text-end">
+					{{$p.t('lehre/headerAverage')}}
+				  </td>
+				  <td class="text-start">
+					{{ gradeAverage }}
+				  </td>
+				</tr>
+				<tr>
+				  <td class="text-end">
+					{{$p.t('lehre/headerWeightedAverage')}}
+				  </td>
+				  <td class="text-start">
+					{{ gradeWeightedAverage }}
+				  </td>
+				</tr>
+			  </tbody>
+			</table>
+		</div>
+		<div v-else class="card-body text-center">
+			<p>{{$p.t('lehre/info_noGradesYet')}}</p>
+		</div>
+
+		<div v-if="existingGrades" class="card-footer d-flex align-items-start text-muted small">
+		  <i class="fa fa-circle-info me-2 mt-1"></i>
+		  <div>
+			<strong>{{$p.t('ui', 'hinweis')}}</strong><br>
+			* {{$p.t('lehre/noticeAverage')}}
+			<br>
+			** {{$p.t('lehre/noticeWeightedAverage')}}
+		  </div>
+		</div>
+
+	</div>
+	`
+}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 3fd5e6900..a8cb2bc97 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -73,11 +73,11 @@ export default {
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
+			// no more showing of grade LV, if grade Zeugnis is not existing yet
 			if(this.benotung && this.znotebez?.length) {
 				return this.znotebez[languageIndex]
-			} else if(this.benotung && this.lvnotebez?.length) {
-				return this.lvnotebez[languageIndex]
-			} else return null
+			}
+			else return null
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ab5885b19..c4ec45ad6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -52851,6 +52851,148 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Refactor Messages END
+	// ### Start Notenstatistik
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'hinweis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hinweis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Notice',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'noticeAverage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte beachten Sie, dass außercurriculare Lehrveranstaltungen (zB Freifächer) den errechneten Notendurchschnitt verfälschen können.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please note that extracurricular courses (e.g., electives) can distort the calculated grade point average.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'noticeWeightedAverage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der gewichtete Notendurchschnitt errechnet sich aus der Note der Lehrveranstaltung, multipliziert mit deren ECTS, dividiert durch die Summe aller ECTS.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The weighted average grade is calculated by multiplying the grade of the course by its ECTS credits and dividing by the sum of all ECTS credits.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'headerAverage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notendurchschnitt* der Zeugnisnote',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Average grade* of report card grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'headerWeightedAverage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gewichteter** Notendurchschnitt* der Zeugnisnote',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Weighted** average grade* of report card grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'notenstatistik',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leistungsübersicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Performance overview',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'info_noGradesYet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden noch keine Beurteilungen eingetragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No grades have been entered yet.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ### End Notenstatistik
 );
 
 

From 0d73824727ee8d836762e4ab132b17168aed97c7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 19 Feb 2026 11:18:19 +0100
Subject: [PATCH 018/189] StgOrgLvPlan: fix bug sem, ensure loading dropdowns
 in case of propsViewData

---
 public/js/components/Cis/LvPlan/StgOrg.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index 996a599d3..be6c825da 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -142,11 +142,12 @@ export default {
 			this.$refs['calendar'].resetEventLoader();
 		},
 		loadListSem(){
-			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+			if(!this.listSem)
+				this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
 		},
 		loadListVerband(){
 			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, this.formData.verband))
 				.then(result => {
 					const data = result.data;
 					const mappedData = data.map(item => item.verband);
@@ -161,7 +162,7 @@ export default {
 		},
 		loadListGroup(){
 			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.sem, this.formData.verband))
 				.then(result => {
 					const data = result.data;
 					const mappedData = data.map(item => item.gruppe);
@@ -230,6 +231,16 @@ export default {
 			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
 			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
 			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
+
+			//ensure loading dropdown arrays for version propsView (OverviewLvPlan.js)
+			if(!this.listVerband.length)
+			{
+				this.loadListVerband();
+			}
+			if(!this.listGroup.length)
+			{
+				this.loadListGroup();
+			}
 		}
 	},
 	template: `

From b98e8313005f3f19dc31795e630c571c61876958 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 19 Feb 2026 16:31:28 +0100
Subject: [PATCH 019/189] StgOrgLvPlan: add DEFAULT_MODE_LV_PLAN to
 OverviewLvPlan

---
 public/js/components/Cis/LvPlan/OverviewLvPlan.js | 6 ++++++
 public/js/components/Cis/LvPlan/StgOrg.js         | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
index 01615ab60..e594e140f 100644
--- a/public/js/components/Cis/LvPlan/OverviewLvPlan.js
+++ b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
@@ -2,6 +2,7 @@ import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
+export const DEFAULT_MODE_LVPLAN = 'Week';
 
 export default {
 	name: "OverviewLvPlan",
@@ -116,6 +117,11 @@ export default {
 				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
 	},
 	created(){
 		this.$api
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index be6c825da..4554e7ec7 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -232,12 +232,12 @@ export default {
 			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
 			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
 
-			//ensure loading dropdown arrays for version propsView (OverviewLvPlan.js)
-			if(!this.listVerband.length)
+			//ensure loading dropdown arrays for version propsView
+			if(!this.listVerband.length && this.formData.sem)
 			{
 				this.loadListVerband();
 			}
-			if(!this.listGroup.length)
+			if(!this.listGroup.length && this.formData.verband)
 			{
 				this.loadListGroup();
 			}

From 9a0716af4423574c7bad06d1d1feab1f1c0ce9a1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 20 Feb 2026 09:18:48 +0100
Subject: [PATCH 020/189] Studium.php added fallback if no lehrverband found
 for semester

---
 .../controllers/api/frontend/v1/Studium.php   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 1ec84ea8a..c47afb8c2 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -62,12 +62,18 @@ class Studium extends FHCAPI_Controller
 
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
-			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			
-/*			//load later if needed to avoid warning
-			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-			$student_studiengang = $studentLehrverband->studiengang_kz;
-			$student_semester = $studentLehrverband->semester;*/
+
+			//TODO(Manu) check if use Fallback or just comment out all paramschecks?
+			//add Fallback: if no LehrverbandData of actual semester, get Data of previous one
+			if(!hasData($studentLehrverband))
+			{
+				$result= $this->StudiensemesterModel->getPreviousFrom($aktuelles_studiensemester->studiensemester_kurzbz);
+
+				$data = $this->getDataOrTerminateWithError($result);
+				$vorheriges_studiensemester = current($data)->studiensemester_kurzbz;
+				$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $vorheriges_studiensemester]);
+			}
+			$studentLehrverband = current(getData($studentLehrverband));
 
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			
@@ -84,7 +90,8 @@ class Studium extends FHCAPI_Controller
 				$parameter_semester = $student_semester;
 			}
 			if(!isset($parameter_studienplan))
-			$parameter_studienplan = $student_studienplan;
+				$parameter_studienplan = $student_studienplan;
+
 		}  
 
 		if(isset($parameter_studiensemester)){
@@ -104,8 +111,7 @@ class Studium extends FHCAPI_Controller
 
 		// fetch studiensemester
 		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
-		
-		
+
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){

From 2681a85fa5afeb3f653a49c7c2820798f46160d7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 20 Feb 2026 11:05:57 +0100
Subject: [PATCH 021/189] Studium.php added fallback if no lehrverband found
 for semester

---
 .../controllers/api/frontend/v1/Studium.php      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 1ec84ea8a..5abcd23e3 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -62,12 +62,18 @@ class Studium extends FHCAPI_Controller
 
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
+
+			//TODO(Manu) check if use Fallback or just comment out all paramschecks?
+			//add Fallback: if no LehrverbandData of actual semester, get Data of previous one
+			if(!hasData($studentLehrverband))
+			{
+				$result= $this->StudiensemesterModel->getPreviousFrom($aktuelles_studiensemester->studiensemester_kurzbz);
+
+				$data = $this->getDataOrTerminateWithError($result);
+				$vorheriges_studiensemester = current($data)->studiensemester_kurzbz;
+				$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $vorheriges_studiensemester]);
+			}
 			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			
-/*			//load later if needed to avoid warning
-			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-			$student_studiengang = $studentLehrverband->studiengang_kz;
-			$student_semester = $studentLehrverband->semester;*/
 
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			

From 9fd73ca34d6183cdc7bc52e8940487a1c512f0c1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Mar 2026 13:05:23 +0100
Subject: [PATCH 022/189] menu anzeigen auch wenn englischer eintrag nicht
 vorhanden ist

---
 application/models/content/Content_model.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 278022b59..fafcd5488 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -234,9 +234,7 @@ class Content_model extends DB_Model
 							FROM
 								campus.tbl_content c1
 							LEFT JOIN
-								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
-							WHERE
-								sichtbar=true
+								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? AND sichtbar=true
 						) s2
 						LEFT JOIN
 							campus.tbl_contentsprache s3 USING(content_id, sprache)

From 91d656ff60fceff533033aad245eddd06eff3e9a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 25 Mar 2026 16:11:52 +0100
Subject: [PATCH 023/189] remove unnecessary function

---
 application/libraries/dashboard/DashboardLib.php |  4 +++-
 application/models/dashboard/Dashboard_model.php | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 9b5306d94..72c7307e5 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -37,7 +37,9 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+		$result = $this->_ci->DashboardModel->loadWhere([
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
 
 		if (hasData($result))
 		{
diff --git a/application/models/dashboard/Dashboard_model.php b/application/models/dashboard/Dashboard_model.php
index 88946ed83..78f6b1100 100644
--- a/application/models/dashboard/Dashboard_model.php
+++ b/application/models/dashboard/Dashboard_model.php
@@ -11,15 +11,4 @@ class Dashboard_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard';
 		$this->pk = 'dashboard_id';
 	}
-
-
-	/**
-	 * Get Dashboard by kurzbz.
-	 * @param string dashboard_kurzbz
-	 * @return array
-	 */
-	public function getDashboardByKurzbz($dashboard_kurzbz)
-	{
-		return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
-	}
 }

From d37fac0ff74b91c9351818c07694c6b7e5af99bd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 25 Mar 2026 16:12:17 +0100
Subject: [PATCH 024/189] cleanup api calls to dashboard board

---
 .../api/frontend/v1/dashboard/Board.php       | 17 ++++++++++---
 public/js/components/Dashboard/Admin.js       | 25 +++++--------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/Board.php b/application/controllers/api/frontend/v1/dashboard/Board.php
index c50fec128..2c8c72107 100644
--- a/application/controllers/api/frontend/v1/dashboard/Board.php
+++ b/application/controllers/api/frontend/v1/dashboard/Board.php
@@ -40,11 +40,22 @@ class Board extends FHCAPI_Controller
 
 	public function list()
 	{
+		$this->DashboardModel->addSelect('dashboard_id');
+		$this->DashboardModel->addSelect('dashboard_kurzbz');
+		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
+		$this->DashboardModel->addSelect("(
+			SELECT json_agg(w.*) 
+			FROM dashboard.tbl_widget w 
+			JOIN dashboard.tbl_dashboard_widget dw 
+			USING(widget_id) 
+			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
+		) AS \"widgetSetup\"");
+
 		$result = $this->DashboardModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function create()
@@ -82,7 +93,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function delete()
@@ -116,6 +127,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 }
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index ff117a956..5222b9673 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -4,7 +4,6 @@ import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
 import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
-import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
 	name: 'DashboardAdmin',
@@ -16,7 +15,7 @@ export default {
 	provide() {
 		return {
 			adminMode: true,
-			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
+			widgetsSetup: Vue.computed(() => this.dashboard ? this.dashboard.widgetSetup : null)
 		};
 	},
 	data() {
@@ -59,7 +58,7 @@ export default {
 		dashboardUpdate(dashboard) {
 			return this.$api
 				.call(ApiDashboardBoard.update(dashboard))
-				.then(response =>{
+				.then(response => {
 
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
@@ -74,34 +73,22 @@ export default {
 				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
 					this.current = -1;
 					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-				});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
-			/*while (this.widgets.length)
-				this.widgets.pop();
-			for (var i in widgets)
-				this.widgets.push(widgets[i]);*/
 		}
 	},
 	created() {
 		this.$api
 			.call(ApiDashboardBoard.list())
 			.then(result => {
-				this.dashboards = result.data.retval;
+				this.dashboards = result.data;
 				for (const dashboard of this.dashboards) {
-					this.$api
-						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
-						.then(res => {
-							dashboard.widgetSetup = res.data;
-						})
-						.catch(this.$fhcAlert.handleSystemError);
+					dashboard.widgetSetup = JSON.parse(dashboard.widgetSetup);
 				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);

From 00e019d6fef6e5839e9bc7ff40cf4c1b0558b61f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 26 Mar 2026 15:21:41 +0100
Subject: [PATCH 025/189] cleanup db data

---
 .../api/frontend/v1/dashboard/Preset.php      | 11 +--
 .../api/frontend/v1/dashboard/User.php        | 54 ++---------
 .../libraries/dashboard/DashboardLib.php      | 67 ++++----------
 public/js/components/Dashboard/Dashboard.js   |  4 +-
 system/dbupdate_3.4.php                       |  1 +
 .../dbupdate_3.4/68530_Dashboard_Cleanup.php  | 91 +++++++++++++++++++
 6 files changed, 124 insertions(+), 104 deletions(-)
 create mode 100644 system/dbupdate_3.4/68530_Dashboard_Cleanup.php

diff --git a/application/controllers/api/frontend/v1/dashboard/Preset.php b/application/controllers/api/frontend/v1/dashboard/Preset.php
index 5983d9660..d9be307cf 100644
--- a/application/controllers/api/frontend/v1/dashboard/Preset.php
+++ b/application/controllers/api/frontend/v1/dashboard/Preset.php
@@ -120,10 +120,7 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
+				$result[$funktion] = $preset;
 			} else {
 				$result[$funktion] = [];
 			}
@@ -154,7 +151,7 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
+		$preset_decoded[$widget['widgetid']] = $widget;
 
 		$preset->preset = json_encode($preset_decoded);
 
@@ -186,8 +183,10 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 
-		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		if (!isset($preset_decoded[$widgetid]))
 			show_404();
+		
+		unset($preset_decoded[$widgetid]);
 
 		$preset->preset = json_encode($preset_decoded);
 
diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 9d020649e..0dee430d7 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -48,25 +48,9 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;
 
-		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
 
-		$this->terminateWithSuccess([
-			'general' => call_user_func_array(
-				'array_merge_recursive',
-				$mergedconfig
-			)
-		]);*/
-		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
-		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
-
-		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
-		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
-
-		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
-
-		$this->terminateWithSuccess([
-			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
-		]);
+		$this->terminateWithSuccess($mergedconfig);
 	}
 
 	public function addWidget()
@@ -87,25 +71,11 @@ class User extends FHCAPI_Controller
 			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
 
 		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
+
 		$override_decoded = json_decode($override->override, true);
 
-		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
-			$override_decoded['general'] = [];
+		$override_decoded[$widget['widgetid']] = $widget;
 
-		 if (!isset($override_decoded['general']['widgets']))
-				$override_decoded['general']['widgets'] = [];
-
-		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
-
-		// NOTE(chris): remove doubles in other funktionen
-		foreach ($override_decoded as $funktion => $array) {
-			if ($funktion == 'general')
-				continue;
-			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
-				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
-		}
-		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -135,18 +105,10 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		foreach (array_keys($override_decoded) as $k) {
-			if (!isset($override_decoded[$k]["widgets"])) {
-				unset($override_decoded[$k]);
-				continue;
-			}
-			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
-				unset($override_decoded[$k]["widgets"][$widget_id]);
-			}
-			if (!$override_decoded[$k]["widgets"]) {
-				unset($override_decoded[$k]);
-			}
-		}
+		if (!isset($override_decoded[$widget_id]))
+			show_404();
+		
+		unset($override_decoded[$widget_id]);
 
 		$override->override = json_encode($override_decoded);
 				
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 7bd85867d..c9838f0e7 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -49,17 +49,21 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedConfig($dashboard_id, $uid)
+	public function getMergedUserConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id);
-		$userconfig = $this->getUserConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
+		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
 		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+		$sourceconfig = array_map(function ($value) {
+			return ['source' => $value['source']];
+		}, $defaultconfig);
+		
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
 		
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id)
+	protected function getUserBaseConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -89,7 +93,11 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
+					$preset = array_map(function ($value) use ($presetobj) {
+						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+						return $value;
+					}, $preset);
+					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -97,7 +105,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	public function getUserConfig($dashboard_id, $uid)
+	protected function getUserOverrideConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -126,7 +134,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
+		$emptyoverride->override = '[]';
 		
 		return $emptyoverride;
 	}
@@ -145,8 +153,7 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
+		$emptypreset->preset = '[]';
 		
 		return $emptypreset;
 	}
@@ -211,44 +218,4 @@ class DashboardLib
 		
 		return $result;
 	}
-
-	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
-	{
-		foreach ($addwigets as $widget)
-		{
-			if(!isset($widget['widgetid']))
-			{
-				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
-			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
-		}
-	}
-	
-	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
-	{
-		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
-		{
-			$widgets[$section] = array();
-			$widgets[$section]["widgets"] = array();
-		}
-		
-		$widgets[$section]["widgets"][$widgetid] = $widget;
-	}
-	
-	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
-	{
-		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
-		{
-			unset($widgets[$section]["widgets"][$widgetid]);
-			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
-				unset($widgets[$section]);
-			}
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
 }
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e92e34f29..c7a45c2a8 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -138,8 +138,8 @@ export default {
 				const widgets = [];
 				const remove = [];
 
-				for (var wid in res.data.general.widgets) {
-					let widget = res.data.general.widgets[wid];
+				for (var wid in res.data) {
+					let widget = res.data[wid];
 					widget.id = wid;
 					if (widget.custom || widget.preset) {
 						widgets.push(widget);
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 4ddb38203..5fd66506b 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -92,6 +92,7 @@ require_once('dbupdate_3.4/68744_StV_settings.php');
 require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
 require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
+require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/68530_Dashboard_Cleanup.php b/system/dbupdate_3.4/68530_Dashboard_Cleanup.php
new file mode 100644
index 000000000..918711211
--- /dev/null
+++ b/system/dbupdate_3.4/68530_Dashboard_Cleanup.php
@@ -0,0 +1,91 @@
+<?php
+/* Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christopher Hacker <christopher.hacker@technikum-wien.at>,
+ *
+ * Description:
+ * Cleanup Dashboard DB data
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Cleanup presets
+if ($result = @$db->db_query("
+	SELECT 1 
+	FROM dashboard.tbl_dashboard_preset 
+	WHERE preset ? COALESCE(funktion_kurzbz, 'general') 
+	OR preset ? 'custom' 
+	LIMIT 1
+")) {
+	if ($db->db_num_rows($result)) {
+		$qry = "
+			UPDATE dashboard.tbl_dashboard_preset 
+			SET preset = COALESCE(preset->COALESCE(funktion_kurzbz, 'general'), preset->'custom')->'widgets'
+			WHERE preset ? COALESCE(funktion_kurzbz, 'general') 
+			OR preset ? 'custom' 
+		";
+
+		$result = $db->db_query($qry);
+
+		if (!$result) {
+			echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
+		} else {
+			$affected_rows = $db->db_affected_rows($result);
+			echo 'dashboard.tbl_dashboard_preset: ' . $affected_rows . ' rows migrated<br>';
+		}
+	}
+}
+
+// Cleanup user overrides
+if ($result = @$db->db_query("
+	SELECT 1
+	FROM dashboard.tbl_dashboard_benutzer_override
+	WHERE EXISTS (
+		SELECT 1
+		FROM jsonb_each(override)
+		WHERE value ? 'widgets'
+		LIMIT 1
+	) AND override <> '[]'::jsonb
+	LIMIT 1
+")) {
+	if ($db->db_num_rows($result)) {
+		$qry = "
+			UPDATE dashboard.tbl_dashboard_benutzer_override 
+			SET override = COALESCE((
+				SELECT json_object_agg(key, value) FROM (
+					SELECT value->'widgets' AS widgets 
+					FROM jsonb_each(override) 
+					WHERE jsonb_typeof(value->'widgets') = 'object'
+				) x, jsonb_each(widgets)
+			), '[]')
+			WHERE EXISTS (
+			    SELECT 1
+			    FROM jsonb_each(override)
+			    WHERE value ? 'widgets'
+			    LIMIT 1
+			) AND override <> '[]'::jsonb
+		";
+
+		$result = $db->db_query($qry);
+
+		if (!$result) {
+			echo '<strong>dashboard.tbl_dashboard_benutzer_override '.$db->db_last_error().'</strong><br>';
+		} else {
+			$affected_rows = $db->db_affected_rows($result);
+			echo 'dashboard.tbl_dashboard_benutzer_override: ' . $affected_rows . ' rows migrated<br>';
+		}
+	}
+}

From d421b1ccb81bf5f5c0adf343e0458ad3895b6c22 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 09:29:05 +0200
Subject: [PATCH 026/189] cleanup dropgrid code

---
 public/js/components/Drop/Grid.js      | 145 ++++++++++---------------
 public/js/components/Drop/Grid/Item.js |  39 +++----
 2 files changed, 74 insertions(+), 110 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index a7bea64e3..c4720781d 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -1,5 +1,3 @@
-// TODO(chris): Comments
-
 import GridItem from './Grid/Item.js';
 import GridLogic from '../../composables/GridLogic.js';
 
@@ -13,6 +11,12 @@ export default {
 	components: {
 		GridItem,
 	},
+	inject: {
+		sectionName: {
+			type: String,
+			default: '',
+		}
+	},
 	props: {
 		cols: Number,
 		items: Array,
@@ -26,7 +30,7 @@ export default {
 			type: Number,
 			default: 0
 		},
-		additionalRow:{
+		additionalRow: {
 			type: Boolean,
 			default: false,
 		}
@@ -50,18 +54,12 @@ export default {
 			permUpdates: [],
 			positionUpdates: null,
 			fixedPositionUpdates: null,
-			draggedOffset: [0,0],
+			draggedOffset: [0, 0],
 			draggedItem: null,
 			draggedNode: null,
 			reorderedItems:[],
 			clonedWidget:null,
-		}
-	},
-	inject:{
-		sectionName: {
-			type: String,
-			default: '',
-		},
+		};
 	},
 	computed: {
 		additionalRowComputed: {
@@ -86,7 +84,7 @@ export default {
 			});	
 			return items
 		},
-		items_placeholders(){
+		items_placeholders() {
 			let placeholders = [];
 			let col_max = this.cols;
 			let rows_max = this.rows;
@@ -133,7 +131,6 @@ export default {
 					return this.grid ? (this.grid.h+1) : 1;
 			}
 			return this.grid ? this.grid.h : 1;
-			
 		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;
@@ -218,14 +215,12 @@ export default {
 				return false;
 			return this.grid.isFreeSlot(this.x, this.y);
 		},
-		widgetSetup(){
-			if (!this.widgetsSetup)
-				return;
-			return this.widgetsSetup.reduce((acc, ele) => { 
-				acc[ele.widget_id] =ele;
-				return acc;
-			} ,{});
-		},
+		currentItems() {
+			if (this.mode != 1 && this.mode != 2 && this.active)
+				return this.placedItems_withPlaceholders;
+
+			return this.placedItems;
+		}
 	},
 	watch: {
 		active(active) {
@@ -256,22 +251,22 @@ export default {
 		}
 	},
 	methods: {
-		needsReordering(item){
+		needsReordering(item) {
 			if (!item?.data?.place[this.cols]){
 				return true;
 			}
 			return false;
 		},
-		toggleDraggedItemOverlay(condition){
-			if(!this.draggedNode)
+		toggleDraggedItemOverlay(condition) {
+			if (!this.draggedNode)
 				return;
-			if(condition){
+			if (condition) {
 				this.draggedNode.firstElementChild.classList.add("dashboard-item-overlay");
-			}else{
+			} else {
 				this.draggedNode.firstElementChild.classList.remove("dashboard-item-overlay");
 			}
 		},
-		dragging(event){
+		dragging(event) {
 			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
 				
@@ -313,7 +308,7 @@ export default {
 			sortedItems.forEach(item => {
 				let freeSlots = this.grid.getFreeSlots();
 				
-				if(this.needsReordering(item)){
+				if (this.needsReordering(item)) {
 					let firstFreeSlot = freeSlots.shift();
 					if (!firstFreeSlot) {
 						item.x = 0;
@@ -354,7 +349,6 @@ export default {
 			return result;
 		},
 		convertGridResultToUpdate(input, output, baseArray) {
-			
 			if (!input)
 				return;
 			if (!baseArray)
@@ -374,13 +368,6 @@ export default {
 				output[item.index] = result;
 			});
 		},
-		mouseLeave() {
-			/* if (this.mode == MODE_IDLE) {
-				this.x = -1;
-				this.y = -1;
-				
-			}  */
-		},
 		updateCursor(evt) {
 			if (!this.active) {
 				this.x = this.y = -1;
@@ -415,7 +402,6 @@ export default {
 			}
 		},
 		startMove(evt, item) {
-			
 			if (!this.active)
 				return;
 			
@@ -458,7 +444,7 @@ export default {
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
-			if(this.mode == MODE_RESIZE){
+			if (this.mode == MODE_RESIZE) {
 				this.checkWidgetSizeLimitAnimation();
 			}
 			if (this.updateCursor(evt)) {
@@ -505,7 +491,6 @@ export default {
 			this.draggedItem = null;
 			this.$emit('draggedItem',null);
 			this.draggedNode = null;
-			
 		},
 		dragEnd() {
 			this.removeWidgetClones();
@@ -554,14 +539,14 @@ export default {
 			this.additionalRowComputed = false;
 			this.$emit('newItem', this.x, this.y);
 		},
-		updateCursorOnMouseMove(evt){
-			if(this.mode == MODE_IDLE){
+		updateCursorOnMouseMove(evt) {
+			if(this.mode == MODE_IDLE) {
 				this.updateCursor(evt);
 			}
 		},
-		checkPinnedWidgetAnimation(){
-			let itemAtPosition=[];
-			switch(this.mode){
+		checkPinnedWidgetAnimation() {
+			let itemAtPosition = [];
+			switch (this.mode) {
 				case MODE_RESIZE:
 					for (let x = this.draggedItem.x; x <= this.x; x++) {
 						for (let y = this.draggedItem.y; y <= this.y; y++) {
@@ -580,9 +565,9 @@ export default {
 			
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");
-			})
+			});
 
-			itemAtPosition.forEach(item=>{
+			itemAtPosition.forEach(item => {
 				if (item.place[this.cols] && item.place[this.cols].pinned) {
 					let pinnedWidget = document.getElementById(item.widgetid);
 					let pinNode = pinnedWidget.querySelector("[pinned='true']");
@@ -590,10 +575,9 @@ export default {
 						pinNode.classList.add("denied-dragging-animation");
 					}
 				}	
-			})
+			});
 		},
 		checkWidgetSizeLimitAnimation() {
-
 			let draggedItemSetup = this.itemsSetup[this.draggedItem.data.widget];
 			let draggedItemMaxWidth = draggedItemSetup.width.max ?? draggedItemSetup.width;
 			let draggedItemMinWidth = draggedItemSetup.width.min ?? draggedItemSetup.width;
@@ -603,7 +587,7 @@ export default {
 
 			let width_after_resize = this.x - this.draggedItem.x + 1; 
 			let height_after_resize = this.y - this.draggedItem.y + 1; 
-			if(  
+			if (
 				(width_after_resize > 0 && (width_after_resize > draggedItemMaxWidth
 				|| width_after_resize < draggedItemMinWidth)
 				)
@@ -611,26 +595,26 @@ export default {
 				(height_after_resize > 0 && (height_after_resize > draggedItemMaxHeight
 				|| height_after_resize < draggedItemMinHeight)
 				)
-			){
+			) {
 				draggedItemNode.classList.add("border-danger");
-			}else{
+			} else {
 				draggedItemNode.classList.remove("border-danger");
 			}
 		},
-		removeWidgetClones(){
+		removeWidgetClones() {
 			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
 			for (let i = 0; i < widgetClones.length; i++) {
 				this.$refs.container.removeChild(widgetClones[i]);
 			}
 		},
-		mouseDown(){
+		mouseDown() {
 			this.mode = MODE_MOUSE_DOWN;
 		},
 		mouseUp() {
 			this.mode = MODE_IDLE;
 		},
 	},
-	template: `
+	template: /* html */`
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"
@@ -638,24 +622,16 @@ export default {
 		@touchmove="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
-		@drop="dragEnd($event)"
+		@drop="dragEnd"
 		@mousemove="updateCursorOnMouseMove"
-		@mouseleave="mouseLeave">
-		<TransitionGroup tag="div">
+	>
+		<TransitionGroup>
 			<grid-item
 				ref="gridItems"
-				v-for="(item,index) in ((mode != 1 && mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item, index) in currentItems"
 				:key="item.data.id"
-				:item="item"
-				@start-move="startMove"
-				@mouse-down="mouseDown"
-				@mouse-up="mouseUp"
-				@start-resize="startResize"
-				@dragging="dragging"
-				@end-drag="dragEnd"
-				@touch-end="dragEnd();mouseUp();"
-				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
 				class="position-absolute"
+				:item="item"
 				:active="active"
 				:style="{
 					zIndex: item.resizeOverlay ? 1 : 'auto',
@@ -666,29 +642,24 @@ export default {
 					paddingTop: 'var(--fhc-dg-item-padding-top)',
 					paddingLeft: 'var(--fhc-dg-item-padding-horizontal)',
 					paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
-				}">
+				}"
+				@start-move="startMove"
+				@mouse-down="mouseDown"
+				@mouse-up="mouseUp"
+				@start-resize="startResize"
+				@dragging="dragging"
+				@end-drag="dragEnd"
+				@touch-end="dragEnd();mouseUp();"
+				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
+			>
 				<template v-slot="item">
-					<slot v-bind="{...item, ...item.data, index:index}" :x="item.x" :y="item.y" ></slot>
+					<slot
+						v-bind="{ ...item, ...item.data, index: index }"
+						:x="item.x"
+						:y="item.y"
+					></slot>
 				</template>
 			</grid-item>
 		</TransitionGroup>
-		
 	</div>`
 }
-
-/*
-OLD VERSION - ON HOVER
-<div
-	v-if="showEmptyTileHover"
-	class="position-absolute d-flex justify-content-center align-items-center"
-	:style="{
-		cursor: 'pointer',
-		top: 'calc(' + y + ' * var(--fhc-dg-row-height))',
-		left: 'calc(' + x + ' * var(--fhc-dg-col-width))',
-		width: 'var(--fhc-dg-col-width)',
-		height: 'var(--fhc-dg-row-height)'
-	}"
-	@click="emptyTileClicked">
-	<slot :x="x" :y="y" name="empty-tile-hover"></slot>
-</div>
-*/
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index bd256a1fb..49f2bbbcf 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -1,9 +1,5 @@
 export default {
 	name:'GridItem',
-	components: {
-	},
-	inject: {
-	},
 	props: {
 		item: Object,
 		active: Boolean
@@ -15,18 +11,14 @@ export default {
 		"startResize",
 		"dragging",
 		"endDrag",
-		"dropDrag",
-		"item",
 		"touchStart",
-		"touchEnd",
+		"touchEnd"
 	],
 	data() {
 		return {
 			dragAction: '',
 			dragging: false
-		}
-	},
-	computed: {
+		};
 	},
 	methods: {
 		registerDragAction(evt) {
@@ -42,16 +34,15 @@ export default {
 				}
 			}
 		},
-		tryDragStart(evt, item) {
+		tryDragStart(evt) {
 			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
 			if (dragAction) {
 				this.dragging = true;
 				if (dragAction == 'move')
-					return this.$emit('startMove', evt, item);
+					return this.$emit('startMove', evt, this.item);
 				else if (dragAction == 'resize')
-					return this.$emit('startResize', evt, item);
+					return this.$emit('startResize', evt, this.item);
 			}
-			//evt.preventDefault();
 		},
 		touchDragEnd(evt) {
 			if (!this.dragging)
@@ -59,30 +50,32 @@ export default {
 			this.dragging = false;
 			this.$emit('touchEnd', evt);
 		},
-		touchStart(event){
+		touchStart(event) {
 			this.$emit('touchStart', event); 
 			this.registerDragAction(event); 
-			this.tryDragStart(event, this.item);
+			this.tryDragStart(event);
 		},
-		touchMove(event){
-			if(this.dragging){
+		touchMove(event) {
+			if (this.dragging){
 				event.preventDefault();
 				this.$emit('dragging', event);
 			}
 		}
 		
 	},
-	template: `
-	<div class="drop-grid-item"
+	template: /* html */`
+	<div
+		class="drop-grid-item"
+		:draggable="active && !item.placeholder"
 		@mousedown="registerDragAction"
 		@mouseup="$emit('mouseUp', $event)"
 		@touchstart="touchStart"
 		@touchend="touchDragEnd"
-		@dragstart="tryDragStart($event, item)"
-		@drag="$emit('dragging',$event)"
+		@dragstart="tryDragStart"
+		@drag="$emit('dragging', $event)"
 		@touchmove="touchMove"
 		@dragend="$emit('endDrag', $event); dragging = false"
-		:draggable="active && !item.placeholder">
+	>
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 2354746d4f224283c2ba6531577876aa8eca9b42 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 13:34:34 +0200
Subject: [PATCH 027/189] more cleanup of dropgrid code & cleanup of dashboard
 item code

---
 public/js/components/Dashboard/Item.js | 230 ++++++++++++++-----------
 public/js/components/Drop/Grid.js      |  29 ++--
 public/js/components/Drop/Grid/Item.js |   2 +-
 3 files changed, 139 insertions(+), 122 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 79e61293d..956ff5ddf 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -11,18 +11,15 @@ export default {
 	data: () => ({
 		component: "",
 		arguments: null,
-		target: false,
 		widget: null,
 		tmpConfig: {},
 		isLoading: false,
 		hasConfig: false,
-		sharedData: null,
+		sharedData: null
 	}),
 	emits: [
 		"change",
 		"remove",
-		"dragstart",
-		"resizestart",
 		"configOpened",
 		"configClosed",
 		"pinItem",
@@ -42,29 +39,25 @@ export default {
 		"place",
 		"setup",
 		"dragstate",
-		"resizeOverlay",
-		"additionalRow"
+		"resizeOverlay"
 	],
 	computed: {
-		maxHeight(){
+		maxHeight() {
+			if (Object.prototype.toString.call(this.setup?.height) == "[object Number]") {
+				return this.setup?.height;
+			}
 			return this.setup?.height?.max;
 		},
-		maxWidth(){
-			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]"){
+		maxWidth() {
+			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]") {
 				return this.setup?.width;
 			}
 			return this.setup?.width?.max;
 		},
-		minHeight() {
-			return this.setup?.height?.min;
+		isResizeable() {
+			return this.maxWidth > 1 || this.maxHeight > 1;
 		},
-		minWidth() {
-			return this.setup?.width?.min;
-		},
-		isResizeable(){
-			return this.maxWidth >1 || this.maxHeight >1;
-		},
-		isPinned(){
+		isPinned() {
 			return this.place?.pinned ? true : false;
 		},
 		ready() {
@@ -80,16 +73,16 @@ export default {
 		}
 	},
 	methods: {
-		unpin(){
+		unpin() {
 			// Unpinning is only possible in edit mode
-			if(!this.editMode)
+			if (!this.editMode)
 				return;
 			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
 			this.$emit('unPinItem', [result]);
 		},
-		pinItem(){
-			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y};
-			this.$emit('pinItem',[result]);
+		pinItem() {
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			this.$emit('pinItem', [result]);
 		},
 		getWidgetC4Link(widget) {
 			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -101,22 +94,6 @@ export default {
 		handleHideBsModal() {
 			this.$emit('configClosed')
 		},
-		mouseDown(e) {
-			this.target = e.target;
-		},
-		startDrag(e) {
-			if (this.$refs.dragHandle.contains(this.target)) {
-				this.$emit("dragstart", e);
-			} else if (
-				this.isResizeable &&
-				this.$refs.resizeHandle.contains(this.target)
-			) {
-				if (this.isResizeable) this.$emit("resizestart", e);
-				else e.preventDefault();
-			} else {
-				e.preventDefault();
-			}
-		},
 		openConfig() {
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config.show();
@@ -136,11 +113,11 @@ export default {
 		sendChangeConfig(config) {
 			for (var k in config) {
 				if (this.widget.arguments[k] == config[k]) {
-				delete config[k];
+					delete config[k];
 				}
 			}
 			this.$emit("change", config);
-		},
+		}
 	},
 	watch: {
 		config() {
@@ -170,75 +147,118 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
-	<div v-show="!dragstate" class="h-100 card border-0">
-		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
-			<Transition>
-				<span type="button" v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move" aria-label="move widget" v-tooltip="{showDelay:1000, value:'move widget'}"><i class="fa-solid fa-grip-vertical" aria-hidden="true"></i></span>
-			</Transition>
-			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
-			<template v-if="isPinned">
-				<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
-					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
-				</div>
-				<div v-else class="col-auto me-2">
-					<i class="fa-solid fa-thumbtack "></i>
-				</div>
-			</template>
-			<template v-else>
-				<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
-					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
-				</div>
-			</template>
-			<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto ">
-          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
-          	</a>
-			<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
-			<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
-				<i class="fa-solid fa-trash" aria-hidden="true"></i>
-			</a>
-			<Transition>
-				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
-				</div>
-			</Transition>
-		</div>
-		<div v-if="ready" class="card-body overflow-hidden p-0">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
-		</div>
-		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
-			<template v-slot:title>
-				{{ widget ? 'Config for ' + widget.setup.name : '' }}
-			</template>
-			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-			</template>
-			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
-			</template>
-		</bs-modal>
-		<height-transition>
-			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
-				<template v-if="maxWidth < 2">
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ns-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i  class="fa-solid fa-up-down pe-2" aria-hidden="true"></i>
-					</span>
-				</template>
-				<template v-else-if="maxHeight < 2">
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ew-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i class="fa-solid fa-left-right pe-2" aria-hidden="true"></i>
+	<div
+		v-else-if="!hidden || editMode"
+		:id="widgetID"
+		class="dashboard-item card overflow-hidden h-100 position-relative"
+		:class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
+	>
+		<div v-show="!dragstate" class="h-100 card border-0">
+			<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
+				<Transition>
+					<span
+						v-if="editMode && !isPinned"
+						type="button"
+						drag-action="move"
+						class="col-auto mx-2 px-2 cursor-move"
+						aria-label="move widget"
+						v-tooltip="{showDelay:1000, value:'move widget'}"
+					>
+						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
+				</Transition>
+				<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+				<template v-if="isPinned">
+					<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+						<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
+					</div>
+					<div v-else class="col-auto me-2">
+						<i class="fa-solid fa-thumbtack "></i>
+					</div>
 				</template>
 				<template v-else>
-					<span type="button" drag-action="resize" class="col-auto px-1 cursor-nw-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
-						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x" aria-hidden="true"></i>
-					</span>
+					<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
+						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
+					</div>
 				</template>
+				<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto">
+	          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
+	          	</a>
+				<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
+				<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
+					<i class="fa-solid fa-trash" aria-hidden="true"></i>
+				</a>
+				<Transition>
+					<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
+						<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
+					</div>
+				</Transition>
 			</div>
-		</height-transition>
+			<div v-if="ready" class="card-body overflow-hidden p-0">
+				<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			</div>
+			<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+			<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
+				<template v-slot:title>
+					{{ widget ? 'Config for ' + widget.setup.name : '' }}
+				</template>
+				<template v-slot:default>
+					<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+					<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+				</template>
+				<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
+					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+					<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+				</template>
+			</bs-modal>
+			<height-transition>
+				<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
+					<template v-if="maxWidth < 2">
+						<span
+							type="button"
+							drag-action="resize"
+							class="col-auto px-1 cursor-ns-resize"
+							aria-label="resize widget"
+							v-tooltip="{showDelay:1000, value:'resize widget'}"
+						>
+							<i
+								class="fa-solid fa-up-down pe-2"
+								aria-hidden="true"
+							></i>
+						</span>
+					</template>
+					<template v-else-if="maxHeight < 2">
+						<span
+							type="button"
+							drag-action="resize"
+							class="col-auto px-1 cursor-ew-resize"
+							draggable="true"
+							aria-label="resize widget"
+							v-tooltip="{showDelay:1000, value:'resize widget'}"
+						>
+							<i
+								class="fa-solid fa-left-right pe-2"
+								aria-hidden="true"
+							></i>
+						</span>
+					</template>
+					<template v-else>
+						<span
+							type="button"
+							drag-action="resize"
+							class="col-auto px-1 cursor-nw-resize"
+							draggable="true"
+							aria-label="resize widget"
+							v-tooltip="{showDelay:1000, value:'resize widget'}"
+						>
+							<i
+								class="fa-solid fa-up-right-and-down-left-from-center mirror-x"
+								aria-hidden="true"
+							></i>
+						</span>
+					</template>
+				</div>
+			</height-transition>
 		</div>
 	</div>`,
 };
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index c4720781d..8f048de94 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -32,7 +32,7 @@ export default {
 		},
 		additionalRow: {
 			type: Boolean,
-			default: false,
+			default: false
 		}
 	},
 	emits: [
@@ -57,8 +57,8 @@ export default {
 			draggedOffset: [0, 0],
 			draggedItem: null,
 			draggedNode: null,
-			reorderedItems:[],
-			clonedWidget:null,
+			reorderedItems: [],
+			clonedWidget: null,
 		};
 	},
 	computed: {
@@ -73,7 +73,7 @@ export default {
 		items_hashmap() {
 			let items = {};
 			this.items.forEach(item => {
-				if (this.reorderedItems.length > 0 && this.needsReordering(item)){
+				if (this.reorderedItems.length > 0 && this.needsReordering(item)) {
 						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
 						if (rearrangedPosition) {			
 							item.x = rearrangedPosition.x;
@@ -128,7 +128,7 @@ export default {
 		},
 		rows() {
 			if (this.additionalRowComputed) {
-					return this.grid ? (this.grid.h+1) : 1;
+				return this.grid ? (this.grid.h+1) : 1;
 			}
 			return this.grid ? this.grid.h : 1;
 		},
@@ -252,7 +252,7 @@ export default {
 	},
 	methods: {
 		needsReordering(item) {
-			if (!item?.data?.place[this.cols]){
+			if (!item?.data?.place[this.cols]) {
 				return true;
 			}
 			return false;
@@ -267,7 +267,7 @@ export default {
 			}
 		},
 		dragging(event) {
-			if(this.mode == MODE_MOVE){
+			if (this.mode == MODE_MOVE) {
 				this.toggleDraggedItemOverlay(true);
 				
 				const containerRect = this.$refs.container.getBoundingClientRect();
@@ -292,13 +292,11 @@ export default {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
 			let sortedItems = [...items].sort((a, b) => {
-				if(this.needsReordering(a) && this.needsReordering(b)){
+				if (this.needsReordering(a) && this.needsReordering(b)) {
 					return 0;
-				}
-				else if(this.needsReordering(a)){
+				} else if (this.needsReordering(a)) {
 					return 999;
-				}
-				else if(this.needsReordering(b)){
+				} else if (this.needsReordering(b)) {
 					return -999;
 				}
 				
@@ -313,12 +311,11 @@ export default {
 					if (!firstFreeSlot) {
 						item.x = 0;
 						item.y = this.grid.h;
-					}else{
+					} else {
 						item.x = firstFreeSlot.x;
 						item.y = firstFreeSlot.y;
 					}
 					reorderedItems.push(item);
-					
 				}
 				if (item.x + item.w > this.cols) {
 					let targetW = this.cols-item.x,
@@ -496,7 +493,7 @@ export default {
 			this.removeWidgetClones();
 			this.toggleDraggedItemOverlay(false);
 			
-			if (this.mode == MODE_IDLE){
+			if (this.mode == MODE_IDLE) {
 				return;
 			}
 			// clean up unused classes
@@ -540,7 +537,7 @@ export default {
 			this.$emit('newItem', this.x, this.y);
 		},
 		updateCursorOnMouseMove(evt) {
-			if(this.mode == MODE_IDLE) {
+			if (this.mode == MODE_IDLE) {
 				this.updateCursor(evt);
 			}
 		},
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 49f2bbbcf..5dff64aaa 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -56,7 +56,7 @@ export default {
 			this.tryDragStart(event);
 		},
 		touchMove(event) {
-			if (this.dragging){
+			if (this.dragging) {
 				event.preventDefault();
 				this.$emit('dragging', event);
 			}

From dec83bbd21b357bfc01478b8a5ab78640c8ded7f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 13:37:26 +0200
Subject: [PATCH 028/189] move draggable from item to the buttons

---
 public/js/components/Dashboard/Item.js | 2 ++
 public/js/components/Drop/Grid/Item.js | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 956ff5ddf..0cc274b70 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -161,6 +161,7 @@ export default {
 						type="button"
 						drag-action="move"
 						class="col-auto mx-2 px-2 cursor-move"
+						draggable="true"
 						aria-label="move widget"
 						v-tooltip="{showDelay:1000, value:'move widget'}"
 					>
@@ -218,6 +219,7 @@ export default {
 							type="button"
 							drag-action="resize"
 							class="col-auto px-1 cursor-ns-resize"
+							draggable="true"
 							aria-label="resize widget"
 							v-tooltip="{showDelay:1000, value:'resize widget'}"
 						>
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 5dff64aaa..3e8e3dac9 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -66,7 +66,6 @@ export default {
 	template: /* html */`
 	<div
 		class="drop-grid-item"
-		:draggable="active && !item.placeholder"
 		@mousedown="registerDragAction"
 		@mouseup="$emit('mouseUp', $event)"
 		@touchstart="touchStart"

From 3fe15a302c943095c5d1f59a1fa7b87ea8b4fd9e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 14:14:06 +0200
Subject: [PATCH 029/189] correct calculation of allowed resize directions

---
 public/js/components/Dashboard/Item.js    | 136 +++++++++++++---------
 public/js/components/Dashboard/Section.js |  17 ++-
 2 files changed, 88 insertions(+), 65 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 0cc274b70..196329377 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -37,25 +37,49 @@ export default {
 		"loading",
 		"item_data",
 		"place",
-		"setup",
+		"resizeLimits",
 		"dragstate",
 		"resizeOverlay"
 	],
 	computed: {
-		maxHeight() {
-			if (Object.prototype.toString.call(this.setup?.height) == "[object Number]") {
-				return this.setup?.height;
+		isResizeableHorizontal() {
+			if (this.resizeLimits.width === undefined)
+				return true;
+
+			if (Object.prototype.toString.call(this.resizeLimits.width) == "[object Number]")
+				return false;
+
+			if (this.resizeLimits.width.min === undefined) {
+				if (this.resizeLimits.width.max === undefined)
+					return true;
+				return this.resizeLimits.width.max > 1;
 			}
-			return this.setup?.height?.max;
+
+			if (this.resizeLimits.width.max === undefined)
+				return true;
+
+			return this.resizeLimits.width.max > this.resizeLimits.width.min;
 		},
-		maxWidth() {
-			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]") {
-				return this.setup?.width;
+		isResizeableVertical() {
+			if (this.resizeLimits.height === undefined)
+				return true;
+
+			if (Object.prototype.toString.call(this.resizeLimits.height) == "[object Number]")
+				return false;
+
+			if (this.resizeLimits.height.min === undefined) {
+				if (this.resizeLimits.height.max === undefined)
+					return true;
+				return this.resizeLimits.height.max > 1;
 			}
-			return this.setup?.width?.max;
+
+			if (this.resizeLimits.height.max === undefined)
+				return true;
+
+			return this.resizeLimits.height.max > this.resizeLimits.height.min;
 		},
 		isResizeable() {
-			return this.maxWidth > 1 || this.maxHeight > 1;
+			return this.isResizeableVertical || this.isResizeableHorizontal;
 		},
 		isPinned() {
 			return this.place?.pinned ? true : false;
@@ -213,52 +237,52 @@ export default {
 				</template>
 			</bs-modal>
 			<height-transition>
-				<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
-					<template v-if="maxWidth < 2">
-						<span
-							type="button"
-							drag-action="resize"
-							class="col-auto px-1 cursor-ns-resize"
-							draggable="true"
-							aria-label="resize widget"
-							v-tooltip="{showDelay:1000, value:'resize widget'}"
-						>
-							<i
-								class="fa-solid fa-up-down pe-2"
-								aria-hidden="true"
-							></i>
-						</span>
-					</template>
-					<template v-else-if="maxHeight < 2">
-						<span
-							type="button"
-							drag-action="resize"
-							class="col-auto px-1 cursor-ew-resize"
-							draggable="true"
-							aria-label="resize widget"
-							v-tooltip="{showDelay:1000, value:'resize widget'}"
-						>
-							<i
-								class="fa-solid fa-left-right pe-2"
-								aria-hidden="true"
-							></i>
-						</span>
-					</template>
-					<template v-else>
-						<span
-							type="button"
-							drag-action="resize"
-							class="col-auto px-1 cursor-nw-resize"
-							draggable="true"
-							aria-label="resize widget"
-							v-tooltip="{showDelay:1000, value:'resize widget'}"
-						>
-							<i
-								class="fa-solid fa-up-right-and-down-left-from-center mirror-x"
-								aria-hidden="true"
-							></i>
-						</span>
-					</template>
+				<div
+					v-if="editMode && isResizeable && !isPinned"
+					class="card-footer d-flex justify-content-end p-0"
+				>
+					<span
+						v-if="!isResizeableHorizontal"
+						type="button"
+						drag-action="resize"
+						class="col-auto px-1 cursor-ns-resize"
+						draggable="true"
+						aria-label="resize widget"
+						v-tooltip="{showDelay:1000, value:'resize widget'}"
+					>
+						<i
+							class="fa-solid fa-up-down pe-2"
+							aria-hidden="true"
+						></i>
+					</span>
+					<span
+						v-else-if="!isResizeableVertical"
+						type="button"
+						drag-action="resize"
+						class="col-auto px-1 cursor-ew-resize"
+						draggable="true"
+						aria-label="resize widget"
+						v-tooltip="{showDelay:1000, value:'resize widget'}"
+					>
+						<i
+							class="fa-solid fa-left-right pe-2"
+							aria-hidden="true"
+						></i>
+					</span>
+					<span
+						v-else
+						type="button"
+						drag-action="resize"
+						class="col-auto px-1 cursor-nw-resize"
+						draggable="true"
+						aria-label="resize widget"
+						v-tooltip="{showDelay:1000, value:'resize widget'}"
+					>
+						<i
+							class="fa-solid fa-up-right-and-down-left-from-center mirror-x"
+							aria-hidden="true"
+						></i>
+					</span>
 				</div>
 			</height-transition>
 		</div>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 817cc52a3..98d930edc 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -52,12 +52,13 @@ export default {
 		}
 	},
 	computed: {
-		computedWidgetsSetup(){
-			if(!this.widgetsSetup) return {};
-			return this.widgetsSetup.reduce((acc, setup)=>{
+		computedWidgetsSetup() {
+			if (!this.widgetsSetup)
+				return {};
+			return this.widgetsSetup.reduce((acc, setup) => {
 				acc[setup.widget_id] = setup.setup;
 				return acc;
-			},{})
+			}, {});
 		},
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
@@ -240,17 +241,15 @@ export default {
 					:hidden="item.hidden"
 					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
-					:setup="computedWidgetsSetup[item.widget]"
+					:resize-limits="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
 					@config-closed="handleConfigClosed"
 					@pinItem="updatePositions($event,true)"
-					@unPinItem="updatePositions">
-				</dashboard-item>
-				
+					@unPinItem="updatePositions"
+				></dashboard-item>
 			</template>
-			
 		</drop-grid>
 	</div>`
 }

From 8a53c438e3a55089b76336b2c1af3eb347bc6119 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 15:01:03 +0200
Subject: [PATCH 030/189] more cleanup of dropgrid code

---
 public/js/components/Drop/Grid.js | 33 ++++++-------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 8f048de94..75fdefda6 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -11,12 +11,6 @@ export default {
 	components: {
 		GridItem,
 	},
-	inject: {
-		sectionName: {
-			type: String,
-			default: '',
-		}
-	},
 	props: {
 		cols: Number,
 		items: Array,
@@ -37,7 +31,6 @@ export default {
 	},
 	emits: [
 		"rearrangeItems",
-		"newItem",
 		"gridHeight",
 		"draggedItem",
 		"update:additionalRow"
@@ -51,7 +44,6 @@ export default {
 			mode: MODE_IDLE,
 			grid: null,
 			dragGrid: null,
-			permUpdates: [],
 			positionUpdates: null,
 			fixedPositionUpdates: null,
 			draggedOffset: [0, 0],
@@ -123,8 +115,11 @@ export default {
 			}
 			return placeholders;
 		},
-		placedItems_withPlaceholders() {
-			return [...this.placedItems, ...this.items_placeholders];
+		currentItems() {
+			if (this.mode != 1 && this.mode != 2 && this.active)
+				return [ ...this.placedItems, ...this.items_placeholders ];
+
+			return this.placedItems;
 		},
 		rows() {
 			if (this.additionalRowComputed) {
@@ -209,17 +204,6 @@ export default {
 				}
 			})
 			return [...mappedPlacedItems, ...temporaryResizeItems];
-		},
-		showEmptyTileHover() {
-			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
-				return false;
-			return this.grid.isFreeSlot(this.x, this.y);
-		},
-		currentItems() {
-			if (this.mode != 1 && this.mode != 2 && this.active)
-				return this.placedItems_withPlaceholders;
-
-			return this.placedItems;
 		}
 	},
 	watch: {
@@ -436,7 +420,6 @@ export default {
 		dragOver(evt) {
 			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
 				this.dragCancel();
-				
 			}
 			if (!this.active)
 				return this.dragCancel();
@@ -532,10 +515,6 @@ export default {
 			}
 			return updated;
 		},
-		emptyTileClicked() {
-			this.additionalRowComputed = false;
-			this.$emit('newItem', this.x, this.y);
-		},
 		updateCursorOnMouseMove(evt) {
 			if (this.mode == MODE_IDLE) {
 				this.updateCursor(evt);
@@ -609,7 +588,7 @@ export default {
 		},
 		mouseUp() {
 			this.mode = MODE_IDLE;
-		},
+		}
 	},
 	template: /* html */`
 	<div

From 218f434e01a27b4370f2ee88b1e94c6a01c09945 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 30 Mar 2026 16:49:21 +0200
Subject: [PATCH 031/189] stabilize workaround for chrome by adding more code
 into the workaround and get rid of updateCursorOnMouseMove in the process

---
 public/js/components/Drop/Grid.js | 36 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 75fdefda6..d766492ad 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -386,13 +386,14 @@ export default {
 			if (!this.active)
 				return;
 			
-			this.mode = MODE_MOVE;
-			
-			this.draggedItem = item;
-			
-			this.$emit('draggedItem', item);
 			// workaround for chrome fireing event dragend when styles are manipulated during dragging
 			setTimeout(() => {
+				this.mode = MODE_MOVE;
+				this.updateCursor(evt);
+				this.draggedItem = item;
+				
+				this.$emit('draggedItem', item);
+
 				this.draggedNode = evt.target.closest(".drop-grid-item");
 				//clones the widget for the drag Image
 				
@@ -402,19 +403,26 @@ export default {
 				clone.classList.add("widgetClone");
 				this.$refs.container.appendChild(clone);
 				const hiddenWidget = clone.querySelector("[style='display: none;']");
-				hiddenWidget.style.removeProperty("display");
+				if (hiddenWidget)
+					hiddenWidget.style.removeProperty("display");
 				this.clonedWidget = clone;
+
+				this.draggedOffset = [item.x - this.x, item.y - this.y];
 			}, 0);
 
-			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
 		startResize(evt, item) {
 			if (!this.active)
 				return;
-			this.mode = MODE_RESIZE;
-			this.draggedItem = item;
-			this.$emit('draggedItem', item);
+			
+			// workaround for chrome fireing event dragend when styles are manipulated during dragging
+			setTimeout(() => {
+				this.mode = MODE_RESIZE;
+				this.draggedItem = item;
+				this.$emit('draggedItem', item);
+			}, 0);
+			
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
@@ -515,11 +523,6 @@ export default {
 			}
 			return updated;
 		},
-		updateCursorOnMouseMove(evt) {
-			if (this.mode == MODE_IDLE) {
-				this.updateCursor(evt);
-			}
-		},
 		checkPinnedWidgetAnimation() {
 			let itemAtPosition = [];
 			switch (this.mode) {
@@ -599,7 +602,6 @@ export default {
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
-		@mousemove="updateCursorOnMouseMove"
 	>
 		<TransitionGroup>
 			<grid-item
@@ -626,7 +628,7 @@ export default {
 				@dragging="dragging"
 				@end-drag="dragEnd"
 				@touch-end="dragEnd();mouseUp();"
-				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
+				@touch-start="mouseDown"
 			>
 				<template v-slot="item">
 					<slot

From 114a50ad4e4db9d633a19c1af42bb7882ac090b8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 2 Apr 2026 11:43:29 +0200
Subject: [PATCH 032/189] Comments & variable renames for better understanding

---
 public/js/components/Drop/Grid.js | 67 ++++++++++++++++---------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d766492ad..0128905c4 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -43,9 +43,8 @@ export default {
 			clientY: 0,
 			mode: MODE_IDLE,
 			grid: null,
-			dragGrid: null,
-			positionUpdates: null,
-			fixedPositionUpdates: null,
+			tempPositionUpdates: null,
+			correctedPositionUpdates: null,
 			draggedOffset: [0, 0],
 			draggedItem: null,
 			draggedNode: null,
@@ -153,39 +152,39 @@ export default {
 			);
 		},
 		prePlacedItems() {
-			if (!this.fixedPositionUpdates)
+			if (!this.correctedPositionUpdates)
 				return this.indexedItems;
 			return this.indexedItems.map(item => {
-				if (!this.fixedPositionUpdates[item.index])
+				if (!this.correctedPositionUpdates[item.index])
 					return item;
 				return {
 					index: item.index,
 					weight: item.weight,
 					data: item.data,
-					x: this.fixedPositionUpdates[item.index].x === undefined ? item.x : this.fixedPositionUpdates[item.index].x,
-					y: this.fixedPositionUpdates[item.index].y === undefined ? item.y : this.fixedPositionUpdates[item.index].y,
-					w: this.fixedPositionUpdates[item.index].w === undefined ? item.w : this.fixedPositionUpdates[item.index].w,
-					h: this.fixedPositionUpdates[item.index].h === undefined ? item.h : this.fixedPositionUpdates[item.index].h
+					x: this.correctedPositionUpdates[item.index].x === undefined ? item.x : this.correctedPositionUpdates[item.index].x,
+					y: this.correctedPositionUpdates[item.index].y === undefined ? item.y : this.correctedPositionUpdates[item.index].y,
+					w: this.correctedPositionUpdates[item.index].w === undefined ? item.w : this.correctedPositionUpdates[item.index].w,
+					h: this.correctedPositionUpdates[item.index].h === undefined ? item.h : this.correctedPositionUpdates[item.index].h
 				};
 			});
 		},
 		placedItems() {
-			if (!this.positionUpdates)
+			if (!this.tempPositionUpdates)
 				return this.prePlacedItems;
 			let mappedPlacedItems= this.prePlacedItems.map(item => {
-				if (!this.positionUpdates[item.index] )
+				if (!this.tempPositionUpdates[item.index] )
 					return item;
-				let height_diff = this.positionUpdates[item.index]?.h - item.h;
-				let width_diff = this.positionUpdates[item.index]?.w - item.w;
+				let height_diff = this.tempPositionUpdates[item.index]?.h - item.h;
+				let width_diff = this.tempPositionUpdates[item.index]?.w - item.w;
 				return {
-					resize: this.positionUpdates[item.index]?.resize,
+					resize: this.tempPositionUpdates[item.index]?.resize,
 					index: item.index,
 					weight: item.weight,
 					data: item.data,
-					x: this.positionUpdates[item.index].x === undefined ? item.x : this.positionUpdates[item.index].x,
-					y: this.positionUpdates[item.index].y === undefined ? item.y : this.positionUpdates[item.index].y,
-					w: width_diff>0?item.w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
-					h: height_diff > 0 ?item.h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+					x: this.tempPositionUpdates[item.index].x === undefined ? item.x : this.tempPositionUpdates[item.index].x,
+					y: this.tempPositionUpdates[item.index].y === undefined ? item.y : this.tempPositionUpdates[item.index].y,
+					w: width_diff>0?item.w:this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
+					h: height_diff > 0 ?item.h:this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
 					
 				};
 			});
@@ -195,8 +194,8 @@ export default {
 				if(item.resize){
 					let newItem = {
 						...item,
-						w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
-						h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h,
+						w:this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
+						h:this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h,
 						resizeOverlay:true,
 						blank:true,
 					};
@@ -226,7 +225,7 @@ export default {
 
 				const updated = this.createNewGrid(value);
 
-				this.fixedPositionUpdates = updated;
+				this.correctedPositionUpdates = updated;
 				if (updated.length)
 					this.$emit('rearrangeItems', updated.filter(v => v));
 			},
@@ -397,6 +396,8 @@ export default {
 				this.draggedNode = evt.target.closest(".drop-grid-item");
 				//clones the widget for the drag Image
 				
+				// NOTE(chris): this is the element that follows the mouse while dragging
+				// equivalent to the ghost image
 				let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
 
 				clone.style.zIndex = 5;
@@ -439,7 +440,7 @@ export default {
 				switch(this.mode) {
 					case MODE_MOVE: {
 						evt.preventDefault();
-						this.dragGrid = new GridLogic(this.grid);
+						const dragGrid = new GridLogic(this.grid);
 						let x = this.x + this.draggedOffset[0];
 						let y = this.y + this.draggedOffset[1];
 						if (x < 0) {
@@ -453,17 +454,17 @@ export default {
 							this.draggedOffset[1] += y;
 							y = 0;
 						}
-						this.positionUpdates= this.dragGrid.move(this.draggedItem, x, y);
+						this.tempPositionUpdates= dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
 					case MODE_RESIZE: {
 						evt.preventDefault();
-						this.dragGrid = new GridLogic(this.grid);
+						const dragGrid = new GridLogic(this.grid);
 						let w = Math.min(this.cols - this.draggedItem.x, Math.max(1, this.x - this.draggedItem.x + 1));
 						let h = Math.max(1, this.y - this.draggedItem.y + 1);
 						if (this.resizeLimit)
 							[w, h] = this.resizeLimit(this.draggedItem.data, w, h);
-						this.positionUpdates = this.dragGrid.resize(this.draggedItem, w, h);
+						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
 						break;
 					}
 				}
@@ -474,7 +475,7 @@ export default {
 			this.additionalRowComputed = false;
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
-			this.positionUpdates = null;
+			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
 			this.$emit('draggedItem',null);
@@ -499,8 +500,8 @@ export default {
 
 			this.mode = MODE_IDLE;
 			let updated = [];
-			this.convertGridResultToUpdate(this.positionUpdates, updated);
-			updated = this._updateFixedPositions(updated);
+			this.convertGridResultToUpdate(this.tempPositionUpdates, updated);
+			updated = this._updateCorrectedPositions(updated);
 			if (updated.length)
 				this.$emit('rearrangeItems', updated.filter(v => v));
 
@@ -508,18 +509,18 @@ export default {
 			this.draggedNode = null;
 			this.$emit('draggedItem', null);
 		},
-		_updateFixedPositions(updated) {
+		_updateCorrectedPositions(updated) {
 			updated.forEach((item, index) => {
-				if (!this.fixedPositionUpdates[index])
-					this.fixedPositionUpdates[index] = item;
+				if (!this.correctedPositionUpdates[index])
+					this.correctedPositionUpdates[index] = item;
 				else
-					this.fixedPositionUpdates[index] = {...this.fixedPositionUpdates[index], ...item};
+					this.correctedPositionUpdates[index] = {...this.correctedPositionUpdates[index], ...item};
 			});
 			let additionalUpdates = this.createNewGrid(this.prePlacedItems);
 			if (additionalUpdates.length) {
 				// NOTE(chris): this should never happen but it's here for safety
 				additionalUpdates.forEach((item, index) => updated[index] = item);
-				return this._updateFixedPositions(updated);
+				return this._updateCorrectedPositions(updated);
 			}
 			return updated;
 		},

From 4d9ff395e96eea4abafc2cb87cde6483e72fd888 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 2 Apr 2026 14:52:17 +0200
Subject: [PATCH 033/189] remove reorder which is not used anymore

---
 public/js/components/Dashboard/Section.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 98d930edc..191bf8dec 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -86,7 +86,7 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
+				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 }) };
 			});
 			return placedItems;
 			
@@ -234,7 +234,7 @@ export default {
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
-					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"

From e6eed4be4ed07952da91767c6c7cf5ca229e4b28 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 2 Apr 2026 16:36:04 +0200
Subject: [PATCH 034/189] move hidden widgets to the bottom of the dashboard

---
 public/js/components/Dashboard/Section.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 191bf8dec..fbe26695c 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -156,6 +156,16 @@ export default {
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
+				
+				if (!revert) {
+					// NOTE(chris): move to last line
+					update[item.id].place = [];
+					let y = this.gridHeight;
+					if (this.additionalRow)
+						y--;
+					update[item.id].place[this.gridWidth] = { x: 0, y };
+				}
+				
 				this.updatePreset(update);
 			}
 		},

From 26f67b6798c4594816a927c817cff669788c0812 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 3 Apr 2026 11:16:19 +0200
Subject: [PATCH 035/189] rename apps/Cis to apps/Cis/Menu

---
 application/views/templates/CISVUE-Footer.php |  2 +-
 application/views/templates/CISVUE-Header.php |  2 +-
 public/js/apps/{Cis.js => Cis/Menu.js}        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename public/js/apps/{Cis.js => Cis/Menu.js} (93%)

diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
index d7c1de24c..eae2a94ff 100644
--- a/application/views/templates/CISVUE-Footer.php
+++ b/application/views/templates/CISVUE-Footer.php
@@ -6,7 +6,7 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
+		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 804a43821..d98cbc9cd 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -8,7 +8,7 @@ $includesArray = array(
 	'axios027' => true,
 	'primevue3' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
+		'public/js/apps/Cis/Menu.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis/Menu.js
similarity index 93%
rename from public/js/apps/Cis.js
rename to public/js/apps/Cis/Menu.js
index c88a47a35..5c03ac128 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis/Menu.js
@@ -1,11 +1,11 @@
-import FhcSearchbar from "../components/searchbar/searchbar.js";
-import CisMenu from "../components/Cis/Menu.js";
-import PluginsPhrasen from '../plugins/Phrasen.js';
-import ApiSearchbar from '../api/factory/searchbar.js';
-import Theme from "../plugins/Theme.js";
+import FhcSearchbar from "../../components/searchbar/searchbar.js";
+import CisMenu from "../../components/Cis/Menu.js";
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+import ApiSearchbar from '../../api/factory/searchbar.js';
+import Theme from "../../plugins/Theme.js";
 
 const app = Vue.createApp({
-    name: 'CisApp',
+    name: 'CisMenuApp',
     components: {
         FhcSearchbar,
         CisMenu

From 7eb888d2e35fb4e0c4c80ec439b71c1e1a038868 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 3 Apr 2026 11:19:38 +0200
Subject: [PATCH 036/189] rename apps/Dashboard/Fhc to apps/Cis

---
 .../views/CisRouterView/CisRouterView.php     |  2 +-
 public/js/apps/{Dashboard/Fhc.js => Cis.js}   | 46 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename public/js/apps/{Dashboard/Fhc.js => Cis.js} (85%)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 6ff428362..d65300c4a 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -39,7 +39,7 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Dashboard/Fhc.js',
+		'public/js/apps/Cis.js',
 	),
 
 );
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Cis.js
similarity index 85%
rename from public/js/apps/Dashboard/Fhc.js
rename to public/js/apps/Cis.js
index 140c76402..232d9a009 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Cis.js
@@ -1,26 +1,26 @@
-import FhcDashboard from '../../components/Dashboard/Dashboard.js';
-import PluginsPhrasen from '../../plugins/Phrasen.js';
-import Theme from '../../plugins/Theme.js';
-import contrast from '../../directives/contrast.js';
-import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
-import MylvStudent from "../../components/Cis/Mylv/Student.js";
-import Profil from "../../components/Cis/Profil/Profil.js";
-import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
-import CmsNews from "../../components/Cis/Cms/News.js";
-import CmsContent from "../../components/Cis/Cms/Content.js";
-import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
-import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
-import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
-import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
-import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
-import Studium from "../../components/Cis/Studium/Studium.js";
+import FhcDashboard from '../components/Dashboard/Dashboard.js';
+import PluginsPhrasen from '../plugins/Phrasen.js';
+import Theme from '../plugins/Theme.js';
+import contrast from '../directives/contrast.js';
+import {setScrollbarWidth} from "../helpers/CssVarCalcHelpers.js";
+import LvPlan from "../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../components/Cis/LvPlan/Personal.js";
+import MylvStudent from "../components/Cis/Mylv/Student.js";
+import Profil from "../components/Cis/Profil/Profil.js";
+import Raumsuche from "../components/Cis/Raumsuche/Raumsuche.js";
+import CmsNews from "../components/Cis/Cms/News.js";
+import CmsContent from "../components/Cis/Cms/Content.js";
+import Info from "../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../components/Cis/Mylv/RoomInformation.js";
+import AbgabetoolStudent from "../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
+import DeadlineOverview from "../components/Cis/Abgabetool/DeadlineOverview.js";
+import Studium from "../components/Cis/Studium/Studium.js";
 
-import ApiRenderers from '../../api/factory/renderers.js';
-import ApiRouteInfo from '../../api/factory/routeinfo.js';
-import {capitalize} from "../../helpers/StringHelpers.js";
+import ApiRenderers from '../api/factory/renderers.js';
+import ApiRouteInfo from '../api/factory/routeinfo.js';
+import {capitalize} from "../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -227,7 +227,7 @@ const router = VueRouter.createRouter({
 })
 
 const app = Vue.createApp({
-	name: 'FhcApp',
+	name: 'CisApp',
 	data: () => ({
 		appSideMenuEntries: {},
 		renderers: null,

From 01e6a1061c31c66e32133bff041b56e98f36fa25 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 7 Apr 2026 13:43:50 +0200
Subject: [PATCH 037/189] get renderers inside the components that require it

---
 public/js/apps/Cis.js                   | 45 +---------------------
 public/js/apps/Dashboard/Admin.js       | 46 +----------------------
 public/js/components/Calendar/LvPlan.js |  9 +++--
 public/js/components/Calendar/Widget.js |  8 ++--
 public/js/composables/Renderers.js      | 50 +++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 97 deletions(-)
 create mode 100644 public/js/composables/Renderers.js

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 232d9a009..4355854e0 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -18,7 +18,6 @@ import AbgabetoolAssistenz from "../components/Cis/Abgabetool/AbgabetoolAssisten
 import DeadlineOverview from "../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../components/Cis/Studium/Studium.js";
 
-import ApiRenderers from '../api/factory/renderers.js';
 import ApiRouteInfo from '../api/factory/routeinfo.js';
 import {capitalize} from "../helpers/StringHelpers.js";
 
@@ -229,8 +228,7 @@ const router = VueRouter.createRouter({
 const app = Vue.createApp({
 	name: 'CisApp',
 	data: () => ({
-		appSideMenuEntries: {},
-		renderers: null,
+		appSideMenuEntries: {}
 	}),
 	components: {},
 	computed: {
@@ -243,7 +241,6 @@ const app = Vue.createApp({
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
-			renderers: Vue.computed(() => this.renderers),
 			isMobile: this.isMobile
 		}	
 	},
@@ -282,46 +279,6 @@ const app = Vue.createApp({
 			}
 		}
 	},
-	async created(){
-		
-		await this.$api
-			.call(ApiRenderers.loadRenderers())
-			.then(res => res.data)
-			.then(data => {
-				for (let rendertype of Object.keys(data)) {
-					let modalTitle = null;
-					let modalContent = null;
-					let calendarEvent = null;
-					if (data[rendertype].modalTitle)
-						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
-					if (data[rendertype].modalContent) 	
-						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
-					if (data[rendertype].calendarEvent) 	
-						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
-
-					if (data[rendertype].calendarEventStyles){
-						var head = document.head;
-						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = data[rendertype].calendarEventStyles;
-							head.appendChild(link);
-						}
-					}
-
-					if(this.renderers === null) {
-						this.renderers = {};
-					}
-					if (!this.renderers[rendertype]) {
-						this.renderers[rendertype] = {}
-					}
-					this.renderers[rendertype].modalTitle = modalTitle;
-					this.renderers[rendertype].modalContent = modalContent;
-					this.renderers[rendertype].calendarEvent = calendarEvent;
-				}
-			});
-	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);
 		
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 32909a50a..685e1bc9c 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -3,13 +3,10 @@ import DashboardAdmin from '../../components/Dashboard/Admin.js';
 
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
-import ApiRenderers from '../../api/factory/renderers.js';
-
 const app = Vue.createApp({
 	name: 'DashboardAdminApp',
 	data: () => ({
-		appSideMenuEntries: {},
-		renderers: null
+		appSideMenuEntries: {}
 	}),
 	components: {
 		CoreNavigationCmpt,
@@ -17,49 +14,8 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return {
-			// TODO(chris): move those two into the components that need it
-			renderers: Vue.computed(() => this.renderers),
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
 		};
-	},
-	created() {
-		this.$api
-			.call(ApiRenderers.loadRenderers())
-			.then(res => {
-				for (let rendertype of Object.keys(res.data)) {
-					let modalTitle = null;
-					let modalContent = null;
-					let calendarEvent = null;
-					if (res.data[rendertype].modalTitle)
-						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
-					if (res.data[rendertype].modalContent) 	
-						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
-					if (res.data[rendertype].calendarEvent) 	
-						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
-
-					if (res.data[rendertype].calendarEventStyles) {
-						var head = document.head;
-						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = res.data[rendertype].calendarEventStyles;
-							head.appendChild(link);
-						}
-					}
-
-					if (this.renderers === null) {
-						this.renderers = {};
-					}
-					if (!this.renderers[rendertype]) {
-						this.renderers[rendertype] = {}
-					}
-					this.renderers[rendertype].modalTitle = modalTitle;
-					this.renderers[rendertype].modalContent = modalContent;
-					this.renderers[rendertype].calendarEvent = calendarEvent;
-				}
-			})
-			.catch(this.$fhcAlert.handleSystemErrors);
 	}
 });
 app.use(PluginsPhrasen);
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index e0e918f01..3bd4fdafb 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -3,6 +3,7 @@ import FhcCalendar from "./Base.js";
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeDay from './Mode/Day.js';
 import ModeWeek from './Mode/Week.js';
@@ -13,9 +14,6 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
 		timezone: {
 			type: String,
@@ -99,10 +97,13 @@ export default {
 			context.emit('update:lv', newValue);
 		});
 
+		const { renderers } = useRenderers();
+
 		return {
 			rangeInterval,
 			events,
-			lv
+			lv,
+			renderers
 		};
 	},
 	created() {
diff --git a/public/js/components/Calendar/Widget.js b/public/js/components/Calendar/Widget.js
index f9d641d4e..b08c48acb 100644
--- a/public/js/components/Calendar/Widget.js
+++ b/public/js/components/Calendar/Widget.js
@@ -1,6 +1,7 @@
 import FhcCalendar from "./Base.js";
 
 import { useEventLoader } from '../../composables/EventLoader.js';
+import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeList from '../Calendar/Mode/List.js';
 
@@ -9,9 +10,6 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
 		timezone: {
 			type: String,
@@ -59,10 +57,12 @@ export default {
 		const rangeInterval = Vue.ref(null);
 		
 		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { renderers } = useRenderers();
 
 		return {
 			rangeInterval,
-			events
+			events,
+			renderers
 		};
 	},
 	template: /* html */`
diff --git a/public/js/composables/Renderers.js b/public/js/composables/Renderers.js
new file mode 100644
index 000000000..c250c27b5
--- /dev/null
+++ b/public/js/composables/Renderers.js
@@ -0,0 +1,50 @@
+import ApiRenderers from '../api/factory/renderers.js';
+
+/**
+ * @return object						{ renderers: Object }
+ */
+export function useRenderers() {
+	/* Result Vars */
+	const renderers = Vue.ref(null);
+
+	/* Helper Vars */
+	const $api = Vue.inject('$api');
+	const $fhcAlert = Vue.inject('$fhcAlert');
+
+	/* Main Logic */
+	$api
+		.call(ApiRenderers.loadRenderers())
+		.then(res => {
+			const head = document.head;
+			for (const rendertype of Object.keys(res.data)) {
+				const renderersForType = {};
+				for (const name of Object.keys(res.data[rendertype])) {
+					const rendererUrl = res.data[rendertype][name];
+					if (rendererUrl.substr(-4) == ".css") {
+						// add to head
+						if (!head.querySelector(`link[href="${rendererUrl}"]`)) {
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = rendererUrl;
+							head.appendChild(link);
+						}
+					} else {
+						renderersForType[name] = Vue.markRaw(
+							Vue.defineAsyncComponent(() => import(rendererUrl))
+						);
+					}
+				}
+				if (Object.keys(renderersForType).length) {
+					if (renderers.value === null)
+						renderers.value = {};
+					renderers.value[rendertype] = renderersForType;
+				}
+			}
+		})
+		.catch($fhcAlert.handleSystemErrors);
+
+	return {
+		renderers
+	};
+}
\ No newline at end of file

From 8ca5849b14cceeb4fd5a13aaaf99e9c4ba76c61c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 09:45:08 +0200
Subject: [PATCH 038/189] get timezone inside the components that require it

---
 public/js/components/Calendar/Base/DragAndDrop.js    | 3 ++-
 public/js/components/Calendar/LvPlan.js              | 5 +----
 public/js/components/Calendar/Widget.js              | 8 +++-----
 public/js/components/Cis/LvPlan/Lehrveranstaltung.js | 3 +--
 public/js/components/Cis/LvPlan/LvPlan.js            | 6 ++----
 public/js/components/Cis/LvPlan/Personal.js          | 5 ++---
 public/js/components/Cis/Mylv/RoomInformation.js     | 3 +--
 public/js/components/Dashboard/Dashboard.js          | 5 ++---
 public/js/components/DashboardWidget/LvPlan.js       | 5 +----
 9 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Calendar/Base/DragAndDrop.js b/public/js/components/Calendar/Base/DragAndDrop.js
index 631a792a8..fb6cb1848 100644
--- a/public/js/components/Calendar/Base/DragAndDrop.js
+++ b/public/js/components/Calendar/Base/DragAndDrop.js
@@ -20,7 +20,8 @@ export default {
 	},
 	inject: {
 		mode: "mode",
-		dropableEvents: "dropableEvents"
+		dropableEvents: "dropableEvents",
+		timezone: "timezone"
 	},
 	props: {
 		events: Array,
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index 3bd4fdafb..21dd7e95d 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -15,10 +15,6 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		timezone: {
-			type: String,
-			required: true
-		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
 			default: luxon.DateTime.local()
@@ -39,6 +35,7 @@ export default {
 	],
 	data() {
 		return {
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 			modes: {
 				day: Vue.markRaw(ModeDay),
 				week: Vue.markRaw(ModeWeek),
diff --git a/public/js/components/Calendar/Widget.js b/public/js/components/Calendar/Widget.js
index b08c48acb..54109268e 100644
--- a/public/js/components/Calendar/Widget.js
+++ b/public/js/components/Calendar/Widget.js
@@ -11,18 +11,16 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		timezone: {
-			type: String,
-			required: true
-		},
 		getPromiseFunc: {
 			type: Function,
 			required: true
 		}
 	},
 	data() {
+		const timezone = FHC_JS_DATA_STORAGE_OBJECT.timezone;
 		return {
-			now: luxon.DateTime.now().setZone(this.timezone),
+			timezone,
+			now: luxon.DateTime.now().setZone(timezone),
 			modes: {
 				list: Vue.markRaw(ModeList)
 			},
diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 4364a5df4..1e74ad93a 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -22,7 +22,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -95,7 +95,6 @@ export default {
 		<fhc-calendar
 			v-else-if="lv"
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index f7763c54b..92c41de11 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -15,7 +15,6 @@ export default {
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
@@ -26,7 +25,7 @@ export default {
 	},
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
@@ -35,7 +34,7 @@ export default {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -115,7 +114,6 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
index f6fd462da..ef32b8aa4 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -27,7 +27,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -47,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -124,7 +124,6 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 2dd3d518d..85741cab2 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -15,7 +15,7 @@ export default {
 	},
 	computed: {
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
@@ -51,7 +51,6 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
-			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index c7a45c2a8..8bb5e7958 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -21,7 +21,7 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name && value.timezone
+				return value && value.name
 			}
 		}
 	},
@@ -36,8 +36,7 @@ export default {
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgetsSetup),
-			timezone: Vue.computed(() => this.viewData.timezone)
+			widgetsSetup: Vue.computed(() => this.widgetsSetup)
 		}
 	},
 	methods: {
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index c82db2e0c..9000ff9c3 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -11,9 +11,6 @@ export default {
 	mixins: [
 		AbstractWidget
 	],
-	inject: [
-		"timezone"
-	],
 	methods: {
 		getPromiseFunc(start, end) {
 			return [
@@ -27,6 +24,6 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<fhc-calendar :timezone="timezone" :get-promise-func="getPromiseFunc" />
+		<fhc-calendar :get-promise-func="getPromiseFunc" />
 	</div>`
 }
\ No newline at end of file

From 344c68bf08be4f87378897cd15d1ce4dbd1acb90 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 14:20:12 +0200
Subject: [PATCH 039/189] remove deprecated file

---
 public/js/apps/DashboardAdmin_DEPR.js | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 public/js/apps/DashboardAdmin_DEPR.js

diff --git a/public/js/apps/DashboardAdmin_DEPR.js b/public/js/apps/DashboardAdmin_DEPR.js
deleted file mode 100644
index 05b438798..000000000
--- a/public/js/apps/DashboardAdmin_DEPR.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
-import DashboardAdmin from '../components/Dashboard/Admin.js';
-import Phrases from "../plugin/Phrasen.js"
-
-Vue.createApp({
-  name: 'DashboardAdminApp',
-  data: () => ({
-      appSideMenuEntries: {}
-    }),
-  components: {
-    CoreNavigationCmpt,
-    DashboardAdmin
-  },
-  mounted() {
-  }
-}).use(Phrases).mount('#main');
\ No newline at end of file

From 5a1b94f45ba63f874f049eac8e73a9a7b8661ce9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 14:27:56 +0200
Subject: [PATCH 040/189] Remove redundant Dashboardpage and load correct one
 in Users Landingpage

---
 application/controllers/Cis/Auth.php         |  2 +-
 application/controllers/CisVue/Dashboard.php | 43 --------------------
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 application/controllers/CisVue/Dashboard.php

diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
index 67267ebf6..87ef5d3da 100644
--- a/application/controllers/Cis/Auth.php
+++ b/application/controllers/Cis/Auth.php
@@ -40,7 +40,7 @@ class Auth extends FHC_Controller
 
 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
+			redirect($this->authlib->getLandingPage('/Cis4'));
 		}
 		else
 		{
diff --git a/application/controllers/CisVue/Dashboard.php b/application/controllers/CisVue/Dashboard.php
deleted file mode 100644
index ee830cb8b..000000000
--- a/application/controllers/CisVue/Dashboard.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Dashboard extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'dashboard/benutzer:r'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-
-		$this->load->model('person/Person_model','PersonModel');
-		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
-
-		$viewData = array(
-			'uid' => getAuthUID(),
-			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
-
-	}
-}
\ No newline at end of file

From fad293fbbfdea8869c68796b8017b9cdef8d0dd8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:00:36 +0200
Subject: [PATCH 041/189] code quality dashboard section

---
 public/js/components/Dashboard/Section.js | 75 ++++++++++++++---------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index fbe26695c..f1c1bb7ce 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -12,7 +12,7 @@ export default {
 		WidgetIcon,
 	},
 	inject: {
-		widgetsSetup:{
+		widgetsSetup: {
 			type: Array,
 			default: [],
 		},
@@ -41,7 +41,7 @@ export default {
 			gridHeight: null,
 			draggedItem:null,
 			additionalRow:false,
-		}
+		};
 	},
 	provide() {
 		return {
@@ -49,7 +49,7 @@ export default {
 				this.editModeIsActive
 			),	
 			sectionName: Vue.computed(() => this.name),	
-		}
+		};
 	},
 	computed: {
 		computedWidgetsSetup() {
@@ -88,34 +88,29 @@ export default {
 				}
 				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 }) };
 			});
+
 			return placedItems;
-			
-		},
-		
+		}
 	},
 	methods: {
-		sectionNameTranslation(){
-			switch(this.name){
+		sectionNameTranslation() {
+			switch (this.name) {
 				case "general": 
-					return this.$p.t('dashboard',this.name); 
-					break;
+					return this.$p.t('dashboard', this.name); 
 				case "custom":
-					return this.$p.t('dashboard',this.name);
-					break;
+					return this.$p.t('dashboard', this.name);
 				default:
 					return this.name;
-					break;
 			}
 		},
-		showSectionInformation(){
-			if (this.name == "general"){
-				return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
-			}
-			else if(this.name == "custom"){
-				return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
-			}
-			else{
-				return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
+		showSectionInformation() {
+			switch (this.name) {
+				case "general": 
+					return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
+				case "custom":
+					return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
+				default:
+					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
 			}
 		},
 		handleConfigOpened() {
@@ -226,16 +221,40 @@ export default {
 			self.gridWidth = parseInt(window.getComputedStyle(cont).getPropertyValue('--fhc-dashboard-grid-size'));
 		});
 	},
-	template: `
-	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+	template: /* html */`
+	<div
+		class="dashboard-section position-relative pb-3 border-bottom"
+		ref="container"
+		:style="getSectionStyle"
+	>
 		<h4 v-if="editModeIsActive" class=" mb-2">
 			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-			{{sectionNameTranslation()}}:
+			{{ sectionNameTranslation() }}:
 		</h4>
-		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
-		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<button
+			v-tooltip="$p.t('dashboard','addLine')"
+			v-if="!additionalRow && editModeIsActive"
+			@click="additionalRow=true"
+			class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center"
+		>+</button>
+		<drop-grid
+			v-model:cols="gridWidth"
+			v-model:additional-row="additionalRow"
+			:items="items"
+			:items-setup="computedWidgetsSetup"
+			:active="editModeIsActive"
+			:resize-limit="checkResizeLimit"
+			:margin-for-extra-row=".01"
+			@dragged-item="draggedItem=$event"
+			@rearrange-items="updatePositions"
+			@grid-height="gridHeight=$event"
+		>
 			<template #default="item">
-				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div
+					v-if="item.placeholder"
+					class="empty-tile-hover"
+					@pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"
+				></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"

From dd713a26db8657837f84fc0c85a26ad3ffac2d90 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:07:42 +0200
Subject: [PATCH 042/189] replace inline styles with bootstrap class

---
 public/js/components/Dashboard/Section.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index f1c1bb7ce..adac53c3c 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -63,9 +63,6 @@ export default {
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
-		getSectionStyle() {
-			return 'margin-bottom: 8px;';
-		},
 		items() {
 			// reuses the nearest placement of the widget from another viewport 
 			/* const computeNearestPlace = (item, gridWidth) =>{
@@ -223,9 +220,8 @@ export default {
 	},
 	template: /* html */`
 	<div
-		class="dashboard-section position-relative pb-3 border-bottom"
+		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
 		ref="container"
-		:style="getSectionStyle"
 	>
 		<h4 v-if="editModeIsActive" class=" mb-2">
 			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>

From 5c6a8b99669e2a3b428b393e610f4aeb370878cf Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:52:33 +0200
Subject: [PATCH 043/189] code quality dashboard css

---
 public/css/components/dashboard.css | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 88d136b55..5dc735ba6 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -2,7 +2,7 @@
 @import './dashboard/news.css';
 @import './dashboard/LvPlan.css';
 
-:root{
+:root {
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
 	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
@@ -23,16 +23,16 @@
 	}
 }
 
-.core-dashboard a{
+.core-dashboard a {
 	color: var(--fhc-dashboard-link);
 }
 
-@media (max-width: 576px){
+@media (max-width: 576px) {
 	.widget-icon {
 		max-height: 250px;
 		object-fit: cover;
 	}
-	.widget-icon-container{
+	.widget-icon-container {
 		max-width: 250px;
 		margin-left: auto;
 		margin-right: auto;
@@ -49,7 +49,7 @@
 	cursor:pointer;
 }
 
-.dashboard-section > .newGridRow{
+.dashboard-section > .newGridRow {
 	position:absolute;
 	width:20px;
 	height:20px;
@@ -139,11 +139,11 @@
 	position: relative;
 }
 
-.dashboard-item-overlay{
+.dashboard-item-overlay {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
-.dashboard-item-overlay::before{
+.dashboard-item-overlay::before {
 	position:absolute;
 	content:"";
 	top:0.25rem;
@@ -154,19 +154,19 @@
 	opacity: 0.5;
 }
 
-#deleteBookmark i{
+#deleteBookmark i {
 	color: var(--fhc-dashboard-danger);
 }
 
-.pin:hover{
+.pin:hover {
 	cursor: pointer;
 }
 
-.pin[pinned]:hover{
+.pin[pinned]:hover {
 	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
-.section-info{
+.section-info {
 	color: var(--fhc-dashboard-section-info-color);
 	cursor:pointer;
 }
@@ -204,13 +204,13 @@
 
 }
 
-.hiddenWidget{
+.hiddenWidget {
 	background: var(--fhc-disabled-background);
 	opacity: 40%;
 }
 
 .hiddenWidget .card,
 .hiddenWidget .card-body,
-.hiddenWidget .card-body *{
+.hiddenWidget .card-body * {
 	background: inherit !important;
 }

From c58715d95bff4091190a34ec6f4bcddf08bfb145 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:52:57 +0200
Subject: [PATCH 044/189] dashboard css remove doubles

---
 public/css/components/dashboard.css | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 5dc735ba6..6a01ccbf4 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -17,12 +17,6 @@
 	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
-@media(max-width: 577px) {
-	:root {
-		--fhc-dashboard-grid-size: 1;
-	}
-}
-
 .core-dashboard a {
 	color: var(--fhc-dashboard-link);
 }
@@ -74,16 +68,6 @@
 	background-color: var(--fhc-dashboard-danger);
 }
 
-:root {
-	--fhc-dashboard-grid-size: 4;
-}
-
-@media(max-width: 1400px) {
-	:root {
-		--fhc-dashboard-grid-size: 4;
-	}
-}
-
 @media(max-width: 1200px) {
 	:root {
 		--fhc-dashboard-grid-size: 3;

From b9207b5efb223c140fc2f78dd2dfd758080a14f4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:54:36 +0200
Subject: [PATCH 045/189] make drop grid padding configurable via css

---
 public/js/components/Drop/Grid.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 0128905c4..a0f9df473 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -131,8 +131,10 @@ export default {
 			return {
 				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
 				'--fhc-dg-col-width': 100/this.cols + '%',
-				'--fhc-dg-item-padding-horizontal': '0.25%',
-				'--fhc-dg-item-padding-top': '0.5%',
+				'--fhc-dg-item-padding':
+					'var(--fhc-dg-item-py, var(--fhc-dg-item-p, .25%))' +
+					' ' +
+					'var(--fhc-dg-item-px, var(--fhc-dg-item-p, .25%))',
 				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
 			}
 		},
@@ -618,9 +620,7 @@ export default {
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',
 					height: 'calc(' + item.h + ' * var(--fhc-dg-row-height))',
-					paddingTop: 'var(--fhc-dg-item-padding-top)',
-					paddingLeft: 'var(--fhc-dg-item-padding-horizontal)',
-					paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
+					padding: 'var(--fhc-dg-item-padding)'
 				}"
 				@start-move="startMove"
 				@mouse-down="mouseDown"

From 290564fd2fa3e570bbfc3057312e386a162ede0c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:55:07 +0200
Subject: [PATCH 046/189] bigger padding for dashboard items in mobile view

---
 public/css/components/dashboard.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 6a01ccbf4..e7394ea74 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -89,6 +89,7 @@
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
+		--fhc-dg-item-py: .75rem;
 	}
 }
 

From 57e7ad69034d04457e7b90d60a1aa7f74e3ec2ad Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Apr 2026 15:55:56 +0200
Subject: [PATCH 047/189] don't render hidden widgets in default (non edit)
 mode

---
 public/js/components/Dashboard/Section.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index adac53c3c..e04cc2473 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -86,7 +86,9 @@ export default {
 				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 }) };
 			});
 
-			return placedItems;
+			if (this.editModeIsActive)
+				return placedItems;
+			return placedItems.filter(item => !item.hidden);
 		}
 	},
 	methods: {

From 653a320e6c2a0cea6d2e71b036e2eabb1bb7d799 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 10 Apr 2026 12:57:58 +0200
Subject: [PATCH 048/189] Display section name only in admin mode & display
 source information for widgets (from which section it is) in non-admin mode

---
 public/js/components/Dashboard/Item.js    | 26 ++++++++--
 public/js/components/Dashboard/Section.js | 47 +++++++++---------
 system/phrasesupdate.php                  | 60 +++++++++++++++++++++++
 3 files changed, 107 insertions(+), 26 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 196329377..3ba1971d2 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -39,9 +39,22 @@ export default {
 		"place",
 		"resizeLimits",
 		"dragstate",
-		"resizeOverlay"
+		"resizeOverlay",
+		"source"
 	],
 	computed: {
+		sourceInfoTooltip() {
+			switch (this.source) {
+				case null:
+					return '';
+				case 'general':
+					return this.$p.t('dashboard', 'widgetFromGeneralSection');
+				case 'custom':
+					return this.$p.t('dashboard', 'widgetFromCustomSection');
+				default:
+					return this.$p.t('dashboard', 'widgetFromFunktionSection', [this.source]);
+			}
+		},
 		isResizeableHorizontal() {
 			if (this.resizeLimits.width === undefined)
 				return true;
@@ -193,6 +206,13 @@ export default {
 					</span>
 				</Transition>
 				<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+				<div
+					v-if="source"
+					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
+					class="col-auto me-2"
+				>
+					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
+				</div>
 				<template v-if="isPinned">
 					<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
 						<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
@@ -207,8 +227,8 @@ export default {
 					</div>
 				</template>
 				<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto">
-	          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
-	          	</a>
+					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
+				</a>
 				<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
 				<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
 					<i class="fa-solid fa-trash" aria-hidden="true"></i>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index e04cc2473..159763da9 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -52,6 +52,26 @@ export default {
 		};
 	},
 	computed: {
+		sectionNameTranslation() {
+			switch (this.name) {
+				case "general": 
+					return this.$p.t('dashboard', this.name); 
+				case "custom":
+					return this.$p.t('dashboard', this.name);
+				default:
+					return this.name;
+			}
+		},
+		showSectionInformation() {
+			switch (this.name) {
+				case "general": 
+					return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
+				case "custom":
+					return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
+				default:
+					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
+			}
+		},
 		computedWidgetsSetup() {
 			if (!this.widgetsSetup)
 				return {};
@@ -92,26 +112,6 @@ export default {
 		}
 	},
 	methods: {
-		sectionNameTranslation() {
-			switch (this.name) {
-				case "general": 
-					return this.$p.t('dashboard', this.name); 
-				case "custom":
-					return this.$p.t('dashboard', this.name);
-				default:
-					return this.name;
-			}
-		},
-		showSectionInformation() {
-			switch (this.name) {
-				case "general": 
-					return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
-				case "custom":
-					return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
-				default:
-					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
-			}
-		},
 		handleConfigOpened() {
 			this.configOpened = true
 		},
@@ -225,9 +225,9 @@ export default {
 		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
 		ref="container"
 	>
-		<h4 v-if="editModeIsActive" class=" mb-2">
-			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-			{{ sectionNameTranslation() }}:
+		<h4 v-if="adminMode" class=" mb-2">
+			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
+			{{ sectionNameTranslation }}:
 		</h4>
 		<button
 			v-tooltip="$p.t('dashboard','addLine')"
@@ -269,6 +269,7 @@ export default {
 					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
 					:resize-limits="computedWidgetsSetup[item.widget]"
+					:source="adminMode ? null : item.source || 'custom'"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f7628f8ef..64a6dee3b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -47226,6 +47226,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widgetFromGeneralSection',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieses Widget ist für das Dashboard vordefiniert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This is a predefined widget of this dashboard',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widgetFromCustomSection',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieses Widget wurde von Ihnen hinzugefügt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This widget has been added by you',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widgetFromFunktionSection',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieses Widget wurde hinzugefügt weil Sie der "{0}" Funktion zugewiesen wurden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This widget has been added because you have been assigned to the "{0}" function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 // CIS4 phrases from legacy code end
 // FHC4 Phrases Abschlusspruefung
 	array(

From 6c90ccfbaadd7cce8a4d9622db00138fcd0c1c49 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 10:38:58 +0200
Subject: [PATCH 049/189] add drag-drop-touch-js/dragdroptouch to composer and
 use it to add drag and drop functionality for touch devices

---
 composer.json                          | 14 ++++++++++++++
 composer.lock                          | 12 +++++++++++-
 public/js/components/Dashboard/Item.js |  7 +++++++
 public/js/directives/dragClick.js      |  7 +++++++
 public/js/directives/draggable.js      |  7 +++++++
 public/js/directives/drop.js           |  7 +++++++
 6 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c1f4506c6..ce6fc71e1 100644
--- a/composer.json
+++ b/composer.json
@@ -70,6 +70,18 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "drag-drop-touch-js/dragdroptouch",
+				"version": "2.0.3",
+				"source": {
+					"url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
+					"type": "git",
+					"reference": "master"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -452,6 +464,8 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
+		"drag-drop-touch-js/dragdroptouch": "*",
+
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",
diff --git a/composer.lock b/composer.lock
index 7525b7f5b..212eea3be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -804,6 +804,16 @@
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
+        {
+            "name": "drag-drop-touch-js/dragdroptouch",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
+                "reference": "master"
+            },
+            "type": "library"
+        },
         {
             "name": "easyrdf/easyrdf",
             "version": "0.9.1",
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 3ba1971d2..6db83caed 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -2,6 +2,13 @@ import BsModal from "../Bootstrap/Modal.js";
 import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
+import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
+
+if (!document.dragDropTouchActive) {
+	enableDragDropTouch();
+	document.dragDropTouchActive = true;
+}
+
 export default {
 	name: 'Item',
 	components: {
diff --git a/public/js/directives/dragClick.js b/public/js/directives/dragClick.js
index 5603eb93f..9e6048c9a 100644
--- a/public/js/directives/dragClick.js
+++ b/public/js/directives/dragClick.js
@@ -1,5 +1,12 @@
 import { bindDragEnterLeave } from '../helpers/DragAndDrop.js';
 
+import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
+
+if (!document.dragDropTouchActive) {
+	enableDragDropTouch();
+	document.dragDropTouchActive = true;
+}
+
 export default {
 	mounted(el, binding) {
 		const delay = parseInt(binding.arg) || 300;
diff --git a/public/js/directives/draggable.js b/public/js/directives/draggable.js
index 64747c15a..d534b9703 100644
--- a/public/js/directives/draggable.js
+++ b/public/js/directives/draggable.js
@@ -1,5 +1,12 @@
 import { setTransferData, convertToValidDragObject } from '../helpers/DragAndDrop.js';
 
+import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
+
+if (!document.dragDropTouchActive) {
+	enableDragDropTouch();
+	document.dragDropTouchActive = true;
+}
+
 const EFFECTS = [
 	'none',
 	'copy',
diff --git a/public/js/directives/drop.js b/public/js/directives/drop.js
index 4c50e1b8e..4e14c5296 100644
--- a/public/js/directives/drop.js
+++ b/public/js/directives/drop.js
@@ -1,5 +1,12 @@
 import { getValidTransferData, eventHasTypes, bindDragEnterLeave } from '../helpers/DragAndDrop.js';
 
+import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
+
+if (!document.dragDropTouchActive) {
+	enableDragDropTouch();
+	document.dragDropTouchActive = true;
+}
+
 const EFFECTS = [
 	'move',
 	'copy',

From f1c3c8296f8ccdca189a79bf079dbd31488c76e9 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 13 Apr 2026 10:41:41 +0200
Subject: [PATCH 050/189] implemented 'OtherLvPlan' to view other users'
 timetables

---
 application/config/routes.php                 |   1 +
 application/controllers/Cis/OtherLvPlan.php   |  39 ++
 application/controllers/Cis/Profil.php        |   6 +-
 .../controllers/api/frontend/v1/LvPlan.php    | 114 ++--
 .../api/frontend/v1/OtherLvPlan.php           |  78 +++
 application/development/config.php            | 517 ++++++++++++++++++
 application/development/database.php          | 122 +++++
 application/libraries/StundenplanLib.php      |  15 +-
 .../models/ressource/Reservierung_model.php   |  34 +-
 package-lock.json                             |   6 +
 public/js/api/factory/lvPlan.js               |   9 +-
 public/js/api/factory/otherLvPlan.js          |  25 +
 public/js/apps/Cis.js                         |  30 +-
 public/js/apps/Dashboard/Fhc.js               |  11 +
 .../js/components/Cis/LvPlan/OtherLvPlan.js   | 248 +++++++++
 .../Cis/Profil/MitarbeiterProfil.js           |  35 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |  52 +-
 .../Cis/Profil/ProfilComponents/QuickLinks.js |  72 +--
 .../js/components/Cis/Profil/StudentProfil.js |  31 +-
 .../Cis/Profil/StudentViewProfil.js           |  56 +-
 .../Cis/Renderer/Lehreinheit/modalContent.js  |   3 +-
 21 files changed, 1285 insertions(+), 219 deletions(-)
 create mode 100644 application/controllers/Cis/OtherLvPlan.php
 create mode 100644 application/controllers/api/frontend/v1/OtherLvPlan.php
 create mode 100644 application/development/config.php
 create mode 100644 application/development/database.php
 create mode 100644 package-lock.json
 create mode 100644 public/js/api/factory/otherLvPlan.js
 create mode 100644 public/js/components/Cis/LvPlan/OtherLvPlan.js

diff --git a/application/config/routes.php b/application/config/routes.php
index 475168141..f397a2007 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -64,6 +64,7 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
+$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
 //Routes for Lvplan Verband and page for dropdown Stg/Semester/Verband/Gruppe
 $route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
 $route['Cis/OverviewLvPlan/.*'] = 'Cis/OverviewLvPlan/index/$1';
diff --git a/application/controllers/Cis/OtherLvPlan.php b/application/controllers/Cis/OtherLvPlan.php
new file mode 100644
index 000000000..3fbe3e91a
--- /dev/null
+++ b/application/controllers/Cis/OtherLvPlan.php
@@ -0,0 +1,39 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+/**
+ *
+ */
+class OtherLvPlan extends Auth_Controller
+{
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct([
+            'index' => ['basis/cis:r']
+        ]);
+
+        // Load Config
+        $this->load->config('calendar');
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+
+    /**
+     * @return void
+     */
+    public function index()
+    {
+
+        $viewData = array(
+            'timezone' => $this->config->item('timezone')
+        );
+
+        $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OtherLvPlan']);
+    }
+}
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index c287d87d0..cc64c5a67 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -87,9 +87,9 @@ class Profil extends Auth_Controller
 	}
 
 	/**
-	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+	 * checks whether a specific userID is a student or not (foreword declaration of the function isStudent in Student_model.php)
 	 * @access public
-	 * @param  $uid the userID used to check if it is a mitarbeiter
+	 * @param  $uid the userID used to check if it is a student
 	 * @return boolean 
 	 */
 	public function isStudent($uid)
@@ -119,7 +119,7 @@ class Profil extends Auth_Controller
 	}
 
 	/**
-	 * gets the adressen that are marked as zustell from the currenlty logged in user
+	 * gets the adressen that are marked as zustell from the currently logged in user
 	 * @access public
 	 * @return array a list of adresse_id's 
 	 */
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index d0f4fa7ba..e0159d9b2 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 use CI3_Events as Events;
 use \DateTime as DateTime;
@@ -33,8 +34,8 @@ class LvPlan extends FHCAPI_Controller
 
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
-            'Stunden' => self::PERM_LOGGED,
-            'getReservierungen' => self::PERM_LOGGED,
+			'Stunden' => self::PERM_LOGGED,
+			'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'eventsPersonal' => self::PERM_LOGGED,
 			'eventsLv' => self::PERM_LOGGED,
@@ -49,8 +50,8 @@ class LvPlan extends FHCAPI_Controller
 
 		]);
 
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
+		$this->load->library('LogLib');
+		$this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -58,17 +59,17 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));
 
-        $this->load->library('form_validation');
+		$this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-     * fetches LvPlan and Moodle events together
-     * @access public
-     *
-     */
+	 * fetches LvPlan and Moodle events together
+	 * @access public
+	 *
+	 */
 	public function LvPlanEvents()
 	{
 		$hasLv = $this->input->post('lv_id');
@@ -95,16 +96,17 @@ class LvPlan extends FHCAPI_Controller
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
+		$uid = $this->input->post('uid', true);
 
 		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
+		$moodleEvents = $uid ? [] : $this->fetchMoodleEvents($start_date, $end_date);
 
 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
 
 
 		$this->terminateWithSuccess(array_merge(
@@ -128,15 +130,11 @@ class LvPlan extends FHCAPI_Controller
 		$this->form_validation->set_rules('end_date', "end_date", "required");
 		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
 
-		if (!$this->form_validation->run())
-		{
+		if (!$this->form_validation->run()) {
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 			$stgOrgEvents = [];
 			$ferienEvents = [];
-		}
-
-		else
-		{
+		} else {
 			$start_date = $this->input->post('start_date', true);
 			$end_date = $this->input->post('end_date', true);
 			$stg_kz = $this->input->post('stg_kz', true);
@@ -170,7 +168,7 @@ class LvPlan extends FHCAPI_Controller
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
 		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
-		
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -193,40 +191,42 @@ class LvPlan extends FHCAPI_Controller
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date){
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
-		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
+	public function studiensemesterDateInterval($date)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
+		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}
 
-	public function getLvPlanForStudiensemester($studiensemester,$lvid){
+	public function getLvPlanForStudiensemester($studiensemester, $lvid)
+	{
 		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'), date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
-		
-	}
-		
 
-    /**
-     * fetches Stunden layout from database
-     * @access public
-     *
-     */
-    public function Stunden()
+	}
+
+
+	/**
+	 * fetches Stunden layout from database
+	 * @access public
+	 *
+	 */
+	public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
 		$this->StundeModel->addOrder('stunde', 'ASC');
 		$stunden = $this->StundeModel->load();
 
-        $stunden = $this->getDataOrTerminateWithError($stunden);
+		$stunden = $this->getDataOrTerminateWithError($stunden);
 
 		$this->terminateWithSuccess($stunden);
 	}
@@ -257,10 +257,10 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
 		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		
+
 		$this->terminateWithSuccess($roomplan_data);
 	}
-	
+
 	/**
 	 * gets the reservierungen of a room if the ort_kurzbz parameter is
 	 * supplied otherwise gets the reservierungen of the lvplan of a student
@@ -273,25 +273,27 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-		
+
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
+		$uid = $this->input->post('uid', true);
 
 		// get data
 		$this->load->library('StundenplanLib');
 
-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
 
 		$result = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getLehreinheitStudiensemester($lehreinheit_id){
+	public function getLehreinheitStudiensemester($lehreinheit_id)
+	{
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -336,7 +338,7 @@ class LvPlan extends FHCAPI_Controller
 
 	public function getStudiengaenge()
 	{
-		$this->load->model('organisation/Studiengang_model','StudiengangModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
 		$this->StudiengangModel->addOrder('typ');
 		$this->StudiengangModel->addOrder('kurzbz');
@@ -349,19 +351,19 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess($data);
 	}
 
-	public function getLehrverband($studiengang_kz, $semester=null, $verband=null)
+	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
 	{
-		$this->load->model('organisation/Lehrverband_model','LehrverbandModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 
 		$where = [
 			'aktiv' => true,
 			'studiengang_kz' => $studiengang_kz,
 		];
 
-		if ($semester !== null  && $semester !== 'null' && $semester !== 'undefined') {
+		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
 			$where['semester'] = $semester;
 		}
-		if ($verband !== null  && $verband !== 'null' && $verband !== 'undefined') {
+		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
 			$where['verband'] = $verband;
 		}
 
@@ -388,19 +390,19 @@ class LvPlan extends FHCAPI_Controller
 		$this->load->config('calendar');
 
 		$tz = new DateTimeZone($this->config->item('timezone'));
-		
+
 		$start = new DateTime($start_date);
 		$start->setTimezone($tz);
-		
+
 		$end = new DateTime($end_date);
 		$end->setTimezone($tz);
 		$end->modify('+1 day -1 second');
-		
+
 		$moodle_events = [];
-		
+
 		Events::trigger(
 			'moodleCalendarEvents',
-			function & () use (&$moodle_events) {
+			function &() use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
@@ -420,7 +422,7 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date)
+	private function fetchFerienEvents($start_date, $end_date, $uid = null)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
@@ -432,7 +434,7 @@ class LvPlan extends FHCAPI_Controller
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
 
 			$studiengang = $this->StudentLehrverbandModel->loadWhere([
-				"student_uid" => getAuthUID(),
+				"student_uid" => $uid ?? getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
diff --git a/application/controllers/api/frontend/v1/OtherLvPlan.php b/application/controllers/api/frontend/v1/OtherLvPlan.php
new file mode 100644
index 000000000..a144fb549
--- /dev/null
+++ b/application/controllers/api/frontend/v1/OtherLvPlan.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class OtherLvPlan extends FHCAPI_Controller
+{
+
+    /**
+     * Object initialization
+     */
+    public function __construct()
+    {
+        parent::__construct([
+            'getBasicUserAttributesForLvPlanDisplay' => self::PERM_LOGGED,
+        ]);
+
+        $this->load->library('PermissionLib');
+        $this->load->library('form_validation');
+
+        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+        $this->load->model('person/Benutzer_model', 'BenutzerModel');
+
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Public methods
+
+    /**
+     * retrieves basic user attributes necessary for LV Plan display
+     * @access public
+     * @param  $uid the userID for which basic attributes are retrieved
+     * @return stdClass consisting of basic user attributes 
+     */
+    public function getBasicUserAttributesForLvPlanDisplay($uid)
+    {
+        $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
+        $isMitarbeiter = getData($isMitarbeiterResult);
+        $isStudent = !$isMitarbeiter;
+
+        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
+        $this->BenutzerModel->addJoin("tbl_person", "person_id");
+        $personResult = $this->BenutzerModel->load([$uid]);
+        $person = hasData($personResult) ? getData($personResult) : null;
+
+        $result = [
+            "username" => $uid,
+            "is_student" => $isStudent,
+            "is_mitarbeiter" => $isMitarbeiter,
+            "foto" => $person[0]->foto,
+            "vorname" => $person[0]->vorname,
+            "nachname" => $person[0]->nachname,
+        ];
+
+        $this->terminateWithSuccess($result);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+}
+
diff --git a/application/development/config.php b/application/development/config.php
new file mode 100644
index 000000000..d254722bb
--- /dev/null
+++ b/application/development/config.php
@@ -0,0 +1,517 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Base Site URL
+|--------------------------------------------------------------------------
+|
+| URL to your CodeIgniter root. Typically this will be your base URL,
+| WITH a trailing slash:
+|
+|	http://example.com/
+|
+| If this is not set then CodeIgniter will try guess the protocol, domain
+| and path to your installation. However, you should always configure this
+| explicitly and never rely on auto-guessing, especially in production
+| environments.
+|
+*/
+$config['base_url'] = 'https://c3p0.dev.technikum-wien.at/ma1434/core/FHC-Core/';
+
+/*
+|--------------------------------------------------------------------------
+| Index File
+|--------------------------------------------------------------------------
+|
+| Typically this will be your index.php file, unless you've renamed it to
+| something else. If you are using mod_rewrite to remove the page set this
+| variable so that it is blank.
+|
+*/
+$config['index_page'] = 'index.ci.php';
+
+/*
+|--------------------------------------------------------------------------
+| URI PROTOCOL
+|--------------------------------------------------------------------------
+|
+| This item determines which server global should be used to retrieve the
+| URI string.  The default setting of 'REQUEST_URI' works for most servers.
+| If your links do not seem to work, try one of the other delicious flavors:
+|
+| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+|
+| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+*/
+$config['uri_protocol']	= 'REQUEST_URI';
+
+/*
+|--------------------------------------------------------------------------
+| URL suffix
+|--------------------------------------------------------------------------
+|
+| This option allows you to add a suffix to all URLs generated by CodeIgniter.
+| For more information please see the user guide:
+|
+| http://codeigniter.com/user_guide/general/urls.html
+*/
+$config['url_suffix'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Default Language
+|--------------------------------------------------------------------------
+|
+| This determines which set of language files should be used. Make sure
+| there is an available translation if you intend to use something other
+| than english.
+|
+*/
+$config['language']	= '';
+
+/*
+|--------------------------------------------------------------------------
+| Default Character Set
+|--------------------------------------------------------------------------
+|
+| This determines which character set is used by default in various methods
+| that require a character set to be provided.
+|
+| See http://php.net/htmlspecialchars for a list of supported charsets.
+|
+*/
+$config['charset'] = 'UTF-8';
+
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| If you would like to use the 'hooks' feature you must enable it by
+| setting this variable to TRUE (boolean).  See the user guide for details.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| This item allows you to set the filename/classname prefix when extending
+| native libraries.  For more information please see the user guide:
+|
+| http://codeigniter.com/user_guide/general/core_classes.html
+| http://codeigniter.com/user_guide/general/creating_libraries.html
+|
+*/
+$config['subclass_prefix'] = 'FHC_';
+
+/*
+|--------------------------------------------------------------------------
+| Composer auto-loading
+|--------------------------------------------------------------------------
+|
+| Enabling this setting will tell CodeIgniter to look for a Composer
+| package auto-loader script in application/vendor/autoload.php.
+|
+|	$config['composer_autoload'] = TRUE;
+|
+| Or if you have your vendor/ directory located somewhere else, you
+| can opt to set a specific path as well:
+|
+|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
+|
+| For more information about Composer, please visit http://getcomposer.org/
+|
+| Note: This will NOT disable or override the CodeIgniter-specific
+|	autoloading (application/config/autoload.php)
+*/
+$config['composer_autoload'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted within your URLs.
+| When someone tries to submit a URL with disallowed characters they will
+| get a warning message.
+|
+| As a security measure you are STRONGLY encouraged to restrict URLs to
+| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+|
+| The configured value is actually a regular expression character group
+| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
+|
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
+
+/*
+|--------------------------------------------------------------------------
+| Enable Query Strings
+|--------------------------------------------------------------------------
+|
+| By default CodeIgniter uses search-engine friendly segment based URLs:
+| example.com/who/what/where/
+|
+| By default CodeIgniter enables access to the $_GET array.  If for some
+| reason you would like to disable it, set 'allow_get_array' to FALSE.
+|
+| You can optionally enable standard query string based URLs:
+| example.com?who=me&what=something&where=here
+|
+| Options are: TRUE or FALSE (boolean)
+|
+| The other items let you set the query string 'words' that will
+| invoke your controllers and its functions:
+| example.com/index.php?c=controller&m=function
+|
+| Please note that some of the helpers won't work as expected when
+| this feature is enabled, since CodeIgniter is designed primarily to
+| use segment based URLs.
+|
+*/
+$config['allow_get_array'] = TRUE;
+$config['enable_query_strings'] = FALSE;
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+$config['directory_trigger'] = 'd';
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Threshold
+|--------------------------------------------------------------------------
+|
+| You can enable error logging by setting a threshold over zero. The
+| threshold determines what gets logged. Threshold options are:
+|
+|	0 = Disables logging, Error logging TURNED OFF
+|	1 = Error Messages (including PHP errors)
+|	2 = Debug Messages
+|	3 = Informational Messages
+|	4 = All Messages
+|
+| You can also pass an array with threshold levels to show individual error types
+|
+| 	array(2) = Debug Messages, without Error Messages
+|
+| For a live site you'll usually only enable Errors (1) to be logged otherwise
+| your log files will fill up very fast.
+|
+*/
+$config['log_threshold'] = 1;
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/logs/ directory. Use a full server path with trailing slash.
+|
+*/
+$config['log_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Extension
+|--------------------------------------------------------------------------
+|
+| The default filename extension for log files. The default 'php' allows for
+| protecting the log files via basic scripting, when they are to be stored
+| under a publicly accessible directory.
+|
+| Note: Leaving it blank will default to 'php'.
+|
+*/
+$config['log_file_extension'] = 'log';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Permissions
+|--------------------------------------------------------------------------
+|
+| The file system permissions to be applied on newly created log files.
+|
+| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+|            integer notation (i.e. 0700, 0644, etc.)
+*/
+$config['log_file_permissions'] = 0644;
+
+/*
+|--------------------------------------------------------------------------
+| Date Format for Logs
+|--------------------------------------------------------------------------
+|
+| Each item that is logged has an associated date. You can use PHP date
+| codes to set your own date formatting
+|
+*/
+$config['log_date_format'] = 'Y-m-d H:i:s';
+
+/*
+|--------------------------------------------------------------------------
+| Error Views Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/views/errors/ directory.  Use a full server path with trailing slash.
+|
+*/
+$config['error_views_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/cache/ directory.  Use a full server path with trailing slash.
+|
+*/
+$config['cache_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Include Query String
+|--------------------------------------------------------------------------
+|
+| Whether to take the URL query string into consideration when generating
+| output cache files. Valid options are:
+|
+|	FALSE      = Disabled
+|	TRUE       = Enabled, take all query parameters into account.
+|	             Please be aware that this may result in numerous cache
+|	             files generated for the same page over and over again.
+|	array('q') = Enabled, but only take into account the specified list
+|	             of query parameters.
+|
+*/
+$config['cache_query_string'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Encryption Key
+|--------------------------------------------------------------------------
+|
+| If you use the Encryption class, you must set an encryption key.
+| See the user guide for more info.
+|
+| http://codeigniter.com/user_guide/libraries/encryption.html
+|
+*/
+$config['encryption_key'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Session Variables
+|--------------------------------------------------------------------------
+|
+| 'sess_driver'
+|
+|	The storage driver to use: files, database, redis, memcached
+|
+| 'sess_cookie_name'
+|
+|	The session cookie name, must contain only [0-9a-z_-] characters
+|
+| 'sess_expiration'
+|
+|	The number of SECONDS you want the session to last.
+|	Setting to 0 (zero) means expire when the browser is closed.
+|
+| 'sess_save_path'
+|
+|	The location to save sessions to, driver dependent.
+|
+|	For the 'files' driver, it's a path to a writable directory.
+|	WARNING: Only absolute paths are supported!
+|
+|	For the 'database' driver, it's a table name.
+|	Please read up the manual for the format with other session drivers.
+|
+|	IMPORTANT: You are REQUIRED to set a valid save path!
+|
+| 'sess_match_ip'
+|
+|	Whether to match the user's IP address when reading the session data.
+|
+| 'sess_time_to_update'
+|
+|	How many seconds between CI regenerating the session ID.
+|	NOTE: Keep it as it is to prevent security issues (https://en.wikipedia.org/wiki/Session_fixation)
+|
+| 'sess_regenerate_destroy'
+|
+|	Whether to destroy session data associated with the old session ID
+|	when auto-regenerating the session ID. When set to FALSE, the data
+|	will be later deleted by the garbage collector.
+|
+| Other session cookie settings are shared with the rest of the application,
+| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
+|
+*/
+$config['sess_driver'] = 'files';
+$config['sess_cookie_name'] = 'sess_ci_session';
+$config['sess_expiration'] = 1800; // Session expires every 30 minutes
+$config['sess_save_path'] = NULL;
+$config['sess_match_ip'] = FALSE;
+$config['sess_time_to_update'] = 300;
+$config['sess_regenerate_destroy'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cookie Related Variables
+|--------------------------------------------------------------------------
+|
+| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
+| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
+| 'cookie_path'     = Typically will be a forward slash
+| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
+| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
+|
+| Note: These settings (with the exception of 'cookie_prefix' and
+|       'cookie_httponly') will also affect sessions.
+|
+*/
+$config['cookie_prefix']	= '';
+$config['cookie_domain']	= '';
+$config['cookie_path']		= '/';
+$config['cookie_secure']	= FALSE;
+$config['cookie_httponly'] 	= FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Standardize newlines
+|--------------------------------------------------------------------------
+|
+| Determines whether to standardize newline characters in input data,
+| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
+|
+| This is particularly useful for portability between UNIX-based OSes,
+| (usually \n) and Windows (\r\n).
+|
+*/
+$config['standardize_newlines'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Global XSS Filtering
+|--------------------------------------------------------------------------
+|
+| Determines whether the XSS filter is always active when GET, POST or
+| COOKIE data is encountered
+|
+| WARNING: This feature is DEPRECATED and currently available only
+|          for backwards compatibility purposes!
+|
+*/
+$config['global_xss_filtering'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cross Site Request Forgery
+|--------------------------------------------------------------------------
+| Enables a CSRF cookie token to be set. When set to TRUE, token will be
+| checked on a submitted form. If you are accepting user data, it is strongly
+| recommended CSRF protection be enabled.
+|
+| 'csrf_token_name' = The token name
+| 'csrf_cookie_name' = The cookie name
+| 'csrf_expire' = The number in seconds the token should expire.
+| 'csrf_regenerate' = Regenerate token on every submission
+| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
+*/
+$config['csrf_protection'] = FALSE;
+$config['csrf_token_name'] = 'csrf_test_name';
+$config['csrf_cookie_name'] = 'csrf_cookie_name';
+$config['csrf_expire'] = 7200;
+$config['csrf_regenerate'] = TRUE;
+$config['csrf_exclude_uris'] = array();
+
+/*
+|--------------------------------------------------------------------------
+| Output Compression
+|--------------------------------------------------------------------------
+|
+| Enables Gzip output compression for faster page loads.  When enabled,
+| the output class will test whether your server supports Gzip.
+| Even if it does, however, not all browsers support compression
+| so enable only if you are reasonably sure your visitors can handle it.
+|
+| Only used if zlib.output_compression is turned off in your php.ini.
+| Please do not use it together with httpd-level output compression.
+|
+| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
+| means you are prematurely outputting something to your browser. It could
+| even be a line of whitespace at the end of one of your scripts.  For
+| compression to work, nothing can be sent before the output buffer is called
+| by the output class.  Do not 'echo' any values with compression enabled.
+|
+*/
+$config['compress_output'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Master Time Reference
+|--------------------------------------------------------------------------
+|
+| Options are 'local' or any PHP supported timezone. This preference tells
+| the system whether to use your server's local time as the master 'now'
+| reference, or convert it to the configured one timezone. See the 'date
+| helper' page of the user guide for information regarding date handling.
+|
+*/
+$config['time_reference'] = 'local';
+
+/*
+|--------------------------------------------------------------------------
+| Rewrite PHP Short Tags
+|--------------------------------------------------------------------------
+|
+| If your PHP installation does not have short tag support enabled CI
+| can rewrite the tags on-the-fly, enabling you to utilize that syntax
+| in your view files.  Options are TRUE or FALSE (boolean)
+|
+| Note: You need to have eval() enabled for this to work.
+|
+*/
+$config['rewrite_short_tags'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Reverse Proxy IPs
+|--------------------------------------------------------------------------
+|
+| If your server is behind a reverse proxy, you must whitelist the proxy
+| IP addresses from which CodeIgniter should trust headers such as
+| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+| the visitor's IP address.
+|
+| You can use both an array or a comma-separated list of proxy addresses,
+| as well as specifying whole subnets. Here are a few examples:
+|
+| Comma-separated:	'10.0.1.200,192.168.5.0/24'
+| Array:		array('10.0.1.200', '192.168.5.0/24')
+*/
+$config['proxy_ips'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| FHComplete Build Version
+|--------------------------------------------------------------------------
+|
+| Version Number of the Current Build
+| This is used to invalidate Cache for JS and CSS Files
+| 
+| Example: 2019102901
+*/
+$config['fhcomplete_build_version'] = '2019102903';
diff --git a/application/development/database.php b/application/development/database.php
new file mode 100644
index 000000000..fde6d6e68
--- /dev/null
+++ b/application/development/database.php
@@ -0,0 +1,122 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+defined('DB_HOST') OR require_once './config/system.config.inc.php'; // For CLI-Migrations
+
+/*
+| -------------------------------------------------------------------
+| DATABASE CONNECTIVITY SETTINGS
+| -------------------------------------------------------------------
+| This file will contain the settings needed to access your database.
+|
+| For complete instructions please consult the 'Database Connection'
+| page of the User Guide.
+|
+| -------------------------------------------------------------------
+| EXPLANATION OF VARIABLES
+| -------------------------------------------------------------------
+|
+|	['dsn']      The full DSN string describe a connection to the database.
+|	['hostname'] The hostname of your database server.
+|	['username'] The username used to connect to the database
+|	['password'] The password used to connect to the database
+|	['database'] The name of the database you want to connect to
+|	['dbdriver'] The database driver. e.g.: mysqli.
+|			Currently supported:
+|				 cubrid, ibase, mssql, mysql, mysqli, oci8,
+|				 odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
+|	['dbprefix'] You can add an optional prefix, which will be added
+|				 to the table name when using the  Query Builder class
+|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+|	['cache_on'] TRUE/FALSE - Enables/disables query caching
+|	['cachedir'] The path to the folder where cache files should be stored
+|	['char_set'] The character set used in communicating with the database
+|	['dbcollat'] The character collation used in communicating with the database
+|				 NOTE: For MySQL and MySQLi databases, this setting is only used
+| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
+|				 (and in table creation queries made with DB Forge).
+| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
+| 				 can make your site vulnerable to SQL injection if you are using a
+| 				 multi-byte character set and are running versions lower than these.
+| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
+|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
+|	['encrypt']  Whether or not to use an encrypted connection.
+|
+|			'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+|			'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
+|
+|				'ssl_key'    - Path to the private key file
+|				'ssl_cert'   - Path to the public key certificate file
+|				'ssl_ca'     - Path to the certificate authority file
+|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+|				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
+|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
+|
+|	['compress'] Whether or not to use client compression (MySQL only)
+|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
+|							- good for ensuring strict SQL while developing
+|	['ssl_options']	Used to set various SSL options that can be used when making SSL connections.
+|	['failover'] array - A array with 0 or more data for connections if the main should fail.
+|	['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
+| 				NOTE: Disabling this will also effectively disable both
+| 				$this->db->last_query() and profiling of DB queries.
+| 				When you run a query, with this setting set to TRUE (default),
+| 				CodeIgniter will store the SQL statement for debugging purposes.
+| 				However, this may cause high memory usage, especially if you run
+| 				a lot of SQL queries ... disable this to avoid that problem.
+|
+| The $active_group variable lets you choose which connection group to
+| make active.  By default there is only one group (the 'default' group).
+|
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class.
+*/
+$active_group = 'default';
+$query_builder = TRUE;
+
+$db['default'] = array(
+	'dsn'	=> '',
+	'hostname' => DB_HOST,
+	'username' => DB_USER,
+	'password' => DB_PASSWORD,
+	'port' 	   => DB_PORT,
+	'database' => DB_NAME,
+	'dbdriver' => 'postgre',
+	'dbprefix' => '',
+	'pconnect' => DB_CONNECT_PERSISTENT,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8',
+	'dbcollat' => 'utf8_general_ci',
+	'swap_pre' => '',
+	'encrypt' => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);
+
+$db['system'] = array(
+	'dsn'	=> '',
+	'hostname' => DB_HOST,
+	'username' => 'fhcomplete',
+	'password' => 'Fhcomplet3Onc4p1',
+	'database' => DB_NAME,
+	'port'     => DB_PORT,
+	'dbschema' => 'public',
+	'dbdriver' => 'postgre',
+	'dbprefix' => '',
+	'pconnect' => DB_CONNECT_PERSISTENT,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8',
+	'dbcollat' => 'utf8_general_ci',
+	'swap_pre' => '',
+	'encrypt' => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 5e4b4e453..0ee80fa86 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -40,13 +40,16 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end)
+	public function getEventsUser($start, $end, $uid = null)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$uid = getAuthUID();
+		if (!$uid) {
+			$uid = getAuthUID();
+		}
+		
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -217,7 +220,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
 	{
 		$this->_ci =& get_instance();
 
@@ -228,14 +231,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
 		}
 		
 		if (isError($reservierungen))
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 0c391ea20..cf5f1e4f9 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -18,10 +18,10 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $uid = null)
 	{
-		
-		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+
+		$lvplan_reservierungen_query = "SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -35,7 +35,7 @@ class Reservierung_model extends DB_Model
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
-		
+
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
@@ -46,9 +46,9 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
-		
-		$query_result= $this->execReadOnlyQuery("
+		$subquery = is_null($ort_kurzbz) ? $lvplan_reservierungen_query : $raum_reservierungen_query;
+
+		$query_result = $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -59,15 +59,15 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			". $subquery ."
+			" . $subquery . "
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
+		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
+
 
-		
 		return $query_result;
 	}
 
@@ -76,7 +76,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date)
+	public function getReservierungenMitarbeiter($start_date, $end_date, $uid = null)
 	{
 
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -91,8 +91,8 @@ class Reservierung_model extends DB_Model
 
 		$subquery = $raum_reservierungen_query;
 
-		
-		$query_result= $this->execReadOnlyQuery("
+
+		$query_result = $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -103,13 +103,13 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			". $subquery ."
+			" . $subquery . "
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", [getAuthUID(), $start_date, $end_date]);
+		", [$uid ?? getAuthUID(), $start_date, $end_date]);
 
 
 		return $query_result;
@@ -129,9 +129,9 @@ class Reservierung_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
-		
+
 		$query = $this->db->get_compiled_select('campus.vw_reservierung r');
-		
+
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..bbfebad87
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "FHC-Core",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 33e82cff9..f1103a47d 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -30,11 +30,11 @@ export default {
 			params: { start_date, end_date, lv_id }
 		};
 	},
-	eventsPersonal(start_date, end_date) {
+	eventsPersonal(start_date, end_date, uid = null) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/lvPlan/eventsPersonal',
-			params: { start_date, end_date }
+			params: { start_date, end_date, uid }
 		};
 	},
 	eventsLv(lv_id, start_date, end_date) {
@@ -57,11 +57,11 @@ export default {
 			params: { start_date, end_date }
 		};
 	},
-	getLvPlanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date, uid = null) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/LvPlan/getReservierungen',
-			params: { start_date, end_date }
+			params: { start_date, end_date, uid }
 		};
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
@@ -118,5 +118,4 @@ export default {
 			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
 		}
 	},
-
 };
\ No newline at end of file
diff --git a/public/js/api/factory/otherLvPlan.js b/public/js/api/factory/otherLvPlan.js
new file mode 100644
index 000000000..698531ea3
--- /dev/null
+++ b/public/js/api/factory/otherLvPlan.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getBasicUserAttributesForLvPlanDisplay(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/OtherLvPlan/getBasicUserAttributesForLvPlanDisplay/${uid}`,
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index c88a47a35..fbbf197aa 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -33,7 +33,20 @@ const app = Vue.createApp({
 										"/Cis/Profil/View/"+data.uid;
 							}
 						},
-                        childactions: []
+                        childactions: [
+							{
+                                label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
+                                icon: "fas fa-calendar-days",
+                                type: "link",
+                                action: function(data) {
+									const uid = JSON.parse(data.data).uid;
+									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/Cis/OtherLvPlan/' + uid;
+									return link;
+                                }
+                            }
+						]
 					},
 					student: {
 						defaultaction: {
@@ -44,7 +57,20 @@ const app = Vue.createApp({
 
 							}
 						},
-						childactions: []
+						childactions: [
+							{
+                                label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
+                                icon: "fas fa-calendar-days",
+                                type: "link",
+                                action: function(data) {
+									const uid = JSON.parse(data.data).uid;
+									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+										'/Cis/OtherLvPlan/' + uid;
+									return link;
+                                }
+                            }
+						]
 					},
                     room: {
                         defaultaction: {
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index c279fd716..613cd28f8 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -19,6 +19,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OverviewLvPlan from "../../components/Cis/LvPlan/OverviewLvPlan.js";
+import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -219,6 +220,16 @@ const router = VueRouter.createRouter({
 				};
 			}
 		},
+		{
+      		path: `/Cis/OtherLvPlan/:otherUid/:mode?/:focus_date?`,
+      		name: "OtherLvPlan",
+      		component: OtherLvPlan,
+      		props(route) {
+        		return {
+					propsViewData: route.params
+        		};
+      		}
+    	},
 		{
 			path: `/Cis4`,
 			name: 'Cis4',
diff --git a/public/js/components/Cis/LvPlan/OtherLvPlan.js b/public/js/components/Cis/LvPlan/OtherLvPlan.js
new file mode 100644
index 000000000..f4948ca50
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/OtherLvPlan.js
@@ -0,0 +1,248 @@
+import FormForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from "../.././../api/factory/lvPlan.js";
+import ApiOtherLvPlan from "../.././../api/factory/otherLvPlan.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
+
+export const DEFAULT_MODE_LVPLAN = "Week";
+
+export default {
+  name: "OtherLvPlan",
+  components: {
+    FormForm,
+    FormInput,
+    FhcCalendar,
+  },
+  props: {
+    viewData: Object,
+    propsViewData: Object,
+  },
+  data() {
+    return {
+      localProps: {},
+      studiensemester_kurzbz: null,
+      studiensemester_start: null,
+      studiensemester_ende: null,
+      isOtherPersonMitarbeiter: false,
+      isOtherPersonStudent: false,
+      currentStgBezeichnung: null,
+      listVerband: [],
+      listGroup: [],
+      rangeIntervalFirst: null,
+      otherPersonData: {
+        fullName: "",
+        photo: "",
+      },
+    };
+  },
+  computed: {
+    currentDay() {
+      if (
+        !this.propsViewData?.focus_date ||
+        isNaN(new Date(this.propsViewData?.focus_date))
+      )
+        return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+      return this.propsViewData?.focus_date;
+    },
+    currentMode() {
+      if (
+        !this.propsViewData?.mode ||
+        !["day", "week", "month"].includes(
+          this.propsViewData?.mode.toLowerCase(),
+        )
+      )
+        return DEFAULT_MODE_LVPLAN;
+      return this.propsViewData?.mode;
+    },
+    downloadLinks() {
+      if (
+        !this.studiensemester_start ||
+        !this.studiensemester_ende ||
+        !this.propsViewData.otherUid
+      )
+        return false;
+
+      const type = this.isOtherPersonStudent
+        ? "student"
+        : this.isOtherPersonMitarbeiter
+          ? "lektor"
+          : null;
+
+      if (!type) return;
+
+      const opts = { zone: this.viewData.timezone };
+      const start = luxon.DateTime.fromISO(
+        this.studiensemester_start,
+        opts,
+      ).toUnixInteger();
+      const ende = luxon.DateTime.fromISO(
+        this.studiensemester_ende,
+        opts,
+      ).toUnixInteger();
+
+      const download_link =
+        FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        "cis/private/lvplan/stpl_kalender.php" +
+        "?type=" +
+        type +
+        "&pers_uid=" +
+        this.propsViewData.otherUid +
+        "&begin=" +
+        start +
+        "&ende=" +
+        ende;
+
+      return [
+        {
+          title: "excel",
+          icon: "fa-solid fa-file-excel",
+          link: download_link + "&format=excel",
+        },
+        {
+          title: "csv",
+          icon: "fa-solid fa-file-csv",
+          link: download_link + "&format=csv",
+        },
+        {
+          title: "ical1",
+          icon: "fa-regular fa-calendar",
+          link: download_link + "&format=ical&version=1&target=ical",
+        },
+        {
+          title: "ical2",
+          icon: "fa-regular fa-calendar",
+          link: download_link + "&format=ical&version=2&target=ical",
+        },
+      ];
+    },
+    get_image_base64_src: function () {
+      if (!this.otherPersonData.photo?.length) {
+        return "";
+      }
+      return "data:image/jpeg;base64," + this.otherPersonData.photo;
+    },
+  },
+  watch: {
+    "propsViewData.otherUid": {
+      handler() {
+        this.$router.go();
+      },
+    },
+  },
+  methods: {
+    handleChangeDate(day, newMode) {
+      return this.handleChangeMode(newMode, day);
+    },
+    handleChangeMode(newMode, day) {
+      const mode = newMode[0].toUpperCase() + newMode.slice(1);
+      const focus_date = day.toISODate();
+
+      this.$router.push({
+        name: "OtherLvPlan",
+        params: {
+          mode,
+          focus_date,
+        },
+      });
+    },
+    updateRange(rangeInterval) {
+      this.$api
+        .call(
+          ApiLvPlan.studiensemesterDateInterval(
+            rangeInterval.end.startOf("week").toISODate(),
+          ),
+        )
+        .then((res) => {
+          this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+          this.studiensemester_start = res.data.start;
+          this.studiensemester_ende = res.data.ende;
+        });
+    },
+    getPromiseFunc(start, end) {
+      return [
+        this.$api.call(
+          ApiLvPlan.eventsPersonal(
+            start.toISODate(),
+            end.toISODate(),
+            this.propsViewData.otherUid,
+          ),
+        ),
+        this.$api.call(
+          ApiLvPlan.getLvPlanReservierungen(
+            start.toISODate(),
+            end.toISODate(),
+            this.propsViewData.otherUid,
+          ),
+        ),
+      ];
+    },
+  },
+  async created() {
+    const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+    const authId = authInfoResponse.data.uid;
+    if (authId === this.propsViewData.otherUid) {
+      this.$router.push({ name: "MyLvPlan" });
+    }
+
+    const userDataResponse = await this.$api.call(
+      ApiOtherLvPlan.getBasicUserAttributesForLvPlanDisplay(
+        this.propsViewData.otherUid,
+      ),
+    );
+
+    const userData = userDataResponse.data;
+    this.isOtherPersonMitarbeiter = !!userData.is_mitarbeiter;
+    this.isOtherPersonStudent = !!userData.is_student;
+    this.otherPersonData.fullName = userData.vorname + " " + userData.nachname;
+    this.otherPersonData.photo = userData.foto;
+  },
+  template: `
+    <div class="d-flex flex-column h-100">
+        <h2>
+            <div class="d-flex flex-row justify-content-between align-items-center">
+			          <span>    
+                    {{ $p.t('lehre/stundenplan') + (studiensemester_kurzbz ? " " + studiensemester_kurzbz : "") }}
+                </span>
+                <div @click="this.$router.push({name: 'ProfilView', params: {uid: propsViewData.otherUid}})" type="button" class="d-flex flex-row align-items-center gap-3">
+                    <span v-if="otherPersonData.fullName?.length">
+                        {{ otherPersonData.fullName }}
+                    </span>
+                    <img v-if="otherPersonData.photo?.length" alt="profile picture" class=" img-thumbnail " style=" max-height:60px; "  :src="get_image_base64_src"/>
+                </div>
+            </div>
+		</h2>
+		<hr>
+        <fhc-calendar
+            ref="calendar"
+            :timezone="viewData.timezone"
+            :get-promise-func="getPromiseFunc"
+            :date="currentDay"
+            :mode="currentMode"
+            @update:date="handleChangeDate"
+            @update:mode="handleChangeMode"
+            @update:range="updateRange"
+            class="responsive-calendar"
+        >
+            <div
+                v-if="downloadLinks"
+                class="d-flex gap-1 justify-items-start"
+                >
+                <div v-for="{ title, icon, link } in downloadLinks">
+                    <a
+                        :href="link"
+                        :aria-label="title"
+                        class="py-1 btn btn-outline-secondary"
+                    >
+                        <div class="d-flex flex-column">
+                            <i aria-hidden="true" :class="icon"></i>
+                            <span style="font-size:.5rem">{{ title }}</span>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </fhc-calendar>
+    </div>
+    `,
+};
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 559006a1b..18afbda47 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -103,7 +103,18 @@ export default {
 					},
 				],
 			},
-
+			quickLinks: [
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			],
 			betriebsmittel_table_options: {
 				persistenceID: "filterTableMaProfilBetriebsmittel",
 				persistence: {
@@ -331,12 +342,6 @@ export default {
     <edit-profil v-if="showModal" ref="editModal" :isMitarbeiter="true" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
         <div  class="d-md-none col-12 ">
-            <!--TODO: uncomment when implemented
-                <div class="row mb-3">
-                           <div class="col">
-                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-                           </div>
-                         </div>-->
             <!-- Bearbeiten Button -->
             <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
@@ -465,17 +470,11 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                           
-                           <div class="col">
-                            
-                               <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
-                              
-                                 
-                             
-                             </div>
-                           </div>-->
+			<div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 481714590..c2e0cb3ec 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,9 +1,9 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
@@ -11,10 +11,10 @@ export default {
 	components: {
 		CoreFilterCmpt,
 		Mailverteiler,
-		QuickLinks,
 		RoleInformation,
 		ProfilEmails,
 		ProfilInformation,
+		QuickLinks,
 	},
 	inject: ["collapseFunction", "language"],
 	data() {
@@ -90,6 +90,18 @@ export default {
 					},
 				],
 			},
+			quickLinks: [
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			],
 		};
 	},
 
@@ -242,7 +254,7 @@ export default {
                 </div>
                 <!-- START OF THE SECOND PROFIL INFORMATION ROW -->
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
-            </div  >
+            </div>
             <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
             <div class="row">
                 <!-- FIRST TABLE -->
@@ -256,26 +268,22 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- VISIBLE UNTIL VIEWPORT MD -->
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                  <div class="col">
-                
-                   <quick-links :title="$p.t('profil','quickLinks')" ></quick-links>
-                
-                  </div>
-                </div>
-                -->
-            <div  class="row">
-                <div class="col">
-                    <!-- MAILVERTEILER -->
-                    <mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
-                </div>
-            </div>
-            <!-- END OF SIDE PANEL -->
-        </div>
+			<div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<div class="row">
+				<div class="col">
+					<!-- MAILVERTEILER -->
+					<mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
+				</div>
+			</div>
+			<!-- END OF SIDE PANEL -->
+		</div>
         <!-- END OF CONTAINER ROW-->
-    </div>
-    <!-- END OF CONTAINER -->
+	</div>
+	<!-- END OF CONTAINER -->
 </div>
 `,
 };
diff --git a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
index 3f8b7d77c..9efb21eab 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js
@@ -1,53 +1,31 @@
 export default {
-	//TODO: To be implemented
-	props: {
-		data: {
-			type: String,
-		},
-		title: {
-			type: String,
-			required: true,
-		},
-		mobile: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	methods: {
-		hideCollapse: function () {
-			this.collapseOpen = false;
-		},
-		showCollapse: function () {
-			this.collapseOpen = true;
-		},
-	},
-	data() {
-		return {
-			collapseOpen: false,
-		};
-	},
-	template: /*html*/ `
+  name: "QuickLinks",
+  data() {
+    return {};
+  },
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    links: {
+      type: Array,
+      required: true,
+    },
+  },
+  template: `
 <div class="card">
-    <template v-if="mobile">
-        <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
-            {{title}}
-            <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
-        </button>
-        <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
-            <div class="list-group">
-                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','zeitwuensche')}}</a>
-                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','lehrveranstaltungen')}}</a>
-                <a href="#" class="list-group-item list-group-item-action ">{{$p.t('profil','zeitsperren')}}</a>
+    <div class="card-header">
+        {{title}}
+    </div>
+    <div class="card-body">
+        <div class="d-flex flex-row align-items-center gap-3 flex-wrap">
+            <div v-for="link in links" @click="link.action()" type="button" class="d-flex flex-row gap-2 px-3 py-2 border fhc-primary">
+                <div><i class="fa" :class="link.icon"></i></div>
+                {{ $p.t(link.phrase) }}
+                <div><i class="fa fa-arrow-up-right-from-square" style="color:var(--fhc-light) !important"></i></div>
             </div>
         </div>
-    </template>
-    <template v-else>
-        <div class="card-header">{{title}}</div>
-        <div class="card-body">
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitwuensche')}}</a>
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','lehrveranstaltungen')}}</a>
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitsperren')}}</a>
-        </div>
-    </template>
+    </div>
 </div>`,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 3f8e8380d..4605a6e32 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -1,7 +1,6 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import Kontakt from "./ProfilComponents/Kontakt.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
@@ -9,6 +8,7 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -18,7 +18,6 @@ export default {
 		CoreFilterCmpt,
 		Mailverteiler,
 		AusweisStatus,
-		QuickLinks,
 		Adresse,
 		Kontakt,
 		ProfilEmails,
@@ -26,6 +25,7 @@ export default {
 		ProfilInformation,
 		FetchProfilUpdates,
 		EditProfil,
+		QuickLinks,
 	},
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
@@ -95,6 +95,18 @@ export default {
 					},
 				],
 			},
+			quickLinks: [
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			],
 		};
 	},
 
@@ -265,15 +277,7 @@ export default {
     :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <!-- ROW -->
     <div class="row">
-        <!-- HIDDEN QUICK LINKS -->
         <div  class="d-md-none col-12 ">
-            <!--TODO: uncomment when implemented
-			<div class="row py-2">
-                <div class="col">
-                    <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-                </div>
-            </div>-->
-
 			<!-- Bearbeiten Button -->
 			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
@@ -403,12 +407,11 @@ export default {
 		</div>
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<!--TODO: uncomment when implemented
-			<div  class="row d-none d-md-block mb-3">
+			<div v-if="quickLinks.length" class="row mb-4">
 				<div class="col">
-					<quick-links :title="$p.t('profil','quickLinks')"></quick-links>
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>
-			</div>-->
+			</div>
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 2ce649dae..a1c7a1af2 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -1,19 +1,32 @@
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
 export default {
 	data() {
-		return {};
+		return {
+			quickLinks: [
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			],
+		};
 	},
 	components: {
-		QuickLinks,
 		Mailverteiler,
 		ProfilEmails,
 		RoleInformation,
 		ProfilInformation,
+		QuickLinks,
 	},
 
 	props: ["data"],
@@ -88,23 +101,11 @@ export default {
 			};
 		},
 	},
-
-	mounted() {
-	},
-
 	template: /*html*/ ` 
 
 <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
     <div class="row">
-        <!-- HIDDEN QUICK LINKS -->
-        <!-- uncomment when implemented
-            <div  class="d-md-none col-12 ">
-            
-            <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-            
-             </div>-->
-        <!-- END OF HIDDEN QUCK LINKS -->
         <!-- MAIN PANNEL -->
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -112,12 +113,18 @@ export default {
             <!-- ROW WITH THE PROFIL INFORMATION --> 
             <div class="row mb-4">
                 <!-- FIRST KAESTCHEN -->
-                <div  class="col-lg-12 col-xl-6 ">
+                <div class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
                             <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+                    <!-- SECOND ROW OF FIRST COLUMN -->
+					<div class="row mb-4">
+                        <div class="col">
+                            
+                        </div>
+                    </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
@@ -145,17 +152,12 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-            <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-            <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                      <div class="col">
-                     
-                       <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
-                
-                      </div>
-                    </div>-->
+            <!-- START OF THE FIRST ROW IN THE SIDE PANEL -->
+            <div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
             <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
             <div  class="row">
                 <div class="col">
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d773a52ed..738c0c75c 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -142,7 +142,6 @@ export default {
 					</tr>
 				</tbody>
 		</table>
-		
-		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu.length" :menu="lvMenu" />
+		<lv-menu v-if="lvMenu.length && $route.name === 'MyLvPlan'" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
 	</div>`,
 }
\ No newline at end of file

From a8f680810ffaaf5e538872a402f570fb86b136d4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 10:45:54 +0200
Subject: [PATCH 051/189] remove unnecessary touch and mouse events from
 dashboard

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 12 ------
 public/js/components/Drop/Grid/Item.js    | 47 ++---------------------
 3 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 159763da9..1347a9fa3 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -251,7 +251,7 @@ export default {
 				<div
 					v-if="item.placeholder"
 					class="empty-tile-hover"
-					@pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"
+					@click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"
 				></div>
 				<dashboard-item 
 					v-else
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index a0f9df473..92df78b97 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -588,12 +588,6 @@ export default {
 			for (let i = 0; i < widgetClones.length; i++) {
 				this.$refs.container.removeChild(widgetClones[i]);
 			}
-		},
-		mouseDown() {
-			this.mode = MODE_MOUSE_DOWN;
-		},
-		mouseUp() {
-			this.mode = MODE_IDLE;
 		}
 	},
 	template: /* html */`
@@ -601,8 +595,6 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@touchmove="dragOver"
-		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
 	>
@@ -623,13 +615,9 @@ export default {
 					padding: 'var(--fhc-dg-item-padding)'
 				}"
 				@start-move="startMove"
-				@mouse-down="mouseDown"
-				@mouse-up="mouseUp"
 				@start-resize="startResize"
 				@dragging="dragging"
 				@end-drag="dragEnd"
-				@touch-end="dragEnd();mouseUp();"
-				@touch-start="mouseDown"
 			>
 				<template v-slot="item">
 					<slot
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 3e8e3dac9..b0c78447a 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -5,75 +5,34 @@ export default {
 		active: Boolean
 	},
 	emits: [
-		"mouseDown",
-		"mouseUp",
 		"startMove",
 		"startResize",
 		"dragging",
-		"endDrag",
-		"touchStart",
-		"touchEnd"
+		"endDrag"
 	],
 	data() {
 		return {
-			dragAction: '',
 			dragging: false
 		};
 	},
 	methods: {
-		registerDragAction(evt) {
-			this.$emit('mouseDown', evt);
-			if (evt.target.hasAttribute('drag-action')) {
-				this.dragAction = evt.target.getAttribute('drag-action');
-			} else {
-				let parent = evt.target.closest('[drag-action]');
-				if (parent) {
-					this.dragAction = parent.getAttribute('drag-action');
-				} else {
-					this.dragAction = '';
-				}
-			}
-		},
 		tryDragStart(evt) {
-			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
+			let dragAction = evt.target.getAttribute('drag-action');
 			if (dragAction) {
-				this.dragging = true;
 				if (dragAction == 'move')
 					return this.$emit('startMove', evt, this.item);
 				else if (dragAction == 'resize')
 					return this.$emit('startResize', evt, this.item);
 			}
-		},
-		touchDragEnd(evt) {
-			if (!this.dragging)
-				return;
-			this.dragging = false;
-			this.$emit('touchEnd', evt);
-		},
-		touchStart(event) {
-			this.$emit('touchStart', event); 
-			this.registerDragAction(event); 
-			this.tryDragStart(event);
-		},
-		touchMove(event) {
-			if (this.dragging) {
-				event.preventDefault();
-				this.$emit('dragging', event);
-			}
 		}
 		
 	},
 	template: /* html */`
 	<div
 		class="drop-grid-item"
-		@mousedown="registerDragAction"
-		@mouseup="$emit('mouseUp', $event)"
-		@touchstart="touchStart"
-		@touchend="touchDragEnd"
 		@dragstart="tryDragStart"
 		@drag="$emit('dragging', $event)"
-		@touchmove="touchMove"
-		@dragend="$emit('endDrag', $event); dragging = false"
+		@dragend="$emit('endDrag', $event)"
 	>
 		<slot v-bind="item"></slot>
 	</div>`

From 510c35e0770a21e030320fb3cc2692fe2a763a36 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 10:50:11 +0200
Subject: [PATCH 052/189] simplify drop grid events

---
 public/js/components/Drop/Grid.js      |  4 ++--
 public/js/components/Drop/Grid/Item.js | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 92df78b97..05d289e74 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -616,8 +616,8 @@ export default {
 				}"
 				@start-move="startMove"
 				@start-resize="startResize"
-				@dragging="dragging"
-				@end-drag="dragEnd"
+				@drag="dragging"
+				@dragend="dragEnd"
 			>
 				<template v-slot="item">
 					<slot
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index b0c78447a..70d7e2acc 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -6,15 +6,8 @@ export default {
 	},
 	emits: [
 		"startMove",
-		"startResize",
-		"dragging",
-		"endDrag"
+		"startResize"
 	],
-	data() {
-		return {
-			dragging: false
-		};
-	},
 	methods: {
 		tryDragStart(evt) {
 			let dragAction = evt.target.getAttribute('drag-action');
@@ -28,12 +21,7 @@ export default {
 		
 	},
 	template: /* html */`
-	<div
-		class="drop-grid-item"
-		@dragstart="tryDragStart"
-		@drag="$emit('dragging', $event)"
-		@dragend="$emit('endDrag', $event)"
-	>
+	<div class="drop-grid-item" @dragstart="tryDragStart">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 3858e38a02e526eb2066c5d82198e1d2db4c3eae Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 11:13:38 +0200
Subject: [PATCH 053/189] remove unused code

---
 public/js/components/Drop/Grid.js      | 1 -
 public/js/components/Drop/Grid/Item.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 05d289e74..71758d21f 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -605,7 +605,6 @@ export default {
 				:key="item.data.id"
 				class="position-absolute"
 				:item="item"
-				:active="active"
 				:style="{
 					zIndex: item.resizeOverlay ? 1 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 70d7e2acc..b6c8cf870 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -1,8 +1,7 @@
 export default {
 	name:'GridItem',
 	props: {
-		item: Object,
-		active: Boolean
+		item: Object
 	},
 	emits: [
 		"startMove",

From ebe76821e49e3153f9bb9a7ee839aa1f8f709ca6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 11:45:50 +0200
Subject: [PATCH 054/189] remove unused mode

---
 public/js/components/Drop/Grid.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 71758d21f..77c31f89e 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -4,7 +4,6 @@ import GridLogic from '../../composables/GridLogic.js';
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
 const MODE_RESIZE = 2;
-const MODE_MOUSE_DOWN = 3;
 
 export default {
 	name: 'Grid',

From e98ed3c74f46648557e2fce5fcd33a3e8b4b4406 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 11:47:26 +0200
Subject: [PATCH 055/189] rename function to clarify what it does

---
 public/js/components/Drop/Grid.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 77c31f89e..575f8add4 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -250,7 +250,7 @@ export default {
 				this.draggedNode.firstElementChild.classList.remove("dashboard-item-overlay");
 			}
 		},
-		dragging(event) {
+		moveGhostImage(event) {
 			if (this.mode == MODE_MOVE) {
 				this.toggleDraggedItemOverlay(true);
 				
@@ -614,7 +614,7 @@ export default {
 				}"
 				@start-move="startMove"
 				@start-resize="startResize"
-				@drag="dragging"
+				@drag="moveGhostImage"
 				@dragend="dragEnd"
 			>
 				<template v-slot="item">

From 9fd033b30e4ac7acd1ebac62e6a7a2acb08d6710 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 13:21:35 +0200
Subject: [PATCH 056/189] get rid of toggleDraggedItemOverlay and replace it
 with css classes that are computed inside the template

---
 public/css/components/dashboard.css | 20 ++++++++++----------
 public/js/components/Drop/Grid.js   | 21 ++++-----------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e7394ea74..9738558c7 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -124,19 +124,19 @@
 	position: relative;
 }
 
-.dashboard-item-overlay {
+.drop-grid-item-move > .dashboard-item {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
-.dashboard-item-overlay::before {
-	position:absolute;
-	content:"";
-	top:0.25rem;
-	left:0.25rem;
-	right:0.25rem;
-	bottom:0.25rem;
-	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
-	opacity: 0.5;
+.drop-grid-item-move > .dashboard-item::before {
+	position: absolute;
+	content: "";
+	top: .25rem;
+	left: .25rem;
+	right: .25rem;
+	bottom: .25rem;
+	border: 4px dashed var(--fhc-dashboard-item-overly-border-color);
+	opacity: .5;
 }
 
 #deleteBookmark i {
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 575f8add4..1e36e8148 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -46,7 +46,6 @@ export default {
 			correctedPositionUpdates: null,
 			draggedOffset: [0, 0],
 			draggedItem: null,
-			draggedNode: null,
 			reorderedItems: [],
 			clonedWidget: null,
 		};
@@ -241,19 +240,8 @@ export default {
 			}
 			return false;
 		},
-		toggleDraggedItemOverlay(condition) {
-			if (!this.draggedNode)
-				return;
-			if (condition) {
-				this.draggedNode.firstElementChild.classList.add("dashboard-item-overlay");
-			} else {
-				this.draggedNode.firstElementChild.classList.remove("dashboard-item-overlay");
-			}
-		},
 		moveGhostImage(event) {
 			if (this.mode == MODE_MOVE) {
-				this.toggleDraggedItemOverlay(true);
-				
 				const containerRect = this.$refs.container.getBoundingClientRect();
 				const clonedWidgetRect = this.clonedWidget.getBoundingClientRect();
 				
@@ -394,7 +382,6 @@ export default {
 				
 				this.$emit('draggedItem', item);
 
-				this.draggedNode = evt.target.closest(".drop-grid-item");
 				//clones the widget for the drag Image
 				
 				// NOTE(chris): this is the element that follows the mouse while dragging
@@ -474,17 +461,14 @@ export default {
 		dragCancel() {
 			this.removeWidgetClones();
 			this.additionalRowComputed = false;
-			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
 			this.$emit('draggedItem',null);
-			this.draggedNode = null;
 		},
 		dragEnd() {
 			this.removeWidgetClones();
-			this.toggleDraggedItemOverlay(false);
 			
 			if (this.mode == MODE_IDLE) {
 				return;
@@ -507,7 +491,6 @@ export default {
 				this.$emit('rearrangeItems', updated.filter(v => v));
 
 			this.draggedItem = null;
-			this.draggedNode = null;
 			this.$emit('draggedItem', null);
 		},
 		_updateCorrectedPositions(updated) {
@@ -603,6 +586,10 @@ export default {
 				v-for="(item, index) in currentItems"
 				:key="item.data.id"
 				class="position-absolute"
+				:class="{
+					'drop-grid-item-move': item.index == draggedItem?.index && mode == 1,
+					'drop-grid-item-resize': item.index == draggedItem?.index && mode == 2
+				}"
 				:item="item"
 				:style="{
 					zIndex: item.resizeOverlay ? 1 : 'auto',

From 5fa374259e2a5a892ea1fb695d2717bfcdaddac2 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 13:22:16 +0200
Subject: [PATCH 057/189] replace draggedItem css class

---
 public/css/components/dashboard.css    | 3 ++-
 public/js/components/Dashboard/Item.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 9738558c7..d24ad72b0 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -117,7 +117,8 @@
 	cursor: move !important;
 }
 
-.draggedItem {
+.drop-grid-item-resize > .dashboard-item,
+.drop-grid-item-move > .dashboard-item {
 	height: 100%;
 	width: 100%;
 	background-color: var(--fhc-dashboard-draggeditem-background);
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 6db83caed..bea13528c 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -195,7 +195,7 @@ export default {
 		v-else-if="!hidden || editMode"
 		:id="widgetID"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
-		:class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
+		:class="{'hiddenWidget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
 	>
 		<div v-show="!dragstate" class="h-100 card border-0">
 			<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">

From a6f81006be741666bd63af2d941f614dff80e7fb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 13:28:15 +0200
Subject: [PATCH 058/189] hide content of dashboard item on drag not via event
 but via css class

---
 public/css/components/dashboard.css       | 5 +++++
 public/js/components/Dashboard/Item.js    | 3 +--
 public/js/components/Dashboard/Section.js | 5 +----
 public/js/components/Drop/Grid.js         | 6 ------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index d24ad72b0..a9d148cab 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -125,6 +125,11 @@
 	position: relative;
 }
 
+.drop-grid-item-resize > .dashboard-item > *,
+.drop-grid-item-move > .dashboard-item > * {
+	display: none;
+}
+
 .drop-grid-item-move > .dashboard-item {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index bea13528c..432659a41 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -45,7 +45,6 @@ export default {
 		"item_data",
 		"place",
 		"resizeLimits",
-		"dragstate",
 		"resizeOverlay",
 		"source"
 	],
@@ -197,7 +196,7 @@ export default {
 		class="dashboard-item card overflow-hidden h-100 position-relative"
 		:class="{'hiddenWidget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
 	>
-		<div v-show="!dragstate" class="h-100 card border-0">
+		<div class="h-100 card border-0">
 			<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 				<Transition>
 					<span
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 1347a9fa3..1c5466059 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -39,8 +39,7 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
-			draggedItem:null,
-			additionalRow:false,
+			additionalRow:false
 		};
 	},
 	provide() {
@@ -243,7 +242,6 @@ export default {
 			:active="editModeIsActive"
 			:resize-limit="checkResizeLimit"
 			:margin-for-extra-row=".01"
-			@dragged-item="draggedItem=$event"
 			@rearrange-items="updatePositions"
 			@grid-height="gridHeight=$event"
 		>
@@ -256,7 +254,6 @@ export default {
 				<dashboard-item 
 					v-else
 					:id="item.widget"
-					:dragstate="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)"
 					:resizeOverlay="item.resizeOverlay"
 					:widgetID="item.id"
 					:width="item.w"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1e36e8148..72aa3ae1c 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -31,7 +31,6 @@ export default {
 	emits: [
 		"rearrangeItems",
 		"gridHeight",
-		"draggedItem",
 		"update:additionalRow"
 	],
 	data() {
@@ -380,8 +379,6 @@ export default {
 				this.updateCursor(evt);
 				this.draggedItem = item;
 				
-				this.$emit('draggedItem', item);
-
 				//clones the widget for the drag Image
 				
 				// NOTE(chris): this is the element that follows the mouse while dragging
@@ -409,7 +406,6 @@ export default {
 			setTimeout(() => {
 				this.mode = MODE_RESIZE;
 				this.draggedItem = item;
-				this.$emit('draggedItem', item);
 			}, 0);
 			
 			this._dragStart(evt);
@@ -465,7 +461,6 @@ export default {
 			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
-			this.$emit('draggedItem',null);
 		},
 		dragEnd() {
 			this.removeWidgetClones();
@@ -491,7 +486,6 @@ export default {
 				this.$emit('rearrangeItems', updated.filter(v => v));
 
 			this.draggedItem = null;
-			this.$emit('draggedItem', null);
 		},
 		_updateCorrectedPositions(updated) {
 			updated.forEach((item, index) => {

From d61ee51d79ff8cdd089a97f6acc1c53704326d00 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 14:00:14 +0200
Subject: [PATCH 059/189] rename css class to dash-case

---
 public/css/components/dashboard.css    | 8 ++++----
 public/js/components/Dashboard/Item.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index a9d148cab..9f32bed23 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -195,13 +195,13 @@
 
 }
 
-.hiddenWidget {
+.hidden-widget {
 	background: var(--fhc-disabled-background);
 	opacity: 40%;
 }
 
-.hiddenWidget .card,
-.hiddenWidget .card-body,
-.hiddenWidget .card-body * {
+.hidden-widget .card,
+.hidden-widget .card-body,
+.hidden-widget .card-body * {
 	background: inherit !important;
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 432659a41..ccdc40915 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -194,7 +194,7 @@ export default {
 		v-else-if="!hidden || editMode"
 		:id="widgetID"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
-		:class="{'hiddenWidget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
+		:class="{'hidden-widget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
 	>
 		<div class="h-100 card border-0">
 			<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">

From d68fa8ce9539efe5a72744bf5578c44db905862e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Apr 2026 14:03:28 +0200
Subject: [PATCH 060/189] code quality dashboard.css

---
 public/css/components/dashboard.css | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 9f32bed23..54de860e7 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -40,27 +40,27 @@
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: cover;
-	cursor:pointer;
+	cursor: pointer;
 }
 
 .dashboard-section > .newGridRow {
-	position:absolute;
-	width:20px;
-	height:20px;
-	padding:0;
-	bottom:0;
-	left:50%;
-	transform:translate(-50%, 50%);
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	padding: 0;
+	bottom: 0;
+	left: 50%;
+	transform: translate(-50%, 50%);
 	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
-	color:white;
+	color: white;
 	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .empty-tile-hover:hover {
-		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
 
 .alert-danger .form-check-input:checked {
@@ -159,7 +159,7 @@
 
 .section-info {
 	color: var(--fhc-dashboard-section-info-color);
-	cursor:pointer;
+	cursor: pointer;
 }
 
 .section-info:hover {

From 7daaf79fccb41e3134f26f56ee895f0dd9e68502 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 13 Apr 2026 15:44:09 +0200
Subject: [PATCH 061/189] implemented permission for viewing other users' lv
 plans

---
 application/controllers/Cis/Profil.php        |   3 +
 application/controllers/Cis4.php              |  13 +-
 .../controllers/api/frontend/v1/LvPlan.php    |  12 +-
 public/js/api/factory/lvPlan.js               |   6 +
 public/js/apps/Cis.js                         | 271 ++++++++++--------
 .../Cis/Profil/MitarbeiterProfil.js           |  13 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |  30 +-
 public/js/components/Cis/Profil/Profil.js     |   4 +-
 .../js/components/Cis/Profil/StudentProfil.js |  13 +-
 .../Cis/Profil/StudentViewProfil.js           |  44 +--
 system/dbupdate_3.4.php                       |   1 +
 .../dbupdate_3.4/76150_perm_other_lv_plan.php |  41 +++
 12 files changed, 263 insertions(+), 188 deletions(-)
 create mode 100644 system/dbupdate_3.4/76150_perm_other_lv_plan.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index cc64c5a67..77f6ffb07 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -79,6 +79,9 @@ class Profil extends Auth_Controller
 		$viewData = array (
 			'uid' => $uid,
 			'profil_data'=>$profil_data,
+			'permissions' => [
+				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan')),
+			]
 		);
 		if($uid == getAuthUID()){
 			$viewData['editable'] = true;
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index b7ba2029d..11c723226 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -13,9 +14,9 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-		    array(
-			'index' => 'basis/cis:r'
-		    )
+			array(
+				'index' => 'basis/cis:r'
+			)
 		);
 
 		// Load Config
@@ -32,12 +33,12 @@ class Cis4 extends Auth_Controller
 	{
 		$this->load->model('person/Person_model', 'PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
-		
+
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
 			'person_id' => $personData->person_id,
-			'timezone' => $this->config->item('timezone')
+			'timezone' => $this->config->item('timezone'),
 		);
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index e0159d9b2..fa70e919a 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -47,7 +47,7 @@ class LvPlan extends FHCAPI_Controller
 			'fetchFerienEvents' => self::PERM_LOGGED,
 			'getStudiengaenge' => self::PERM_LOGGED,
 			'getLehrverband' => self::PERM_LOGGED,
-
+			'permissionOtherLvPlan' => self::PERM_LOGGED,
 		]);
 
 		$this->load->library('LogLib');
@@ -378,6 +378,16 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Checks if the current user has permission to view other users' timetables
+	 *
+	 * @return void
+	 */
+	public function permissionOtherLvPlan()
+	{
+		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
+	}
+
 	/**
 	 * fetch moodle events
 	 *
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index f1103a47d..41aa29299 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -118,4 +118,10 @@ export default {
 			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
 		}
 	},
+	checkPermissionOtherLvPlan(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/permissionOtherLvPlan',
+		}
+	}
 };
\ No newline at end of file
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index fbbf197aa..ce148834e 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -1,172 +1,201 @@
 import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
-import PluginsPhrasen from '../plugins/Phrasen.js';
-import ApiSearchbar from '../api/factory/searchbar.js';
+import PluginsPhrasen from "../plugins/Phrasen.js";
 import Theme from "../plugins/Theme.js";
 
+import ApiSearchbar from "../api/factory/searchbar.js";
+import ApiLvPlan from "../api/factory/lvPlan.js";
+
 const app = Vue.createApp({
-    name: 'CisApp',
-    components: {
-        FhcSearchbar,
-        CisMenu
-    },
-    data: function() {
-        return {
-            searchbaroptions: {
+	name: "CisApp",
+	components: {
+		FhcSearchbar,
+		CisMenu,
+	},
+	data: function () {
+		return {
+			searchbaroptions: {
 				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
 				types: {
-					employee: Vue.computed(() => this.$p.t("search/type_employee")),
-					student: Vue.computed(() => this.$p.t("search/type_student")),
+					employee: Vue.computed(() =>
+						this.$p.t("search/type_employee"),
+					),
+					student: Vue.computed(() =>
+						this.$p.t("search/type_student"),
+					),
 					room: Vue.computed(() => this.$p.t("search/type_room")),
-					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					organisationunit: Vue.computed(() =>
+						this.$p.t("search/type_organisationunit"),
+					),
 					cms: Vue.computed(() => this.$p.t("search/type_cms")),
-					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+					dms: Vue.computed(() => this.$p.t("search/type_dms")),
 				},
-                actions: {
-                    employee: {
-                        defaultaction: {
-                            type: "link",
-                            action: function(data) {
-									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-										"/Cis/Profil/View/"+data.uid;
-							}
+				actions: {
+					employee: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								return (
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" +
+									data.uid
+								);
+							},
 						},
-                        childactions: [
-							{
-                                label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
-                                icon: "fas fa-calendar-days",
-                                type: "link",
-                                action: function(data) {
-									const uid = JSON.parse(data.data).uid;
-									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/Cis/OtherLvPlan/' + uid;
-									return link;
-                                }
-                            }
-						]
+						childactions: [],
 					},
 					student: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									"/Cis/Profil/View/" + data.uid;
-
-							}
+								return (
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" +
+									data.uid
+								);
+							},
 						},
-						childactions: [
-							{
-                                label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
-                                icon: "fas fa-calendar-days",
-                                type: "link",
-                                action: function(data) {
-									const uid = JSON.parse(data.data).uid;
-									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/Cis/OtherLvPlan/' + uid;
-									return link;
-                                }
-                            }
-						]
+						childactions: [],
 					},
-                    room: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.content_id === null){
+					room: {
+						defaultaction: {
+							type: "link",
+							renderif: function (data) {
+								if (data.content_id === null) {
 									return false;
 								}
 								return true;
 							},
-                            action: function(data) { 
-								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							action: function (data) {
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
 									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
+									"/CisVue/Cms/content/" +
+									data.content_id;
 								return link;
-                            }
-                        },
-                        childactions: [
-                            {
-                                label: "LV-Plan",
-                                icon: "fas fa-bookmark",
-                                type: "link",
-                                action: function(data) {
-									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							},
+						},
+						childactions: [
+							{
+								label: "LV-Plan",
+								icon: "fas fa-bookmark",
+								type: "link",
+								action: function (data) {
+									const link =
+										FHC_JS_DATA_STORAGE_OBJECT.app_root +
 										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/getRoomInformation/' + data.ort_kurzbz;
+										"/CisVue/Cms/getRoomInformation/" +
+										data.ort_kurzbz;
 									return link;
-                                }
-                            },
-                            {
-                                label: "Rauminformation",
-                                icon: "fas fa-info-circle",
-                                type: "link",
-                                renderif: function(data) {
-									if(data.content_id === null){
+								},
+							},
+							{
+								label: "Rauminformation",
+								icon: "fas fa-info-circle",
+								type: "link",
+								renderif: function (data) {
+									if (data.content_id === null) {
 										return false;
 									}
 									return true;
-                                },
-                                action: function(data) {
-									const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								},
+								action: function (data) {
+									const link =
+										FHC_JS_DATA_STORAGE_OBJECT.app_root +
 										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/content/' + data.content_id;
+										"/CisVue/Cms/content/" +
+										data.content_id;
 									return link;
-                                }
-                            },
-                        ]
-                    },
-                    organisationunit: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.mailgroup) {
+								},
+							},
+						],
+					},
+					organisationunit: {
+						defaultaction: {
+							type: "link",
+							renderif: function (data) {
+								if (data.mailgroup) {
 									return true;
 								}
 								return false;
 							},
-                            action: function(data) {
-                                const link = 'mailto:' + data.mailgroup;
+							action: function (data) {
+								const link = "mailto:" + data.mailgroup;
 								return link;
-                            }
-                        },
-                        childactions: []
-                    },
+							},
+						},
+						childactions: [],
+					},
 					cms: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
 									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
+									"/CisVue/Cms/content/" +
+									data.content_id;
 								return link;
-							}
+							},
 						},
-						childactions: []
+						childactions: [],
 					},
 					dms: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									'cms/dms.php?id=' + data.dms_id;
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									"cms/dms.php?id=" +
+									data.dms_id;
 								return link;
-							}
+							},
 						},
-						childactions: []
-					}
-                }
-            }
-        };
-    },
-    methods: {
-        searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
-        }
-    }
+						childactions: [],
+					},
+				},
+			},
+		};
+	},
+	methods: {
+		searchfunction: function (searchsettings) {
+			return this.$api.call(ApiSearchbar.searchCis(searchsettings));
+		},
+	},
+	async mounted() {
+		const openOtherLvPlanAction = {
+			label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
+			icon: "fas fa-calendar-days",
+			type: "link",
+			action: function (data) {
+				const uid = JSON.parse(data.data).uid;
+				const link =
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+					"/Cis/OtherLvPlan/" +
+					uid;
+				return link;
+			},
+		};
+		let checkPermissionOtherLvPlanResult = await this.$api.call(
+			ApiLvPlan.checkPermissionOtherLvPlan(),
+		);
+		if (
+			checkPermissionOtherLvPlanResult.meta.status === "success" &&
+			checkPermissionOtherLvPlanResult.data
+		) {
+			this.searchbaroptions.actions.employee.childactions.push(
+				openOtherLvPlanAction,
+			);
+			this.searchbaroptions.actions.student.childactions.push(
+				openOtherLvPlanAction,
+			);
+		}
+	},
 });
 
 FhcApps.makeExtendable(app);
@@ -174,9 +203,9 @@ FhcApps.makeExtendable(app);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
-		tooltip: 8000
-	}
-})
+		tooltip: 8000,
+	},
+});
 app.use(PluginsPhrasen);
 app.use(Theme);
-app.mount('#cis-header');
+app.mount("#cis-header");
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 18afbda47..98b5a822b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -103,18 +103,7 @@ export default {
 					},
 				],
 			},
-			quickLinks: [
-				{
-					icon: "fa-calendar-days",
-					phrase: "lehre/stundenplan",
-					action: () => {
-						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
-					},
-				}
-			],
+			quickLinks: [],
 			betriebsmittel_table_options: {
 				persistenceID: "filterTableMaProfilBetriebsmittel",
 				persistence: {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index c2e0cb3ec..42a2700f3 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -90,23 +90,12 @@ export default {
 					},
 				],
 			},
-			quickLinks: [
-				{
-					icon: "fa-calendar-days",
-					phrase: "lehre/stundenplan",
-					action: () => {
-						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
-					},
-				}
-			],
+			quickLinks: [],
 		};
 	},
 
 	//? this is the prop passed to the dynamic component with the custom data of the view
-	props: ["data"],
+	props: ["data", "permissions"],
 	methods: {
 		funktionenTableBuilt: function () {
 			this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
@@ -201,6 +190,21 @@ export default {
 			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
 			this.preloadedPhrasen.loaded = true;
 		});
+
+		if (this.$props.permissions["basis/other_lv_plan"]) {
+			this.quickLinks.push(
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			);
+		}
 	},
 
 	template: /*html*/ `
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index da205816d..c2d64982c 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -379,7 +379,7 @@ export const Profil = {
 		}
 	},
 	created() {
-		this.load()
+		this.load();
 	},
 	template: `
 	<div>
@@ -388,7 +388,7 @@ export const Profil = {
 		</div>
 		<div v-else>
             <loading ref="loadingModalRef" :timeout="0"></loading>
-            <component  :is="view" :data="data" :editData="filteredEditData" ></component>
+            <component  :is="view" :data="data" :permissions="$props.viewData.permissions" :editData="filteredEditData" ></component>
 		</div>
 	</div>`,
 }
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 4605a6e32..638bb15b4 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -95,18 +95,7 @@ export default {
 					},
 				],
 			},
-			quickLinks: [
-				{
-					icon: "fa-calendar-days",
-					phrase: "lehre/stundenplan",
-					action: () => {
-						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
-					},
-				}
-			],
+			quickLinks: [],
 		};
 	},
 
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index a1c7a1af2..3bc4dabd7 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -5,22 +5,6 @@ import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
 export default {
-	data() {
-		return {
-			quickLinks: [
-				{
-					icon: "fa-calendar-days",
-					phrase: "lehre/stundenplan",
-					action: () => {
-						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
-					},
-				}
-			],
-		};
-	},
 	components: {
 		Mailverteiler,
 		ProfilEmails,
@@ -28,16 +12,17 @@ export default {
 		ProfilInformation,
 		QuickLinks,
 	},
-
-	props: ["data"],
+	props: ["data", "permissions"],
+	data() {
+		return {
+			quickLinks: [],
+		};
+	},
 	provide() {
 		return {
 			studiengang_kz: Vue.computed({ get: () => this.data.studiengang_kz }),
 		}
 	},
-	
-	methods: {},
-
 	computed: {
 		fotoStatus() {
 			return this.data?.fotoStatus ?? null;
@@ -101,6 +86,23 @@ export default {
 			};
 		},
 	},
+	methods: {},
+	created() {
+		if (this.$props.permissions["basis/other_lv_plan"]) {
+			this.quickLinks.push(
+				{
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+      					  	name: "OtherLvPlan",
+      					  	params: { otherUid: this.$props.data.username },
+      					})
+					},
+				}
+			);
+		}
+	},
 	template: /*html*/ ` 
 
 <div class="container-fluid text-break fhc-form"  >
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index ac8695de2..35b1d6064 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -93,6 +93,7 @@ require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php')
 require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
+require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/76150_perm_other_lv_plan.php b/system/dbupdate_3.4/76150_perm_other_lv_plan.php
new file mode 100644
index 000000000..9a23a4cb2
--- /dev/null
+++ b/system/dbupdate_3.4/76150_perm_other_lv_plan.php
@@ -0,0 +1,41 @@
+<?php
+/* Copyright (C) 2017 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Permission basis/other_lv_plan
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: basis/gehaelter
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/other_lv_plan';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('basis/other_lv_plan', 'Permission holder can view other users timetables (LV plans)');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission "basis/other_lv_plan"<br>';
+        }
+    }
+}

From 4669598dd976d522d9d41a3f11bd8e4a9d3c7ac9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 14 Apr 2026 10:42:17 +0200
Subject: [PATCH 062/189] remove resizeLimit function and replace it with
 internal function using the widgetsSetup prop

---
 public/js/components/Dashboard/Section.js |  35 -------
 public/js/components/Drop/Grid.js         | 114 +++++++++++++++++-----
 2 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 1c5466059..5957e7fb4 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,7 +1,6 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
 export default {
@@ -117,32 +116,6 @@ export default {
 		handleConfigClosed() {
 			this.configOpened = false
 		},
-		checkResizeLimit(item, w, h) {
-			// NOTE(chris): widgets needs to be loaded for this to work
-			let widget = this.widgetState[item.widget];
-			if (widget) {
-				let minmaxW = { ...widget.setup.width };
-				if (minmaxW.max)
-					minmaxW.min = minmaxW.min || 1;
-				else
-					minmaxW = { min: minmaxW, max: minmaxW };
-				if (w < minmaxW.min)
-					w = minmaxW.min; 
-				if (w > minmaxW.max)
-					w = minmaxW.max;
-
-				let minmaxH = { ...widget.setup.height };
-				if (minmaxH.max)
-					minmaxH.min = minmaxH.min || 1;
-				else
-					minmaxH = { min: minmaxH, max: minmaxH };
-				if (h < minmaxH.min)
-					h = minmaxH.min;
-				if (h > minmaxH.max)
-					h = minmaxH.max;
-			}
-			return [w, h];
-		},
 		removeWidget(item, revert) {
 			if (item.custom) {
 				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
@@ -203,13 +176,6 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
-	setup() {
-		const { state: widgetState } = useCachedWidgetLoader();
-
-		return {
-			widgetState
-		};
-	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
@@ -240,7 +206,6 @@ export default {
 			:items="items"
 			:items-setup="computedWidgetsSetup"
 			:active="editModeIsActive"
-			:resize-limit="checkResizeLimit"
 			:margin-for-extra-row=".01"
 			@rearrange-items="updatePositions"
 			@grid-height="gridHeight=$event"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 72aa3ae1c..78abd3063 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -14,7 +14,6 @@ export default {
 		cols: Number,
 		items: Array,
 		itemsSetup: Object,
-		resizeLimit: Function,
 		active: {
 			type: Boolean,
 			default: true
@@ -50,6 +49,32 @@ export default {
 		};
 	},
 	computed: {
+		sizeLimits() {
+			return Object.fromEntries(Object.entries(this.itemsSetup).map(([type, setup]) => {
+				const result = {}; // work on a copy
+				if (setup.height === undefined)
+					result.height = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.height))
+					result.height = { min: setup.height, max: setup.height };
+				else
+					result.height = {
+						min: setup.height.min ?? 1,
+						max: setup.height.max
+					};
+
+				if (setup.width === undefined)
+					result.width = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.width))
+					result.width = { min: setup.width, max: setup.width };
+				else
+					result.width = {
+						min: setup.width.min ?? 1,
+						max: setup.width.max
+					};
+
+				return [type, result];
+			}));
+		},
 		additionalRowComputed: {
 			get() {
 				return this.additionalRow;
@@ -291,11 +316,9 @@ export default {
 				if (item.x + item.w > this.cols) {
 					let targetW = this.cols-item.x,
 						targetX = undefined;
-					if (this.resizeLimit) {
-						[targetW] = this.resizeLimit(item.data, targetW, item.h);
-					}
-					if (targetW < 1)
-						targetW = 1;
+
+					[ targetW ] = this.cropSizeToAllowed(item.data.widget, targetW, item.h);
+
 					if (targetW > this.cols)
 						targetW = this.cols;
 					if (item.x + targetW > this.cols) {
@@ -416,10 +439,9 @@ export default {
 			}
 			if (!this.active)
 				return this.dragCancel();
+
 			this.checkPinnedWidgetAnimation();
-			if (this.mode == MODE_RESIZE) {
-				this.checkWidgetSizeLimitAnimation();
-			}
+
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -446,9 +468,13 @@ export default {
 						const dragGrid = new GridLogic(this.grid);
 						let w = Math.min(this.cols - this.draggedItem.x, Math.max(1, this.x - this.draggedItem.x + 1));
 						let h = Math.max(1, this.y - this.draggedItem.y + 1);
-						if (this.resizeLimit)
-							[w, h] = this.resizeLimit(this.draggedItem.data, w, h);
+
+						[ w, h ] = this.cropSizeToAllowed(this.draggedItem.data.widget, w, h);
+
 						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
+						
+						this.checkWidgetSizeLimitAnimation();
+						
 						break;
 					}
 				}
@@ -535,25 +561,59 @@ export default {
 				}	
 			});
 		},
+		isSizeAllowed(type, w, h) {
+			if (w < 1 || h < 1)
+				return false;
+			
+			const setup = this.sizeLimits[type];
+
+			if (!setup)
+				return false;
+
+			if (w < setup.width.min)
+				return false;
+			if (h < setup.height.min)
+				return false;
+			if (setup.width.max !== undefined && w > setup.width.max)
+				return false;
+			if (setup.width.max !== undefined && h > setup.height.max)
+				return false;
+
+			return true;
+		},
+		cropSizeToAllowed(type, w, h) {
+			if (w < 1)
+				w = 1;
+			if (h < 1)
+				h = 1;
+
+			const setup = this.sizeLimits[type];
+
+			if (!setup)
+				return [w, h];
+
+			if (w < setup.width.min)
+				w = setup.width.min;
+			if (h < setup.height.min)
+				h = setup.height.min;
+			if (setup.width.max && w > setup.width.max)
+				w = setup.width.max;
+			if (setup.height.max && h > setup.height.max)
+				h = setup.height.max;
+			
+			return [w, h];
+		},
 		checkWidgetSizeLimitAnimation() {
-			let draggedItemSetup = this.itemsSetup[this.draggedItem.data.widget];
-			let draggedItemMaxWidth = draggedItemSetup.width.max ?? draggedItemSetup.width;
-			let draggedItemMinWidth = draggedItemSetup.width.min ?? draggedItemSetup.width;
-			let draggedItemMaxHeight = draggedItemSetup.height.max ?? draggedItemSetup.height;
-			let draggedItemMinHeight = draggedItemSetup.height.min ?? draggedItemSetup.height;
 			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
 
-			let width_after_resize = this.x - this.draggedItem.x + 1; 
-			let height_after_resize = this.y - this.draggedItem.y + 1; 
-			if (
-				(width_after_resize > 0 && (width_after_resize > draggedItemMaxWidth
-				|| width_after_resize < draggedItemMinWidth)
-				)
-				||
-				(height_after_resize > 0 && (height_after_resize > draggedItemMaxHeight
-				|| height_after_resize < draggedItemMinHeight)
-				)
-			) {
+			let width_after_resize = this.x - this.draggedItem.x + 1;
+			let height_after_resize = this.y - this.draggedItem.y + 1;
+
+			if (!this.isSizeAllowed(
+				this.draggedItem.data.widget,
+				width_after_resize,
+				height_after_resize
+			)) {
 				draggedItemNode.classList.add("border-danger");
 			} else {
 				draggedItemNode.classList.remove("border-danger");

From 38d9d919457390a385f67a051b94abc4a43cc8cb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 14 Apr 2026 11:12:26 +0200
Subject: [PATCH 063/189] get rid of cachedWidgetLoader & slightly rename some
 prop for better understanding

---
 public/js/components/Dashboard/Item.js        | 61 ++++++++-----------
 public/js/components/Dashboard/Section.js     |  8 +--
 public/js/components/Drop/Grid.js             |  2 +-
 .../Dashboard/CachedWidgetLoader.js           | 36 -----------
 4 files changed, 31 insertions(+), 76 deletions(-)
 delete mode 100644 public/js/composables/Dashboard/CachedWidgetLoader.js

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index ccdc40915..0df0023dd 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -1,5 +1,4 @@
 import BsModal from "../Bootstrap/Modal.js";
-import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
 import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
@@ -18,7 +17,6 @@ export default {
 	data: () => ({
 		component: "",
 		arguments: null,
-		widget: null,
 		tmpConfig: {},
 		isLoading: false,
 		hasConfig: false,
@@ -44,7 +42,7 @@ export default {
 		"loading",
 		"item_data",
 		"place",
-		"resizeLimits",
+		"widgetTemplate",
 		"resizeOverlay",
 		"source"
 	],
@@ -62,40 +60,40 @@ export default {
 			}
 		},
 		isResizeableHorizontal() {
-			if (this.resizeLimits.width === undefined)
+			if (this.widgetTemplate.setup.width === undefined)
 				return true;
 
-			if (Object.prototype.toString.call(this.resizeLimits.width) == "[object Number]")
+			if (Object.prototype.toString.call(this.widgetTemplate.setup.width) == "[object Number]")
 				return false;
 
-			if (this.resizeLimits.width.min === undefined) {
-				if (this.resizeLimits.width.max === undefined)
+			if (this.widgetTemplate.setup.width.min === undefined) {
+				if (this.widgetTemplate.setup.width.max === undefined)
 					return true;
-				return this.resizeLimits.width.max > 1;
+				return this.widgetTemplate.setup.width.max > 1;
 			}
 
-			if (this.resizeLimits.width.max === undefined)
+			if (this.widgetTemplate.setup.width.max === undefined)
 				return true;
 
-			return this.resizeLimits.width.max > this.resizeLimits.width.min;
+			return this.widgetTemplate.setup.width.max > this.widgetTemplate.setup.width.min;
 		},
 		isResizeableVertical() {
-			if (this.resizeLimits.height === undefined)
+			if (this.widgetTemplate.setup.height === undefined)
 				return true;
 
-			if (Object.prototype.toString.call(this.resizeLimits.height) == "[object Number]")
+			if (Object.prototype.toString.call(this.widgetTemplate.setup.height) == "[object Number]")
 				return false;
 
-			if (this.resizeLimits.height.min === undefined) {
-				if (this.resizeLimits.height.max === undefined)
+			if (this.widgetTemplate.setup.height.min === undefined) {
+				if (this.widgetTemplate.setup.height.max === undefined)
 					return true;
-				return this.resizeLimits.height.max > 1;
+				return this.widgetTemplate.setup.height.max > 1;
 			}
 
-			if (this.resizeLimits.height.max === undefined)
+			if (this.widgetTemplate.setup.height.max === undefined)
 				return true;
 
-			return this.resizeLimits.height.max > this.resizeLimits.height.min;
+			return this.widgetTemplate.setup.height.max > this.widgetTemplate.setup.height.min;
 		},
 		isResizeable() {
 			return this.isResizeableVertical || this.isResizeableHorizontal;
@@ -155,7 +153,7 @@ export default {
 		},
 		sendChangeConfig(config) {
 			for (var k in config) {
-				if (this.widget.arguments[k] == config[k]) {
+				if (this.widgetTemplate.arguments[k] == config[k]) {
 					delete config[k];
 				}
 			}
@@ -164,24 +162,17 @@ export default {
 	},
 	watch: {
 		config() {
-			this.arguments = { ...this.widget?.arguments, ...this.config };
+			this.arguments = { ...this.widgetTemplate?.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
 		},
 	},
-	setup() {
-		const { actions } = useCachedWidgetLoader();
-		return {
-			loadWidget: actions.load
-		};
-	},
 	async created() {
-		this.widget = await this.loadWidget(this.id);
-		let component = (await import(this.widget.setup.file)).default;
-		this.$options.components["widget" + this.widget.widget_id] = component;
-		this.component = "widget" + this.widget.widget_id;
-		this.arguments = { ...this.widget.arguments, ...this.config };
+		let component = (await import(this.widgetTemplate.setup.file)).default;
+		this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
+		this.component = "widget" + this.widgetTemplate.widget_id;
+		this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
 		this.tmpConfig = { ...this.arguments };
 	},
 	template: /*html*/ `
@@ -197,7 +188,7 @@ export default {
 		:class="{'hidden-widget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
 	>
 		<div class="h-100 card border-0">
-			<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
+			<div v-if="widgetTemplate" class="card-header d-flex ps-0 pe-2 align-items-center">
 				<Transition>
 					<span
 						v-if="editMode && !isPinned"
@@ -211,7 +202,7 @@ export default {
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
 				</Transition>
-				<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+				<span class="col mx-2 px-2">{{ widgetTemplate.setup.name }}</span>
 				<div
 					v-if="source"
 					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
@@ -232,7 +223,7 @@ export default {
 						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 					</div>
 				</template>
-				<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto">
+				<a type="button" v-if="widgetTemplate.setup.cis4link" :href="getWidgetC4Link(widgetTemplate)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto">
 					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
 				</a>
 				<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
@@ -251,13 +242,13 @@ export default {
 			<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
 				<template v-slot:title>
-					{{ widget ? 'Config for ' + widget.setup.name : '' }}
+					{{ widgetTemplate ? 'Config for ' + widgetTemplate.setup.name : '' }}
 				</template>
 				<template v-slot:default>
 					<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 					<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 				</template>
-				<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
+				<template v-if="!widgetTemplate?.setup?.hideFooter" v-slot:footer>
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
 					<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
 				</template>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 5957e7fb4..d312107e9 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -70,11 +70,11 @@ export default {
 					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
 			}
 		},
-		computedWidgetsSetup() {
+		indexedWidgetsTemplates() {
 			if (!this.widgetsSetup)
 				return {};
 			return this.widgetsSetup.reduce((acc, setup) => {
-				acc[setup.widget_id] = setup.setup;
+				acc[setup.widget_id] = setup;
 				return acc;
 			}, {});
 		},
@@ -204,7 +204,7 @@ export default {
 			v-model:cols="gridWidth"
 			v-model:additional-row="additionalRow"
 			:items="items"
-			:items-setup="computedWidgetsSetup"
+			:items-setup="indexedWidgetsTemplates"
 			:active="editModeIsActive"
 			:margin-for-extra-row=".01"
 			@rearrange-items="updatePositions"
@@ -230,7 +230,7 @@ export default {
 					:hidden="item.hidden"
 					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
-					:resize-limits="computedWidgetsSetup[item.widget]"
+					:widget-template="indexedWidgetsTemplates[item.widget]"
 					:source="adminMode ? null : item.source || 'custom'"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 78abd3063..cba1e1282 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -50,7 +50,7 @@ export default {
 	},
 	computed: {
 		sizeLimits() {
-			return Object.fromEntries(Object.entries(this.itemsSetup).map(([type, setup]) => {
+			return Object.fromEntries(Object.entries(this.itemsSetup).map(([type, { setup }]) => {
 				const result = {}; // work on a copy
 				if (setup.height === undefined)
 					result.height = { min: 1, max: undefined };
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
deleted file mode 100644
index 4bc2d4992..000000000
--- a/public/js/composables/Dashboard/CachedWidgetLoader.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import ApiWidget from "../../api/factory/dashboard/widget.js";
-
-const promises = Vue.ref([]);
-const stateRef = Vue.ref([]);
-const state = Vue.readonly(stateRef);
-
-export function useCachedWidgetLoader() {
-	const $api = Vue.inject('$api');
-	const $fhcAlert = Vue.inject('$fhcAlert');
-
-	function load(id) {
-		if (state.value[id])
-			return Promise.resolve(state.value[id]);
-
-		if (!promises.value[id])
-			promises.value[id] = new Promise((resolve, reject) => {
-				$api
-					.call(ApiWidget.get(id))
-					.then(res => {
-						stateRef.value[id] = res.data;
-						promises.value[id] = undefined;
-						resolve(state.value[id]);
-					})
-					.catch($fhcAlert.handleSystemError);
-			});
-
-		return promises.value[id];
-	}
-
-	return {
-		state,
-		actions: {
-			load
-		}
-	};
-}
\ No newline at end of file

From c240eb4a4ea47af9f827ea41463732e9ded7b832 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 14 Apr 2026 11:30:13 +0200
Subject: [PATCH 064/189] move loading animation inside component root element

---
 public/js/components/Dashboard/Item.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 0df0023dd..94ee0bbef 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -39,7 +39,7 @@ export default {
 		"custom",
 		"hidden",
 		"editMode",
-		"loading",
+		"loading", // widget got added and is waiting for backend to save in db
 		"item_data",
 		"place",
 		"widgetTemplate",
@@ -176,18 +176,16 @@ export default {
 		this.tmpConfig = { ...this.arguments };
 	},
 	template: /*html*/ `
-	<div v-if="loading">
-		<div class="d-flex justify-content-center align-items-center h-100">
-			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-		</div>
-	</div>
 	<div
-		v-else-if="!hidden || editMode"
+		v-if="!hidden || editMode"
 		:id="widgetID"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
 		:class="{'hidden-widget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
 	>
-		<div class="h-100 card border-0">
+		<div v-if="loading" class="d-flex justify-content-center align-items-center h-100">
+			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+		</div>
+		<div v-else class="h-100 card border-0">
 			<div v-if="widgetTemplate" class="card-header d-flex ps-0 pe-2 align-items-center">
 				<Transition>
 					<span

From 328fe4256e706e7fa64a44c352e3654c44c98fda Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 14 Apr 2026 11:44:30 +0200
Subject: [PATCH 065/189] safeguard component loading from widgetTemplate
 (=widgetSetup)

---
 public/js/components/Dashboard/Item.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 94ee0bbef..00951cdd5 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -158,6 +158,20 @@ export default {
 				}
 			}
 			this.$emit("change", config);
+		},
+		async initializeComponent() {
+			if (
+				this.widgetTemplate
+				&& this.widgetTemplate.setup
+				&& this.widgetTemplate.widget_id
+				&& this.widgetTemplate.arguments
+			) {
+				let component = (await import(this.widgetTemplate.setup.file)).default;
+				this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
+				this.component = "widget" + this.widgetTemplate.widget_id;
+				this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
+				this.tmpConfig = { ...this.arguments };
+			}
 		}
 	},
 	watch: {
@@ -167,13 +181,12 @@ export default {
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
 		},
+		widgetTemplate() {
+			this.initializeComponent();
+		}
 	},
-	async created() {
-		let component = (await import(this.widgetTemplate.setup.file)).default;
-		this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
-		this.component = "widget" + this.widgetTemplate.widget_id;
-		this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
-		this.tmpConfig = { ...this.arguments };
+	created() {
+		this.initializeComponent();
 	},
 	template: /*html*/ `
 	<div

From ebafc4576ff7c244a83c87eb2d10afdee9131c01 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 14:08:16 +0200
Subject: [PATCH 066/189] implemented profile calendar sync section

---
 application/controllers/Cis/Profil.php        |  69 ++++++---
 .../Cis/Profil/MitarbeiterProfil.js           |  11 +-
 public/js/components/Cis/Profil/Profil.js     | 115 ++++++++------
 .../Profil/ProfilComponents/CalendarSync.js   |  52 +++++++
 .../js/components/Cis/Profil/StudentProfil.js |  10 +-
 system/phrasesupdate.php                      | 145 +++++++++++++++++-
 6 files changed, 329 insertions(+), 73 deletions(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 77f6ffb07..83b8f5493 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -55,15 +55,16 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		
+
 		$this->load->library('ProfilLib');
 		$profil_data = $this->profillib->getView(getAuthUID());
 		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
 		$viewData = array(
-			'editable'=>true,
+			'editable' => true,
 			'profil_data' => $profil_data,
+			'calendarSyncUrls' => $this->getCalendarSyncUrlData(),
 		);
-		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'profilIndex']);
 	}
 
 	/**
@@ -76,17 +77,17 @@ class Profil extends Auth_Controller
 		$this->load->library('ProfilLib');
 		$profil_data = $this->profillib->getView($uid);
 		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
-		$viewData = array (
+		$viewData = array(
 			'uid' => $uid,
-			'profil_data'=>$profil_data,
+			'profil_data' => $profil_data,
 			'permissions' => [
 				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan')),
 			]
 		);
-		if($uid == getAuthUID()){
+		if ($uid == getAuthUID()) {
 			$viewData['editable'] = true;
 		}
-		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}
 
 	/**
@@ -265,23 +266,23 @@ class Profil extends Auth_Controller
 		$this->GemeindeModel->addDistinct();
 		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
-				if (isset($zip) && $zip > 999 && $zip < 32000) {
+			if (isset($zip) && $zip > 999 && $zip < 32000) {
 
-						$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
-						if (isError($gemeinde_res)) {
-								show_error("error while trying to query bis.tbl_gemeinde");
-						}
-						$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-						$gemeinde_res = array_map(function ($obj) {
-								return $obj->name;
-						}, $gemeinde_res);
-						echo json_encode($gemeinde_res);
-
-				} else {
-						echo json_encode(error("ortschaftskennziffer code was not valid"));
+				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+				if (isError($gemeinde_res)) {
+					show_error("error while trying to query bis.tbl_gemeinde");
 				}
+				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+				$gemeinde_res = array_map(function ($obj) {
+					return $obj->name;
+				}, $gemeinde_res);
+				echo json_encode($gemeinde_res);
+
+			} else {
+				echo json_encode(error("ortschaftskennziffer code was not valid"));
+			}
 		} else {
-				echo json_encode(error("Nation was not 'A' (Austria)"));
+			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}
 
@@ -754,5 +755,29 @@ class Profil extends Auth_Controller
 		return $zutrittskarte_ausgegebenam;
 	}
 
-
+	/**
+	 * gets the identifier, phrase, and url for each calendar sync option
+	 * @access private
+	 * @return array array of arrays, where each child array is a sync option
+	 */
+	private function getCalendarSyncUrlData()
+	{
+		return [
+			[
+				"identifier" => "cal_dav",
+				"labelPhrase" => "profil/calendar_sync_cal_dav",
+				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
+			],
+			[
+				"identifier" => "cal_dav_principal",
+				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
+				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
+			],
+			[
+				"identifier" => "i_cal",
+				"labelPhrase" => "profil/calendar_sync_i_cal",
+				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
+			],
+		];
+	}
 }
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 98b5a822b..44e0ca6eb 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -9,6 +9,7 @@ import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -26,6 +27,7 @@ export default {
 		ProfilEmails,
 		RoleInformation,
 		ProfilInformation,
+		CalendarSync,
 	},
 
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
@@ -160,6 +162,7 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
+		calendarSyncUrls: Array,
 	},
 	
 	methods: {
@@ -313,7 +316,6 @@ export default {
 		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
-
 	},
 	watch: {
 		'data.funktionen'(newVal) {
@@ -489,12 +491,17 @@ export default {
                     <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
                 </div>
             </div>
-            <div  class="row">
+            <div class="row mb-3">
                 <div class="col">
                     <!-- MAILVERTEILER -->
                     <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
                 </div>
             </div>
+			<div class="row">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
         </div>
     </div>
 </div>
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index c2d64982c..b5f3fd552 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -4,8 +4,8 @@ import ViewStudentProfil from "./StudentViewProfil.js";
 import ViewMitarbeiterProfil from "./MitarbeiterViewProfil.js";
 import Loading from "../../Loader.js";
 
-import ApiProfil from '../../../api/factory/profil.js';
-import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import ApiProfil from "../../../api/factory/profil.js";
+import ApiProfilUpdate from "../../../api/factory/profilUpdate.js";
 
 Vue.$collapseFormatter = function (data) {
 	//data - an array of objects containing the column title and value for each cell
@@ -35,7 +35,7 @@ Vue.$collapseFormatter = function (data) {
 };
 
 export const Profil = {
-	name: 'Profil',
+	name: "Profil",
 	components: {
 		StudentProfil,
 		MitarbeiterProfil,
@@ -46,11 +46,11 @@ export const Profil = {
 	props: {
 		uid: {
 			type: String,
-			required:false,
+			required: false,
 		},
 		viewData: {
 			type: Object,
-		}
+		},
 	},
 	data() {
 		return {
@@ -67,12 +67,12 @@ export const Profil = {
 	},
 	provide() {
 		return {
-			isEditable: Vue.computed(()=>this.isEditable),
+			isEditable: Vue.computed(() => this.isEditable),
 			profilUpdateStates: Vue.computed(() =>
-				this.profilUpdateStates ? this.profilUpdateStates : false
+				this.profilUpdateStates ? this.profilUpdateStates : false,
 			),
 			profilUpdateTopic: Vue.computed(() =>
-				this.profilUpdateTopic ? this.profilUpdateTopic : false
+				this.profilUpdateTopic ? this.profilUpdateTopic : false,
 			),
 			setLoading: (newValue) => {
 				this.loading = newValue;
@@ -130,8 +130,12 @@ export const Profil = {
 				//? if they have the same status the insert date is used for ordering
 				if (ele1.status === ele2.status) {
 					result =
-						new Date(ele2.insertamum.split(".").reverse().join("-")) -
-						new Date(ele1.insertamum.split(".").reverse().join("-"));
+						new Date(
+							ele2.insertamum.split(".").reverse().join("-"),
+						) -
+						new Date(
+							ele1.insertamum.split(".").reverse().join("-"),
+						);
 				}
 				return result;
 			},
@@ -157,11 +161,11 @@ export const Profil = {
 				.catch((error) => {
 					console.error(error);
 				});
-			
-			
+
 			this.$api
-				.call(ApiProfil.profilViewData(this.$route.params.uid??null))
-				.then((response) => response.data).then(data=>{
+				.call(ApiProfil.profilViewData(this.$route.params.uid ?? null))
+				.then((response) => response.data)
+				.then((data) => {
 					this.view = data?.profil_data.view;
 					this.data = data?.profil_data.data;
 					this.isEditable = data?.editable ?? false;
@@ -169,8 +173,6 @@ export const Profil = {
 				.catch((error) => {
 					console.error(error);
 				});
-			
-			
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -186,7 +188,7 @@ export const Profil = {
 						})
 						.map((adresse) => {
 							return adresse.requested_change.adresse_id;
-						})
+						}),
 				);
 			}
 
@@ -197,8 +199,9 @@ export const Profil = {
 					.every((adresse) =>
 						this.data.profilUpdates.some(
 							(update) =>
-								update.requested_change.adresse_id == adresse.adresse_id
-						)
+								update.requested_change.adresse_id ==
+								adresse.adresse_id,
+						),
 					)
 			) {
 				adressenArray = adressenArray.concat(
@@ -208,12 +211,11 @@ export const Profil = {
 						})
 						.map((adr) => {
 							return adr.adresse_id;
-						})
+						}),
 				);
 			}
 
 			return [...new Set(adressenArray)];
-			
 		},
 		zustellKontakteCount() {
 			if (!this.data || !this.data.kontakte) {
@@ -226,14 +228,17 @@ export const Profil = {
 				kontakteArray = kontakteArray.concat(
 					this.data.profilUpdates
 						.filter((update) => {
-							return update.status === 'Pending' && update.requested_change.zustellung;
+							return (
+								update.status === "Pending" &&
+								update.requested_change.zustellung
+							);
 						})
 						.map((kontant) => {
 							return {
-										kontakt_id: kontant.requested_change.kontakt_id,
-										kontakttyp: kontant.requested_change.kontakttyp
-								};
-						})
+								kontakt_id: kontant.requested_change.kontakt_id,
+								kontakttyp: kontant.requested_change.kontakttyp,
+							};
+						}),
 				);
 			}
 
@@ -244,8 +249,10 @@ export const Profil = {
 					.every((kontakt) =>
 						this.data.profilUpdates.some(
 							(update) =>
-								update.status === 'Pending' && update.requested_change.kontakt_id == kontakt.kontakt_id
-						)
+								update.status === "Pending" &&
+								update.requested_change.kontakt_id ==
+									kontakt.kontakt_id,
+						),
 					)
 			) {
 				kontakteArray = kontakteArray.concat(
@@ -255,10 +262,10 @@ export const Profil = {
 						})
 						.map((kon) => {
 							return {
-										kontakt_id: kon.kontakt_id,
-										kontakttyp: kon.kontakttyp
-								};
-						})
+								kontakt_id: kon.kontakt_id,
+								kontakttyp: kon.kontakttyp,
+							};
+						}),
 				);
 			}
 
@@ -266,7 +273,6 @@ export const Profil = {
 		},
 	},
 	computed: {
-		
 		filteredEditData() {
 			if (!this.data) {
 				return;
@@ -330,8 +336,12 @@ export const Profil = {
 								// excludes all contacts that are already used in pending profil update requests
 								return !this.data.profilUpdates?.some(
 									(update) =>
-										update.status === this.profilUpdateStates["Pending"] &&
-										update.requested_change?.kontakt_id === item.kontakt_id
+										update.status ===
+											this.profilUpdateStates[
+												"Pending"
+											] &&
+										update.requested_change?.kontakt_id ===
+											item.kontakt_id,
 								);
 							})
 							.map((kontakt) => {
@@ -347,12 +357,18 @@ export const Profil = {
 						topic: this.profilUpdateTopic?.["Private Adressen"],
 						data: this.data.adressen
 							?.filter((item) => {
-								return !this.data.profilUpdates?.some((update) => {
-									return (
-										update.status === this.profilUpdateStates["Pending"] &&
-										update.requested_change?.adresse_id == item.adresse_id
-									);
-								});
+								return !this.data.profilUpdates?.some(
+									(update) => {
+										return (
+											update.status ===
+												this.profilUpdateStates[
+													"Pending"
+												] &&
+											update.requested_change
+												?.adresse_id == item.adresse_id
+										);
+									},
+								);
 							})
 							.map((adresse) => {
 								return {
@@ -374,9 +390,9 @@ export const Profil = {
 				this.$refs.loadingModalRef.hide();
 			}
 		},
-		uid (newVal, oldVal) {
-			this.load()
-		}
+		uid(newVal, oldVal) {
+			this.load();
+		},
 	},
 	created() {
 		this.load();
@@ -388,9 +404,14 @@ export const Profil = {
 		</div>
 		<div v-else>
             <loading ref="loadingModalRef" :timeout="0"></loading>
-            <component  :is="view" :data="data" :permissions="$props.viewData.permissions" :editData="filteredEditData" ></component>
+            <component
+				:is="view"
+				:data="data"
+				:editData="filteredEditData"
+				:permissions="$props.viewData.permissions"
+				:calendarSyncUrls="$props.viewData.calendarSyncUrls"></component>
 		</div>
 	</div>`,
-}
+};
 
-export default Profil
\ No newline at end of file
+export default Profil;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js b/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js
new file mode 100644
index 000000000..9f0df6dd5
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js
@@ -0,0 +1,52 @@
+export default {
+	name: "CalendarSync",
+	props: { uid: String, calendarSyncUrls: Array },
+	data() {
+		return {
+			syncInstructionsUrlWithoutParam:
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cms/content.php?content_id=",
+		};
+	},
+	methods: {
+		copyUrlToClipboard(url) {
+			navigator.clipboard.writeText(url);
+			this.$fhcAlert.alertSuccess(
+				this.$p.t("profil/calendar_sync_clipboard_copy_confirmation"),
+			);
+		},
+	},
+	template: `
+<div class="card">
+    <div class="card-header">
+        {{ $p.t("profil/calendar_sync") }}
+    </div>
+    <div class="card-body">
+        <div class="d-flex flex-column gap-3">
+            <span>
+                <a
+                    target="_blank"
+                    :href="syncInstructionsUrlWithoutParam + $p.t('DMS-Link/lvplanSyncFAQ')"
+                    class="fhc-link-color"
+                >
+                    {{ $p.t("profil/calendar_sync_instructions") }}
+                </a>
+                <i class="fa-solid fa-up-right-from-square ms-2"></i>
+            </span>
+            <ul>
+                <li v-for="syncUrl in $props.calendarSyncUrls" :key="syncUrl.identifier">
+                    <a 
+                        @click.prevent="copyUrlToClipboard(syncUrl.url)"
+                        @contextmenu.prevent="copyUrlToClipboard(syncUrl.url)"
+                        href="#"
+                        class="fhc-link-color"
+                    >
+                        {{ $p.t(syncUrl.labelPhrase) }}
+                    </a>
+                    <i class="fa-regular fa-copy ms-2"></i>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>`,
+};
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 638bb15b4..e3e90d3bf 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -9,6 +9,7 @@ import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -26,6 +27,7 @@ export default {
 		FetchProfilUpdates,
 		EditProfil,
 		QuickLinks,
+		CalendarSync,
 	},
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
@@ -102,6 +104,7 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
+		calendarSyncUrls: Array,
 	},
 	provide() {
 		return {
@@ -426,13 +429,18 @@ export default {
 				</div>
 			</div>
 			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-			<div  class="row">
+            <div class="row mb-3">
 				<div class="col">
 					<!-- HIER SIND DIE MAILVERTEILER -->
 					<mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 				</div>
             <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
             </div>
+			<div class="row">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
         <!-- END OF SIDE PANEL -->
         </div>
     <!-- END OF CONTAINER ROW-->
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d7e6aab68..c1633bd9c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29562,7 +29562,8 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),	array(
+	),
+	array(
 		'app' => 'core',
 		'category' => 'profil',
 		'phrase' => 'sem_short',
@@ -29582,6 +29583,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Persönlichen LV-Plan abonnieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Subscribe to personal schedule',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync_instructions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anleitung LV-Plan Synchronisation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Instructions for synchronizing your schedule',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync_cal_dav',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'CalDAV URL (Android, Thunderbird, CalDAV-Synchronizer)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'CalDAV URL (Android, Thunderbird, CalDAV-Synchronizer)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync_cal_dav_principal',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'CalDAV Principal URL (MacOS, iOS)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'CalDAV Principal URL (MacOS, iOS)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync_i_cal',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'iCAL URL (Google)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'iCAL URL (Google)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'calendar_sync_clipboard_copy_confirmation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'URL in die Zwischenablage kopiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'URL copied to clipboard.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//Profil Phrasen ende
 	// LvPlan Phrasen start
 	array(
@@ -57420,6 +57541,28 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### 		LvPlanStgOrg 		END 		###
+	// DMS-Link Phrasen Start
+	array(
+		'app' => 'core',
+		'category' => 'DMS-Link',
+		'phrase' => 'lvplanSyncFAQ',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '7188',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '7188',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// DMS-Link Phrasen End
 );
 
 

From 7edddd0566b739716fc3631747feefd64dc3432f Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 14:19:38 +0200
Subject: [PATCH 067/189] removed redundant OverviewLvPlan page (same as
 StgOrgLvPlan)

---
 application/config/routes.php                 |   3 +-
 .../controllers/Cis/OverviewLvPlan.php        |  39 ----
 public/js/apps/Dashboard/Fhc.js               |  10 -
 .../components/Cis/LvPlan/OverviewLvPlan.js   | 194 ------------------
 4 files changed, 1 insertion(+), 245 deletions(-)
 delete mode 100644 application/controllers/Cis/OverviewLvPlan.php
 delete mode 100644 public/js/components/Cis/LvPlan/OverviewLvPlan.js

diff --git a/application/config/routes.php b/application/config/routes.php
index f397a2007..8024f449a 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -65,9 +65,8 @@ $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 $route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Routes for Lvplan Verband and page for dropdown Stg/Semester/Verband/Gruppe
+//Route for LV Plan Stg/Semester/Verband/Gruppe
 $route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
-$route['Cis/OverviewLvPlan/.*'] = 'Cis/OverviewLvPlan/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
diff --git a/application/controllers/Cis/OverviewLvPlan.php b/application/controllers/Cis/OverviewLvPlan.php
deleted file mode 100644
index 5fe9d9779..000000000
--- a/application/controllers/Cis/OverviewLvPlan.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class OverviewLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OverviewLvPlan']);
-	}
-}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 613cd28f8..7c39f59f8 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -210,16 +210,6 @@ const router = VueRouter.createRouter({
 				};
 			}
 		},
-		{
-			path: `/Cis/OverviewLvPlan`,
-			name: 'OverviewLvPlan',
-			component: OverviewLvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
 		{
       		path: `/Cis/OtherLvPlan/:otherUid/:mode?/:focus_date?`,
       		name: "OtherLvPlan",
diff --git a/public/js/components/Cis/LvPlan/OverviewLvPlan.js b/public/js/components/Cis/LvPlan/OverviewLvPlan.js
deleted file mode 100644
index 01615ab60..000000000
--- a/public/js/components/Cis/LvPlan/OverviewLvPlan.js
+++ /dev/null
@@ -1,194 +0,0 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-
-export default {
-	name: "OverviewLvPlan",
-	components: {
-		FormForm,
-		FormInput,
-	},
-	props: {
-		viewData: Object,
-		propsViewData: Object
-	},
-	data() {
-		return {
-			formData:  {
-				stgkz: null,
-				sem: null,
-				verband: null,
-				gruppe: null,
-			},
-			listStg: [],
-			listSem: [1,2,3,4,5,6,7,8,9,10],
-			listVerband: [],
-			listGroup: [],
-		};
-	},
-	methods: {
-		loadLvPlan() {
-			if (!this.formData.stgkz) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
-				return;
-			}
-			if (!this.formData.sem && (this.formData.verband || this.formData.gruppe)) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
-				return;
-			}
-
-			if (!this.formData.verband && this.formData.gruppe) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
-				return;
-			}
-
-			const params = {
-				mode: this.currentMode,
-				focus_date: this.currentDay,
-				stgkz: this.formData.stgkz,
-				sem: this.formData.sem,
-				verband: this.formData.verband,
-				gruppe: this.formData.gruppe,
-			};
-
-			//ensure logic: no value after a null value in route
-			if (params.sem == null) {
-				params.verband = null;
-				params.gruppe = null;
-			}
-			if (params.verband == null) {
-				params.gruppe = null;
-			}
-
-			//delete all null values to avoid null in router
-			Object.keys(params).forEach(
-				key => params[key] == null && delete params[key]
-			);
-
-			this.$router.push({
-				name: "StgOrgLvPlan",
-				params,
-			});
-		},
-		loadListSem(){
-			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-		},
-		loadListVerband(){
-			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.verband);
-					this.listVerband = [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""
-					))]
-					.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		loadListGroup(){
-			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.sem, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.gruppe);
-					this.listGroup =  [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""))]
-						.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	computed: {
-		maxSemester(){
-			const currentStg = this.listStg.find(
-				item => item.studiengang_kz === this.formData.stgkz
-			);
-			return currentStg.max_semester;
-		},
-		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-			return this.propsViewData?.focus_date;
-		},
-	},
-	created(){
-		this.$api
-			.call(ApiLvPlan.getStudiengaenge())
-			.then(result => {
-				this. listStg = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	template: `
-	<div cis-lvplan-stg-org-ues d-flex flex-column h-100>
-				<div class="mt-3">
-	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.stgkz"
-	 				@change="loadListSem(formData.stgkz)"
-	 				>
-					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
-					<option
-						v-for="stg in listStg"
-						:key="stg.studiengang_kz"
-						:value="stg.studiengang_kz"
-						>
-						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.sem"
-	 				@change="loadListVerband()"
-	 				@click="loadListSem(formData.stgkz)"
-	 				>
-						<option :value="null" selected>Semester</option>
-						<option
-							v-for="sem in listSem"
-							:key="sem"
-							:value="sem"
-							>
-							{{ sem }}
-						</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.verband"
-	 				@change="loadListGroup()"
-	 				>
-	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
-					<option
-						v-for="verband in listVerband"
-						:key="verband"
-						:value="verband"
-						>
-						{{ verband }}
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.gruppe"
-	 				>
-	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
-						<option
-							v-for="group in listGroup"
-							:key="group"
-							:value="group"
-							>
-							{{ group }}
-						</option>
-	 			</form-input>
-				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
-
-	 		</form-form>
-	 	</div>
-	 </div>
-	 `,
-};

From cc23fb0f39181772ef4b48a8dc41520b2a1b263b Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 14:29:02 +0200
Subject: [PATCH 068/189] fixed issue where max_semester could not be read
 before a degree program was selected

---
 public/js/components/Cis/LvPlan/StgOrg.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index 996a599d3..f6bc51c12 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -46,7 +46,7 @@ export default {
 			const currentStg = this.listStg.find(
 				item => item.studiengang_kz === this.formData.stgkz
 			);
-			return currentStg.max_semester;
+			return currentStg?.max_semester;
 		},
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))

From 09a5515121538dd24483c51b2cf9140a114bc534 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 14 Apr 2026 14:35:50 +0200
Subject: [PATCH 069/189] replace checkWidgetSizeLimitAnimation function with
 simple condition statement and remove now unused helper function

---
 public/js/components/Drop/Grid.js | 51 +++++++------------------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index cba1e1282..528985e86 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -466,15 +466,22 @@ export default {
 					case MODE_RESIZE: {
 						evt.preventDefault();
 						const dragGrid = new GridLogic(this.grid);
-						let w = Math.min(this.cols - this.draggedItem.x, Math.max(1, this.x - this.draggedItem.x + 1));
-						let h = Math.max(1, this.y - this.draggedItem.y + 1);
+						const targetW = this.x - this.draggedItem.x + 1;
+						const targetH = this.y - this.draggedItem.y + 1;
+						let w = Math.min(this.cols - this.draggedItem.x, targetW);
+						let h = targetH;
 
 						[ w, h ] = this.cropSizeToAllowed(this.draggedItem.data.widget, w, h);
 
+						let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
+						if (w !== targetW || h !== targetH) {
+							draggedItemNode.classList.add("border-danger");
+						} else {
+							draggedItemNode.classList.remove("border-danger");
+						}
+
 						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
 						
-						this.checkWidgetSizeLimitAnimation();
-						
 						break;
 					}
 				}
@@ -561,26 +568,6 @@ export default {
 				}	
 			});
 		},
-		isSizeAllowed(type, w, h) {
-			if (w < 1 || h < 1)
-				return false;
-			
-			const setup = this.sizeLimits[type];
-
-			if (!setup)
-				return false;
-
-			if (w < setup.width.min)
-				return false;
-			if (h < setup.height.min)
-				return false;
-			if (setup.width.max !== undefined && w > setup.width.max)
-				return false;
-			if (setup.width.max !== undefined && h > setup.height.max)
-				return false;
-
-			return true;
-		},
 		cropSizeToAllowed(type, w, h) {
 			if (w < 1)
 				w = 1;
@@ -603,22 +590,6 @@ export default {
 			
 			return [w, h];
 		},
-		checkWidgetSizeLimitAnimation() {
-			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
-
-			let width_after_resize = this.x - this.draggedItem.x + 1;
-			let height_after_resize = this.y - this.draggedItem.y + 1;
-
-			if (!this.isSizeAllowed(
-				this.draggedItem.data.widget,
-				width_after_resize,
-				height_after_resize
-			)) {
-				draggedItemNode.classList.add("border-danger");
-			} else {
-				draggedItemNode.classList.remove("border-danger");
-			}
-		},
 		removeWidgetClones() {
 			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
 			for (let i = 0; i < widgetClones.length; i++) {

From 343a82b89c7fd7864e63c560af6814c57dda73a3 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 14:53:33 +0200
Subject: [PATCH 070/189] removed obsolete import

---
 public/js/apps/Dashboard/Fhc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 7c39f59f8..a6bc2e11f 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -18,7 +18,6 @@ import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssis
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
-import OverviewLvPlan from "../../components/Cis/LvPlan/OverviewLvPlan.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';

From d003bfa7f177cfaa329ac5f05c44d35ebb2e526e Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 15:51:37 +0200
Subject: [PATCH 071/189] code formatting

---
 public/js/apps/Dashboard/Fhc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a6bc2e11f..b2b7752df 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -305,7 +305,6 @@ const app = Vue.createApp({
 		}
 	},
 	async created(){
-		
 		await this.$api
 			.call(ApiRenderers.loadRenderers())
 			.then(res => res.data)

From cdc279b5daf475dbb63e0d8db7d6f9006294c523 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 14 Apr 2026 16:28:01 +0200
Subject: [PATCH 072/189] added 'other lv plan' permission check in api
 controller

---
 application/controllers/Cis/OtherLvPlan.php        | 2 +-
 application/controllers/api/frontend/v1/LvPlan.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Cis/OtherLvPlan.php b/application/controllers/Cis/OtherLvPlan.php
index 3fbe3e91a..c657ec3d2 100644
--- a/application/controllers/Cis/OtherLvPlan.php
+++ b/application/controllers/Cis/OtherLvPlan.php
@@ -14,7 +14,7 @@ class OtherLvPlan extends Auth_Controller
     public function __construct()
     {
         parent::__construct([
-            'index' => ['basis/cis:r']
+            'index' => ['basis/other_lv_plan:r']
         ]);
 
         // Load Config
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index fa70e919a..99dc8bf59 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -98,6 +98,11 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->post('end_date', true);
 		$uid = $this->input->post('uid', true);
 
+		// disallow accessing other user's lv plan if missing permission
+		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
+			$this->terminateWithError("Missing permission to view other users' timetables!");
+		}
+
 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);

From d1911f0f9660700362182e79a7ffae06587778ed Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 15 Apr 2026 10:14:56 +0200
Subject: [PATCH 073/189] add shared cleanup function to prevent duplicate code

---
 public/js/components/Drop/Grid.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 528985e86..02fff8d71 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -487,13 +487,18 @@ export default {
 				}
 			}
 		},
+		_cleanupDragging() {
+			if (this.draggedItem) {
+				this.draggedItem = null;
+			}
+		},
 		dragCancel() {
 			this.removeWidgetClones();
 			this.additionalRowComputed = false;
 			this.mode = MODE_IDLE;
 			this.tempPositionUpdates = null;
-			this.draggedOffset = [0,0],
-			this.draggedItem = null;
+			this.draggedOffset = [0,0];
+			this._cleanupDragging();
 		},
 		dragEnd() {
 			this.removeWidgetClones();
@@ -518,7 +523,7 @@ export default {
 			if (updated.length)
 				this.$emit('rearrangeItems', updated.filter(v => v));
 
-			this.draggedItem = null;
+			this._cleanupDragging();
 		},
 		_updateCorrectedPositions(updated) {
 			updated.forEach((item, index) => {

From 354e1ccdf47986d3ecbfbebd259cf87c8831988a Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Wed, 15 Apr 2026 12:04:29 +0200
Subject: [PATCH 074/189] reworked calendar sync appearance

---
 .../Profil/ProfilComponents/CalendarSync.js   | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js b/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js
index 9f0df6dd5..f3aa4b2f1 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js
@@ -23,29 +23,31 @@ export default {
     </div>
     <div class="card-body">
         <div class="d-flex flex-column gap-3">
-            <span>
-                <a
-                    target="_blank"
-                    :href="syncInstructionsUrlWithoutParam + $p.t('DMS-Link/lvplanSyncFAQ')"
-                    class="fhc-link-color"
-                >
+            <a
+                target="_blank"
+                :href="syncInstructionsUrlWithoutParam + $p.t('DMS-Link/lvplanSyncFAQ')"
+                class="fhc-link-color d-flex flex-row gap-2 align-items-center"
+            >
+                <span>
+                    <i class="fa-solid fa-up-right-from-square ms-2"></i>
+                </span>
+                <span>
                     {{ $p.t("profil/calendar_sync_instructions") }}
-                </a>
-                <i class="fa-solid fa-up-right-from-square ms-2"></i>
-            </span>
-            <ul>
-                <li v-for="syncUrl in $props.calendarSyncUrls" :key="syncUrl.identifier">
-                    <a 
-                        @click.prevent="copyUrlToClipboard(syncUrl.url)"
-                        @contextmenu.prevent="copyUrlToClipboard(syncUrl.url)"
-                        href="#"
-                        class="fhc-link-color"
-                    >
-                        {{ $p.t(syncUrl.labelPhrase) }}
-                    </a>
-                    <i class="fa-regular fa-copy ms-2"></i>
-                </li>
-            </ul>
+                </span>
+            </a>
+            <a
+                v-for="syncUrl in $props.calendarSyncUrls"
+                :key="syncUrl.identifier"
+                @click.prevent="copyUrlToClipboard(syncUrl.url)"
+                @contextmenu.prevent="copyUrlToClipboard(syncUrl.url)"
+                href="#"
+                class="fhc-link-color d-flex flex-row gap-2 align-items-center"
+            >
+                <span>
+                    <i class="fa-regular fa-copy ms-2 text-decoration-none"></i>
+                </span>
+                    {{ $p.t(syncUrl.labelPhrase) }}
+            </a>
         </div>
     </div>
 </div>`,

From 910e960e4f7f242ccce99532e17228c48059c94e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 15 Apr 2026 13:54:30 +0200
Subject: [PATCH 075/189] code quality

---
 public/js/components/Drop/Grid.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 02fff8d71..1c090f814 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -45,7 +45,7 @@ export default {
 			draggedOffset: [0, 0],
 			draggedItem: null,
 			reorderedItems: [],
-			clonedWidget: null,
+			clonedWidget: null
 		};
 	},
 	computed: {
@@ -158,7 +158,7 @@ export default {
 					' ' +
 					'var(--fhc-dg-item-px, var(--fhc-dg-item-p, .25%))',
 				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
-			}
+			};
 		},
 		indexedItems() {
 			return this.items.map(
@@ -460,7 +460,8 @@ export default {
 							this.draggedOffset[1] += y;
 							y = 0;
 						}
-						this.tempPositionUpdates= dragGrid.move(this.draggedItem, x, y);
+						
+						this.tempPositionUpdates = dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
 					case MODE_RESIZE: {

From 88c82a41bac33fc9eb5869a41c5ef660433c6728 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 15 Apr 2026 13:55:07 +0200
Subject: [PATCH 076/189] gridlogic: return null for impossible updates instead
 of throwing an error

---
 public/js/composables/GridLogic.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index ff8ae0c39..d6a38f2ca 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -91,7 +91,7 @@ class GridLogic {
 
 				return result;
 			} else {
-				console.error('FATAL', "can't arrange item on grid");
+				return null;
 			}
 		}
 	}
@@ -151,7 +151,9 @@ class GridLogic {
 		}
 		
 		const updates = this.add(currItem, prefer);
-		updates[item.index] = {index: item.index, x, y};
+		if (updates)
+			updates[item.index] = {index: item.index, x, y};
+		
 		return updates;
 	}
 	resize(item, w, h) {

From 35355b28c0899bca8456f482e29fde83ea4276bb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 15 Apr 2026 13:56:35 +0200
Subject: [PATCH 077/189] use css classes instead of temporary items

---
 public/css/components/dashboard.css |  8 ++++
 public/js/components/Drop/Grid.js   | 68 +++++++++++++++--------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 54de860e7..b77d81f7d 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -130,10 +130,12 @@
 	display: none;
 }
 
+.drop-grid-item-sizechanged > .dashboard-item,
 .drop-grid-item-move > .dashboard-item {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
+.drop-grid-item-sizechanged > .dashboard-item::before,
 .drop-grid-item-move > .dashboard-item::before {
 	position: absolute;
 	content: "";
@@ -145,6 +147,12 @@
 	opacity: .5;
 }
 
+.drop-grid-item-oversized > .dashboard-item {
+	/* Bootstrap: border-danger */
+	--bs-border-opacity: 1;
+	border-color: rgba(var(--bs-danger-rgb), var(--bs-border-opacity)) !important;
+}
+
 #deleteBookmark i {
 	color: var(--fhc-dashboard-danger);
 }
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1c090f814..62f687183 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -137,9 +137,31 @@ export default {
 			return placeholders;
 		},
 		currentItems() {
-			if (this.mode != 1 && this.mode != 2 && this.active)
+			if (this.mode == MODE_IDLE && this.active)
 				return [ ...this.placedItems, ...this.items_placeholders ];
 
+			if (this.mode != MODE_IDLE && this.draggedItem) {
+				// add classes to dragged item
+				const draggedItemIndex = this.placedItems.findIndex(item => item.index == this.draggedItem.index);
+				const modifiedDraggedItem = {
+					...this.placedItems[draggedItemIndex],
+					classes: []
+				};
+
+				if (this.mode == MODE_MOVE) {
+					modifiedDraggedItem.classes.push('drop-grid-item-move');
+				}
+				if (this.mode == MODE_RESIZE) {
+					modifiedDraggedItem.classes.push('drop-grid-item-resize');
+					if (this.draggedItem.oversized)
+						modifiedDraggedItem.classes.push('drop-grid-item-oversized')
+					else if (this.placedItems[draggedItemIndex].resize)
+						modifiedDraggedItem.classes.push('drop-grid-item-sizechanged')
+				}
+
+				return this.placedItems.toSpliced(draggedItemIndex, 1, modifiedDraggedItem);
+			}
+
 			return this.placedItems;
 		},
 		rows() {
@@ -195,11 +217,10 @@ export default {
 		placedItems() {
 			if (!this.tempPositionUpdates)
 				return this.prePlacedItems;
-			let mappedPlacedItems= this.prePlacedItems.map(item => {
-				if (!this.tempPositionUpdates[item.index] )
+			return this.prePlacedItems.map(item => {
+				if (!this.tempPositionUpdates[item.index])
 					return item;
-				let height_diff = this.tempPositionUpdates[item.index]?.h - item.h;
-				let width_diff = this.tempPositionUpdates[item.index]?.w - item.w;
+
 				return {
 					resize: this.tempPositionUpdates[item.index]?.resize,
 					index: item.index,
@@ -207,26 +228,11 @@ export default {
 					data: item.data,
 					x: this.tempPositionUpdates[item.index].x === undefined ? item.x : this.tempPositionUpdates[item.index].x,
 					y: this.tempPositionUpdates[item.index].y === undefined ? item.y : this.tempPositionUpdates[item.index].y,
-					w: width_diff>0?item.w:this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
-					h: height_diff > 0 ?item.h:this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
+					w: this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
+					h: this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
 					
 				};
 			});
-
-			let temporaryResizeItems = [];
-			mappedPlacedItems.forEach(item=>{
-				if(item.resize){
-					let newItem = {
-						...item,
-						w:this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
-						h:this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h,
-						resizeOverlay:true,
-						blank:true,
-					};
-					temporaryResizeItems.push(newItem)
-				}
-			})
-			return [...mappedPlacedItems, ...temporaryResizeItems];
 		}
 	},
 	watch: {
@@ -474,15 +480,12 @@ export default {
 
 						[ w, h ] = this.cropSizeToAllowed(this.draggedItem.data.widget, w, h);
 
-						let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
-						if (w !== targetW || h !== targetH) {
-							draggedItemNode.classList.add("border-danger");
-						} else {
-							draggedItemNode.classList.remove("border-danger");
-						}
+						this.draggedItem.oversized = (w !== targetW || h !== targetH);
+
+						if (this.draggedItem.oversized)
+							[ w, h ] = [ this.draggedItem.w, this.draggedItem.h ];
 
 						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
-						
 						break;
 					}
 				}
@@ -490,6 +493,8 @@ export default {
 		},
 		_cleanupDragging() {
 			if (this.draggedItem) {
+				const draggedItem = this.indexedItems.find(item => item.index == this.draggedItem.index);
+				delete draggedItem.classes;
 				this.draggedItem = null;
 			}
 		},
@@ -617,10 +622,7 @@ export default {
 				v-for="(item, index) in currentItems"
 				:key="item.data.id"
 				class="position-absolute"
-				:class="{
-					'drop-grid-item-move': item.index == draggedItem?.index && mode == 1,
-					'drop-grid-item-resize': item.index == draggedItem?.index && mode == 2
-				}"
+				:class="item.classes"
 				:item="item"
 				:style="{
 					zIndex: item.resizeOverlay ? 1 : 'auto',

From d3b62daea0220be8c68aa65755bf892758f45822 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 15 Apr 2026 15:50:10 +0200
Subject: [PATCH 078/189] not needed anymore since "resizeOverlay" is now
 handled by css classes (see previous commit)

---
 public/js/components/Drop/Grid.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 62f687183..f782c3668 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -625,7 +625,6 @@ export default {
 				:class="item.classes"
 				:item="item"
 				:style="{
-					zIndex: item.resizeOverlay ? 1 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',

From cfe6e3c805b4e2a48061f8255729e0270a80d41a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 09:27:12 +0200
Subject: [PATCH 079/189] rearrange and comment dropgrid for better
 understanding

---
 public/js/components/Drop/Grid.js | 351 +++++++++++++++---------------
 1 file changed, 181 insertions(+), 170 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index f782c3668..ce44beb37 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -34,21 +34,53 @@ export default {
 	],
 	data() {
 		return {
-			x: -1,
-			y: -1,
-			clientX:0,
-			clientY: 0,
-			mode: MODE_IDLE,
+			// gridlogic
 			grid: null,
 			tempPositionUpdates: null,
 			correctedPositionUpdates: null,
+			// dragging
+			mode: MODE_IDLE,
 			draggedOffset: [0, 0],
 			draggedItem: null,
-			reorderedItems: [],
-			clonedWidget: null
+			clonedWidget: null, // ghost image
+			// tile coordinates while dragging
+			x: -1,
+			y: -1,
+			// mouse coordinates while dragging
+			clientX: 0,
+			clientY: 0,
+			reorderedItems: [] // holds items that have no inital place
 		};
 	},
 	computed: {
+		// gridlogic
+		rows() {
+			if (this.additionalRowComputed) {
+				return this.grid ? (this.grid.h+1) : 1;
+			}
+			return this.grid ? this.grid.h : 1;
+		},
+		additionalRowComputed: {
+			get() {
+				return this.additionalRow;
+			},
+			set(value) {
+				this.$emit('update:additionalRow', value);
+			}
+		},
+		gridStyle() {
+			const addH = this.active ? this.marginForExtraRow : 0;
+			return {
+				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
+				'--fhc-dg-col-width': 100/this.cols + '%',
+				'--fhc-dg-item-padding':
+					'var(--fhc-dg-item-py, var(--fhc-dg-item-p, .25%))' +
+					' ' +
+					'var(--fhc-dg-item-px, var(--fhc-dg-item-p, .25%))',
+				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
+			};
+		},
+		// dragging
 		sizeLimits() {
 			return Object.fromEntries(Object.entries(this.itemsSetup).map(([type, { setup }]) => {
 				const result = {}; // work on a copy
@@ -75,15 +107,8 @@ export default {
 				return [type, result];
 			}));
 		},
-		additionalRowComputed: {
-			get() {
-				return this.additionalRow;
-			},
-			set(value) {
-				this.$emit('update:additionalRow', value);
-			}
-		},
-		items_hashmap() {
+		// item pipeline
+		items_hashmap() { // helper
 			let items = {};
 			this.items.forEach(item => {
 				if (this.reorderedItems.length > 0 && this.needsReordering(item)) {
@@ -97,7 +122,7 @@ export default {
 			});	
 			return items
 		},
-		items_placeholders() {
+		items_placeholders() { // empty tiles
 			let placeholders = [];
 			let col_max = this.cols;
 			let rows_max = this.rows;
@@ -136,7 +161,59 @@ export default {
 			}
 			return placeholders;
 		},
-		currentItems() {
+		indexedItems() { // indexed
+			return this.items.map(
+				(item, index) => {
+					return {
+						index: index,
+						x: item.x,
+						y: item.y,
+						w: item.w,
+						h: item.h,
+						weight: item.weight || 0,
+						data: item
+					}
+				}
+			);
+		},
+		prePlacedItems() { // indexed & corrected
+			if (!this.correctedPositionUpdates)
+				return this.indexedItems;
+			return this.indexedItems.map(item => {
+				if (!this.correctedPositionUpdates[item.index])
+					return item;
+				return {
+					index: item.index,
+					weight: item.weight,
+					data: item.data,
+					x: this.correctedPositionUpdates[item.index].x === undefined ? item.x : this.correctedPositionUpdates[item.index].x,
+					y: this.correctedPositionUpdates[item.index].y === undefined ? item.y : this.correctedPositionUpdates[item.index].y,
+					w: this.correctedPositionUpdates[item.index].w === undefined ? item.w : this.correctedPositionUpdates[item.index].w,
+					h: this.correctedPositionUpdates[item.index].h === undefined ? item.h : this.correctedPositionUpdates[item.index].h
+				};
+			});
+		},
+		placedItems() { // indexed & corrected & dragging
+			if (!this.tempPositionUpdates)
+				return this.prePlacedItems;
+			return this.prePlacedItems.map(item => {
+				if (!this.tempPositionUpdates[item.index])
+					return item;
+
+				return {
+					resize: this.tempPositionUpdates[item.index]?.resize,
+					index: item.index,
+					weight: item.weight,
+					data: item.data,
+					x: this.tempPositionUpdates[item.index].x === undefined ? item.x : this.tempPositionUpdates[item.index].x,
+					y: this.tempPositionUpdates[item.index].y === undefined ? item.y : this.tempPositionUpdates[item.index].y,
+					w: this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
+					h: this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
+					
+				};
+			});
+		},
+		currentItems() { // final items with classes
 			if (this.mode == MODE_IDLE && this.active)
 				return [ ...this.placedItems, ...this.items_placeholders ];
 
@@ -163,76 +240,6 @@ export default {
 			}
 
 			return this.placedItems;
-		},
-		rows() {
-			if (this.additionalRowComputed) {
-				return this.grid ? (this.grid.h+1) : 1;
-			}
-			return this.grid ? this.grid.h : 1;
-		},
-		gridStyle() {
-			const addH = this.active ? this.marginForExtraRow : 0;
-			return {
-				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
-				'--fhc-dg-col-width': 100/this.cols + '%',
-				'--fhc-dg-item-padding':
-					'var(--fhc-dg-item-py, var(--fhc-dg-item-p, .25%))' +
-					' ' +
-					'var(--fhc-dg-item-px, var(--fhc-dg-item-p, .25%))',
-				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
-			};
-		},
-		indexedItems() {
-			return this.items.map(
-				(item, index) => {
-					return {
-						index: index,
-						x: item.x,
-						y: item.y,
-						w: item.w,
-						h: item.h,
-						weight: item.weight || 0,
-						data: item
-					}
-				}
-			);
-		},
-		prePlacedItems() {
-			if (!this.correctedPositionUpdates)
-				return this.indexedItems;
-			return this.indexedItems.map(item => {
-				if (!this.correctedPositionUpdates[item.index])
-					return item;
-				return {
-					index: item.index,
-					weight: item.weight,
-					data: item.data,
-					x: this.correctedPositionUpdates[item.index].x === undefined ? item.x : this.correctedPositionUpdates[item.index].x,
-					y: this.correctedPositionUpdates[item.index].y === undefined ? item.y : this.correctedPositionUpdates[item.index].y,
-					w: this.correctedPositionUpdates[item.index].w === undefined ? item.w : this.correctedPositionUpdates[item.index].w,
-					h: this.correctedPositionUpdates[item.index].h === undefined ? item.h : this.correctedPositionUpdates[item.index].h
-				};
-			});
-		},
-		placedItems() {
-			if (!this.tempPositionUpdates)
-				return this.prePlacedItems;
-			return this.prePlacedItems.map(item => {
-				if (!this.tempPositionUpdates[item.index])
-					return item;
-
-				return {
-					resize: this.tempPositionUpdates[item.index]?.resize,
-					index: item.index,
-					weight: item.weight,
-					data: item.data,
-					x: this.tempPositionUpdates[item.index].x === undefined ? item.x : this.tempPositionUpdates[item.index].x,
-					y: this.tempPositionUpdates[item.index].y === undefined ? item.y : this.tempPositionUpdates[item.index].y,
-					w: this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
-					h: this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
-					
-				};
-			});
 		}
 	},
 	watch: {
@@ -264,32 +271,35 @@ export default {
 		}
 	},
 	methods: {
+		// helpers
+		convertGridResultToUpdate(input, output, baseArray) {
+			if (!input)
+				return;
+			if (!baseArray)
+				baseArray = this.indexedItems;
+			input.forEach(item => {
+				let result = {
+					item: baseArray[item.index].data
+				};
+				if (item.x !== undefined)
+					result.x = item.x;
+				if (item.y !== undefined)
+					result.y = item.y;
+				if (item.w !== undefined)
+					result.w = item.w;
+				if (item.h !== undefined)
+					result.h = item.h;
+				output[item.index] = result;
+			});
+		},
+		// has item an initial place
 		needsReordering(item) {
 			if (!item?.data?.place[this.cols]) {
 				return true;
 			}
 			return false;
 		},
-		moveGhostImage(event) {
-			if (this.mode == MODE_MOVE) {
-				const containerRect = this.$refs.container.getBoundingClientRect();
-				const clonedWidgetRect = this.clonedWidget.getBoundingClientRect();
-				
-				let desiredTop = this.clientY - 20;
-				let desiredLeft = this.clientX - 15;
-				
-				const minTop = 0;
-				const maxTop = containerRect.height - clonedWidgetRect.height;
-				const minLeft = 0;
-				const maxLeft = containerRect.width - clonedWidgetRect.width;
-				
-				const constrainedTop = Math.max(minTop, Math.min(maxTop, desiredTop));
-				const constrainedLeft = Math.max(minLeft, Math.min(maxLeft, desiredLeft));
-				
-				this.clonedWidget.style.top = `${constrainedTop}px`;
-				this.clonedWidget.style.left = `${constrainedLeft}px`;
-			}
-		},
+		// gridlogic
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
@@ -345,52 +355,22 @@ export default {
 			this.grid.clearWeights();
 			return result;
 		},
-		convertGridResultToUpdate(input, output, baseArray) {
-			if (!input)
-				return;
-			if (!baseArray)
-				baseArray = this.indexedItems;
-			input.forEach(item => {
-				let result = {
-					item: baseArray[item.index].data
-				};
-				if (item.x !== undefined)
-					result.x = item.x;
-				if (item.y !== undefined)
-					result.y = item.y;
-				if (item.w !== undefined)
-					result.w = item.w;
-				if (item.h !== undefined)
-					result.h = item.h;
-				output[item.index] = result;
+		_updateCorrectedPositions(updated) {
+			updated.forEach((item, index) => {
+				if (!this.correctedPositionUpdates[index])
+					this.correctedPositionUpdates[index] = item;
+				else
+					this.correctedPositionUpdates[index] = {...this.correctedPositionUpdates[index], ...item};
 			});
-		},
-		updateCursor(evt) {
-			if (!this.active) {
-				this.x = this.y = -1;
-				return false;
+			let additionalUpdates = this.createNewGrid(this.prePlacedItems);
+			if (additionalUpdates.length) {
+				// NOTE(chris): this should never happen but it's here for safety
+				additionalUpdates.forEach((item, index) => updated[index] = item);
+				return this._updateCorrectedPositions(updated);
 			}
-			const addH = this.active ? this.marginForExtraRow : 0;
-			const rect = this.$refs.container.getBoundingClientRect();
-			
-			if (!evt.clientX && !evt.clientY && evt.touches){
-				evt.clientX = evt.touches[0].clientX;
-				evt.clientY = evt.touches[0].clientY;
-			}
-
-			this.clientX = (evt.clientX - rect.left);
-			this.clientY = (evt.clientY - rect.top);
-			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
-			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
-			
-			if (this.x == gridX && this.y == gridY)
-				return false;
-			
-			this.x = gridX;
-			this.y = gridY;
-
-			return true;
+			return updated;
 		},
+		// dragging
 		_dragStart(evt, item) {
 			if (evt.dataTransfer) {
 				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
@@ -439,6 +419,32 @@ export default {
 			
 			this._dragStart(evt);
 		},
+		updateCursor(evt) {
+			if (!this.active) {
+				this.x = this.y = -1;
+				return false;
+			}
+			const addH = this.active ? this.marginForExtraRow : 0;
+			const rect = this.$refs.container.getBoundingClientRect();
+			
+			if (!evt.clientX && !evt.clientY && evt.touches){
+				evt.clientX = evt.touches[0].clientX;
+				evt.clientY = evt.touches[0].clientY;
+			}
+
+			this.clientX = (evt.clientX - rect.left);
+			this.clientY = (evt.clientY - rect.top);
+			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
+			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+			
+			if (this.x == gridX && this.y == gridY)
+				return false;
+			
+			this.x = gridX;
+			this.y = gridY;
+
+			return true;
+		},
 		dragOver(evt) {
 			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
 				this.dragCancel();
@@ -491,6 +497,12 @@ export default {
 				}
 			}
 		},
+		removeWidgetClones() {
+			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
+			for (let i = 0; i < widgetClones.length; i++) {
+				this.$refs.container.removeChild(widgetClones[i]);
+			}
+		},
 		_cleanupDragging() {
 			if (this.draggedItem) {
 				const draggedItem = this.indexedItems.find(item => item.index == this.draggedItem.index);
@@ -531,20 +543,25 @@ export default {
 
 			this._cleanupDragging();
 		},
-		_updateCorrectedPositions(updated) {
-			updated.forEach((item, index) => {
-				if (!this.correctedPositionUpdates[index])
-					this.correctedPositionUpdates[index] = item;
-				else
-					this.correctedPositionUpdates[index] = {...this.correctedPositionUpdates[index], ...item};
-			});
-			let additionalUpdates = this.createNewGrid(this.prePlacedItems);
-			if (additionalUpdates.length) {
-				// NOTE(chris): this should never happen but it's here for safety
-				additionalUpdates.forEach((item, index) => updated[index] = item);
-				return this._updateCorrectedPositions(updated);
+		moveGhostImage(event) {
+			if (this.mode == MODE_MOVE) {
+				const containerRect = this.$refs.container.getBoundingClientRect();
+				const clonedWidgetRect = this.clonedWidget.getBoundingClientRect();
+				
+				let desiredTop = this.clientY - 20;
+				let desiredLeft = this.clientX - 15;
+				
+				const minTop = 0;
+				const maxTop = containerRect.height - clonedWidgetRect.height;
+				const minLeft = 0;
+				const maxLeft = containerRect.width - clonedWidgetRect.width;
+				
+				const constrainedTop = Math.max(minTop, Math.min(maxTop, desiredTop));
+				const constrainedLeft = Math.max(minLeft, Math.min(maxLeft, desiredLeft));
+				
+				this.clonedWidget.style.top = `${constrainedTop}px`;
+				this.clonedWidget.style.left = `${constrainedLeft}px`;
 			}
-			return updated;
 		},
 		checkPinnedWidgetAnimation() {
 			let itemAtPosition = [];
@@ -600,12 +617,6 @@ export default {
 				h = setup.height.max;
 			
 			return [w, h];
-		},
-		removeWidgetClones() {
-			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
-			for (let i = 0; i < widgetClones.length; i++) {
-				this.$refs.container.removeChild(widgetClones[i]);
-			}
 		}
 	},
 	template: /* html */`

From 24c8a1c50150038b0a184a1b5ffe1f41b667b090 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 09:51:32 +0200
Subject: [PATCH 080/189] Decode JSON in backend not frontend and make
 component path a full path (also in backend)

---
 .../controllers/api/frontend/v1/dashboard/Board.php    | 10 ++++++++++
 public/js/components/Dashboard/Admin.js                |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/Board.php b/application/controllers/api/frontend/v1/dashboard/Board.php
index 2c8c72107..fdded61e3 100644
--- a/application/controllers/api/frontend/v1/dashboard/Board.php
+++ b/application/controllers/api/frontend/v1/dashboard/Board.php
@@ -55,6 +55,16 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+		$data = array_map(function ($dashboard) {
+			$tmpSetups = json_decode($dashboard->widgetSetup);
+			$tmpSetups = array_map(function ($widget) {
+				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
+				return $widget;
+			}, $tmpSetups);
+			$dashboard->widgetSetup = $tmpSetups;
+			return $dashboard;
+		}, $data);
+
 		$this->terminateWithSuccess($data);
 	}
 
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index 5222b9673..8921400b8 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -87,9 +87,6 @@ export default {
 			.call(ApiDashboardBoard.list())
 			.then(result => {
 				this.dashboards = result.data;
-				for (const dashboard of this.dashboards) {
-					dashboard.widgetSetup = JSON.parse(dashboard.widgetSetup);
-				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From e21f35b880eadf2f4e3b73e169f1e24db79fc970 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 10:58:47 +0200
Subject: [PATCH 081/189] easier more straightforward way to computed free
 slots in gridlogic

---
 public/js/composables/GridLogic.js | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index d6a38f2ca..b901d115d 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -23,30 +23,18 @@ class GridLogic {
 		const i = y*this.w + x;
 		return !this.grid[i] && this.grid[i] !== 0;
 	}
-	getMaxY(){
-		return this.data.reduce((acc, item) => { 
-			if (item?.y > acc) {
-				 acc = item.y; 
-			} 
-			return acc; 
-		}, 0);
-	}
 	getFreeSlots() {
 		const freeSlots = [];
-		let biggestY = this.getMaxY();
-		let totalSpaces = this.w * (biggestY+1);
-		for(let i=0; i < totalSpaces; i++){
-			if (!this.grid[i] && this.grid[i] !== 0){
-				this.grid[i] = undefined;
-			}
-		}
-		for(let i =0; i < this.grid.length; i++){
-			if (!this.grid[i] && this.grid[i] !== 0){
+		let i = this.w * this.h;
+
+		while (i--) {
+			if (!this.grid[i] && this.grid[i] !== 0) {
 				let x = i % this.w;
 				let y = Math.floor(i / this.w);
 				freeSlots.push({x, y});
 			}
 		}
+
 		return freeSlots;
 	}
 	add(item, prefer) {

From 262b17024422f9d6619483afd62f337841246653 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 11:00:34 +0200
Subject: [PATCH 082/189] utilize getFreeSlots from gridlogic to create
 placeholders

---
 public/js/components/Drop/Grid.js | 61 ++++++-------------------------
 1 file changed, 11 insertions(+), 50 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index ce44beb37..40a1b1407 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -108,58 +108,19 @@ export default {
 			}));
 		},
 		// item pipeline
-		items_hashmap() { // helper
-			let items = {};
-			this.items.forEach(item => {
-				if (this.reorderedItems.length > 0 && this.needsReordering(item)) {
-						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
-						if (rearrangedPosition) {			
-							item.x = rearrangedPosition.x;
-							item.y = rearrangedPosition.y;
-						}
-				}
-				items[`x${item.x}y${item.y}`] = item;
-			});	
-			return items
-		},
 		items_placeholders() { // empty tiles
-			let placeholders = [];
-			let col_max = this.cols;
-			let rows_max = this.rows;
-
-			// occupied hashmap to keep track of the occupied cells
-			let occupied = {};
-
-			for (let y = 0; y < rows_max; y++) {
-				for (let x = 0; x < col_max; x++) {
-					// skip current position if it was registered as occupied
-					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
-						continue;
+			return this.grid.getFreeSlots().map((item, index) => {
+				return {
+					x: item.x,
+					y: item.y,
+					h: 1,
+					w: 1,
+					placeholder: true,
+					data: {
+						id: 'placeholder_' + index
 					}
-					let current_item = this.items_hashmap[`x${x}y${y}`];
-					if (current_item) {
-						//calculate the occupied cells from the width and the height from the items 
-						let width = current_item.w;
-						let height = current_item.h;
-						let max_x = x + width - 1;
-						let max_y = y + height - 1;
-						if(x != max_x || y != max_y){
-							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
-								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
-									if (occupied_x != x || occupied_y != y) {
-										occupied[`x${occupied_x}y${occupied_y}`]=true;
-									}
-								}
-							}
-						}
-					}
-					else {
-						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true, 
-							data: { id: 'placeholder_' + String(placeholders.length).padStart(4, "0") } });
-					}
-				}
-			}
-			return placeholders;
+				};
+			});
 		},
 		indexedItems() { // indexed
 			return this.items.map(

From 8ab83eaf41368f77603bbe68165044518aeaf994 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 11:16:22 +0200
Subject: [PATCH 083/189] don't use place in gridlogic -> the current values
 should be in the root of the object

---
 public/js/components/Drop/Grid.js  |  8 +++++---
 public/js/composables/GridLogic.js | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 40a1b1407..7fb6cd9ca 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -131,6 +131,7 @@ export default {
 						y: item.y,
 						w: item.w,
 						h: item.h,
+						pinned: item.pinned,
 						weight: item.weight || 0,
 						data: item
 					}
@@ -150,7 +151,8 @@ export default {
 					x: this.correctedPositionUpdates[item.index].x === undefined ? item.x : this.correctedPositionUpdates[item.index].x,
 					y: this.correctedPositionUpdates[item.index].y === undefined ? item.y : this.correctedPositionUpdates[item.index].y,
 					w: this.correctedPositionUpdates[item.index].w === undefined ? item.w : this.correctedPositionUpdates[item.index].w,
-					h: this.correctedPositionUpdates[item.index].h === undefined ? item.h : this.correctedPositionUpdates[item.index].h
+					h: this.correctedPositionUpdates[item.index].h === undefined ? item.h : this.correctedPositionUpdates[item.index].h,
+					pinned: item.pinned
 				};
 			});
 		},
@@ -169,8 +171,8 @@ export default {
 					x: this.tempPositionUpdates[item.index].x === undefined ? item.x : this.tempPositionUpdates[item.index].x,
 					y: this.tempPositionUpdates[item.index].y === undefined ? item.y : this.tempPositionUpdates[item.index].y,
 					w: this.tempPositionUpdates[item.index].w === undefined ? item.w : this.tempPositionUpdates[item.index].w,
-					h: this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h
-					
+					h: this.tempPositionUpdates[item.index].h === undefined ? item.h : this.tempPositionUpdates[item.index].h,
+					pinned: item.pinned
 				};
 			});
 		},
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index b901d115d..a42c853a1 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -84,7 +84,7 @@ class GridLogic {
 		}
 	}
 	move(item, x, y) {
-		if (item.data.place[this.w]?.pinned)
+		if (item.pinned)
 			return [];
 		if (item.x == x && item.y == y)
 			return [];
@@ -195,13 +195,13 @@ class GridLogic {
 		let targetframe;
 		switch(dir) {
 			case DIR_UP:
-				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].y - amount < 0)
+				if (this.data[index].pinned || this.data[index].y - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-this.w*amount);
 				move.y = -amount;
 				break;
 			case DIR_DOWN:
-				if (this.data[index].data?.place[this.w]?.pinned)
+				if (this.data[index].pinned)
 					return false;
 				if (this.data[index].y + this.data[index].h + amount > this.h)
 					cost += .4;
@@ -209,13 +209,13 @@ class GridLogic {
 				move.y = amount;
 				break;
 			case DIR_LEFT:
-				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x - amount < 0)
+				if (this.data[index].pinned || this.data[index].x - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-amount);
 				move.x = -amount;
 				break;
 			case DIR_RIGHT:
-				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x + this.data[index].w + amount > this.w)
+				if (this.data[index].pinned || this.data[index].x + this.data[index].w + amount > this.w)
 					return false;
 				targetframe = this.data[index].frame.map(i => i+amount);
 				move.x = amount;

From 2a86a70386febfed0f0786b8d7f7ec43e60cf6e8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 11:24:03 +0200
Subject: [PATCH 084/189] gridlogic: save width & height on move action similar
 to resize action (see: 88c4a04aea3cd187ffd23a6c134b19147181b300)

---
 public/js/composables/GridLogic.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index a42c853a1..effd7509f 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -140,7 +140,7 @@ class GridLogic {
 		
 		const updates = this.add(currItem, prefer);
 		if (updates)
-			updates[item.index] = {index: item.index, x, y};
+			updates[item.index] = { index: item.index, x, y, w: item.w, h: item.h };
 		
 		return updates;
 	}
@@ -156,7 +156,7 @@ class GridLogic {
 		
 		const updates = this.add(currItem);
 		if(updates)
-			updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
+			updates[item.index] = { index: item.index, w, h, x: item.x, y: item.y, resize:true };
 
 		return updates;
 	}

From 4b064f566acc36ac722b3f44d27319f364ee873a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 11:53:23 +0200
Subject: [PATCH 085/189] get information if resize would be successful from
 tempPositionUpdates instead of gridlogic

---
 public/js/components/Drop/Grid.js  | 3 +--
 public/js/composables/GridLogic.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 7fb6cd9ca..3e214de53 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -164,7 +164,6 @@ export default {
 					return item;
 
 				return {
-					resize: this.tempPositionUpdates[item.index]?.resize,
 					index: item.index,
 					weight: item.weight,
 					data: item.data,
@@ -195,7 +194,7 @@ export default {
 					modifiedDraggedItem.classes.push('drop-grid-item-resize');
 					if (this.draggedItem.oversized)
 						modifiedDraggedItem.classes.push('drop-grid-item-oversized')
-					else if (this.placedItems[draggedItemIndex].resize)
+					else if (this.tempPositionUpdates?.length)
 						modifiedDraggedItem.classes.push('drop-grid-item-sizechanged')
 				}
 
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index effd7509f..10d34189e 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -156,7 +156,7 @@ class GridLogic {
 		
 		const updates = this.add(currItem);
 		if(updates)
-			updates[item.index] = { index: item.index, w, h, x: item.x, y: item.y, resize:true };
+			updates[item.index] = { index: item.index, w, h, x: item.x, y: item.y };
 
 		return updates;
 	}

From 2aecc6e0f2448cd0a212c3c72fa47cbbbb2f9de2 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 16 Apr 2026 15:49:16 +0200
Subject: [PATCH 086/189] removed use of viewData object as passed by
 controller thru routerview to component -- component fetches data instead

---
 application/controllers/Cis/Abgabetool.php    |  31 +-
 application/controllers/Cis/LvPlan.php        |   8 +-
 application/controllers/Cis/MyLv.php          |   7 +-
 application/controllers/Cis/MyLvPlan.php      |  10 +-
 application/controllers/Cis/OtherLvPlan.php   |   7 +-
 application/controllers/Cis/Profil.php        |  52 +--
 application/controllers/Cis/Raumsuche.php     |   7 +-
 application/controllers/Cis/StgOrgLvPlan.php  |   8 +-
 application/controllers/Cis/Studium.php       |   5 +-
 application/controllers/Cis4.php              |  12 +-
 .../api/frontend/v1/Cis4FhcApi.php            |  13 +-
 .../controllers/api/frontend/v1/LvPlan.php    |   1 +
 .../api/frontend/v1/OtherLvPlan.php           |  30 +-
 .../controllers/api/frontend/v1/Profil.php    | 121 ++++--
 .../api/frontend/v1/StgOrgLvPlan.php          |  64 +++
 .../views/CisRouterView/CisRouterView.php     |   4 +-
 public/js/api/factory/lvPlan.js               |   6 +
 public/js/api/factory/otherLvPlan.js          |   4 +-
 public/js/api/factory/profil.js               |   2 +-
 public/js/api/factory/stgOrgLvPlan.js         |  25 ++
 public/js/apps/Dashboard/Fhc.js               |   2 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |   8 -
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  10 -
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  37 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   8 -
 public/js/components/Cis/LvPlan/LvPlan.js     |  11 +-
 .../Cis/LvPlan/{Personal.js => MyLvPlan.js}   |  31 +-
 .../js/components/Cis/LvPlan/OtherLvPlan.js   | 380 +++++++++---------
 public/js/components/Cis/LvPlan/StgOrg.js     | 105 ++---
 .../Cis/Profil/MitarbeiterProfil.js           |   6 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       | 167 ++++----
 public/js/components/Cis/Profil/Profil.js     |  37 +-
 .../js/components/Cis/Profil/StudentProfil.js |   6 +-
 .../Cis/Profil/StudentViewProfil.js           |  66 ++-
 .../js/components/Cis/Raumsuche/Raumsuche.js  |   3 -
 public/js/components/Dashboard/Dashboard.js   |  24 +-
 36 files changed, 680 insertions(+), 638 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/StgOrgLvPlan.php
 create mode 100644 public/js/api/factory/stgOrgLvPlan.js
 rename public/js/components/Cis/LvPlan/{Personal.js => MyLvPlan.js} (87%)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 04338b1a9..28414dafa 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -31,12 +31,8 @@ class Abgabetool extends Auth_Controller
 	{
 		// TODO: routing from index based on berechtigung?
 
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
 		}
@@ -44,12 +40,8 @@ class Abgabetool extends Auth_Controller
 
 	public function Student($student_uid_prop = '')
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-		
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
 		}
@@ -57,12 +49,8 @@ class Abgabetool extends Auth_Controller
 
 	public function Mitarbeiter()
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
 		}
@@ -70,13 +58,8 @@ class Abgabetool extends Auth_Controller
 
 	public function Assistenz($stg_kz_prop = '')
 	{
-		
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
@@ -84,12 +67,8 @@ class Abgabetool extends Auth_Controller
 	
 	public function Deadlines()
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
 		}
diff --git a/application/controllers/Cis/LvPlan.php b/application/controllers/Cis/LvPlan.php
index 884c8a9a0..32e622f5a 100644
--- a/application/controllers/Cis/LvPlan.php
+++ b/application/controllers/Cis/LvPlan.php
@@ -28,12 +28,6 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'LvPlan']);
 	}
 }
diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index 819d56b05..0f24d3a80 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -26,11 +26,6 @@ class MyLv extends Auth_Controller
 	 */
 	public function index()
 	{
-		
-		$viewData = array(
-
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLv']);
 	}
 }
diff --git a/application/controllers/Cis/MyLvPlan.php b/application/controllers/Cis/MyLvPlan.php
index 366ce8e65..a7f21aa20 100644
--- a/application/controllers/Cis/MyLvPlan.php
+++ b/application/controllers/Cis/MyLvPlan.php
@@ -27,13 +27,7 @@ class MyLvPlan extends Auth_Controller
 	 * @return void
 	 */
 	public function index()
-	{
-		
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
+	{		
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLvPlan']);
 	}
 }
diff --git a/application/controllers/Cis/OtherLvPlan.php b/application/controllers/Cis/OtherLvPlan.php
index c657ec3d2..e62644dd1 100644
--- a/application/controllers/Cis/OtherLvPlan.php
+++ b/application/controllers/Cis/OtherLvPlan.php
@@ -29,11 +29,6 @@ class OtherLvPlan extends Auth_Controller
      */
     public function index()
     {
-
-        $viewData = array(
-            'timezone' => $this->config->item('timezone')
-        );
-
-        $this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OtherLvPlan']);
+        $this->load->view('CisRouterView/CisRouterView.php', ['route' => 'OtherLvPlan']);
     }
 }
diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 83b8f5493..dd7963228 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -55,16 +55,7 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-
-		$this->load->library('ProfilLib');
-		$profil_data = $this->profillib->getView(getAuthUID());
-		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
-		$viewData = array(
-			'editable' => true,
-			'profil_data' => $profil_data,
-			'calendarSyncUrls' => $this->getCalendarSyncUrlData(),
-		);
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'profilIndex']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
 	}
 
 	/**
@@ -74,20 +65,7 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$this->load->library('ProfilLib');
-		$profil_data = $this->profillib->getView($uid);
-		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
-		$viewData = array(
-			'uid' => $uid,
-			'profil_data' => $profil_data,
-			'permissions' => [
-				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan')),
-			]
-		);
-		if ($uid == getAuthUID()) {
-			$viewData['editable'] = true;
-		}
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'profilViewUid']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
 	}
 
 	/**
@@ -754,30 +732,4 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
-
-	/**
-	 * gets the identifier, phrase, and url for each calendar sync option
-	 * @access private
-	 * @return array array of arrays, where each child array is a sync option
-	 */
-	private function getCalendarSyncUrlData()
-	{
-		return [
-			[
-				"identifier" => "cal_dav",
-				"labelPhrase" => "profil/calendar_sync_cal_dav",
-				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
-			],
-			[
-				"identifier" => "cal_dav_principal",
-				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
-				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
-			],
-			[
-				"identifier" => "i_cal",
-				"labelPhrase" => "profil/calendar_sync_i_cal",
-				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
-			],
-		];
-	}
 }
diff --git a/application/controllers/Cis/Raumsuche.php b/application/controllers/Cis/Raumsuche.php
index 055038275..f48beb0f3 100644
--- a/application/controllers/Cis/Raumsuche.php
+++ b/application/controllers/Cis/Raumsuche.php
@@ -25,11 +25,6 @@ class Raumsuche extends Auth_Controller
 	 */
 	public function index()
 	{
-
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Raumsuche']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Raumsuche']);
 	}
 }
diff --git a/application/controllers/Cis/StgOrgLvPlan.php b/application/controllers/Cis/StgOrgLvPlan.php
index 834d49d55..bf329fcb8 100644
--- a/application/controllers/Cis/StgOrgLvPlan.php
+++ b/application/controllers/Cis/StgOrgLvPlan.php
@@ -28,12 +28,6 @@ class StgOrgLvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'StgOrgLvPlan']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'StgOrgLvPlan']);
 	}
 }
diff --git a/application/controllers/Cis/Studium.php b/application/controllers/Cis/Studium.php
index a298de648..20f323dff 100644
--- a/application/controllers/Cis/Studium.php
+++ b/application/controllers/Cis/Studium.php
@@ -29,10 +29,7 @@ class Studium extends Auth_Controller
 	 */
 	public function index()
 	{
-		$viewData = array(
-
-		);
-		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'studium']);
 	}
 
 
diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 11c723226..48fd6c240 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -31,16 +31,6 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('person/Person_model', 'PersonModel');
-		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
-
-		$viewData = array(
-			'uid' => getAuthUID(),
-			'name' => $personData->vorname,
-			'person_id' => $personData->person_id,
-			'timezone' => $this->config->item('timezone'),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'FhcDashboard']);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/Cis4FhcApi.php b/application/controllers/api/frontend/v1/Cis4FhcApi.php
index 372e4bfaa..b8698e3e8 100644
--- a/application/controllers/api/frontend/v1/Cis4FhcApi.php
+++ b/application/controllers/api/frontend/v1/Cis4FhcApi.php
@@ -36,17 +36,22 @@ class Cis4FhcApi extends FHCAPI_Controller
 	// Public methods
 
 	/**
-	 * fetches ViewData
-	 */
-	public function getViewData()
+     * retrieves view data for dashboard view
+     * @access public
+     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
+     */
+	public function dashboardViewData()
 	{
 		$this->load->model('person/Person_model','PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
 
+		$this->load->config('calendar');
+
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone'),
 		);
 
 		$this->terminateWithSuccess($viewData);
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 99dc8bf59..606874ffe 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -33,6 +33,7 @@ class LvPlan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
+			'myLvPlanViewData' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
 			'Stunden' => self::PERM_LOGGED,
 			'getReservierungen' => self::PERM_LOGGED,
diff --git a/application/controllers/api/frontend/v1/OtherLvPlan.php b/application/controllers/api/frontend/v1/OtherLvPlan.php
index a144fb549..cad654f12 100644
--- a/application/controllers/api/frontend/v1/OtherLvPlan.php
+++ b/application/controllers/api/frontend/v1/OtherLvPlan.php
@@ -28,12 +28,9 @@ class OtherLvPlan extends FHCAPI_Controller
     public function __construct()
     {
         parent::__construct([
-            'getBasicUserAttributesForLvPlanDisplay' => self::PERM_LOGGED,
+            'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
         ]);
 
-        $this->load->library('PermissionLib');
-        $this->load->library('form_validation');
-
         $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
         $this->load->model('person/Benutzer_model', 'BenutzerModel');
 
@@ -43,12 +40,11 @@ class OtherLvPlan extends FHCAPI_Controller
     // Public methods
 
     /**
-     * retrieves basic user attributes necessary for LV Plan display
+     * retrieves viewData for other lv plan view
      * @access public
-     * @param  $uid the userID for which basic attributes are retrieved
-     * @return stdClass consisting of basic user attributes 
+     * @param  $uid the userID for which the other lv plan is being viewed
      */
-    public function getBasicUserAttributesForLvPlanDisplay($uid)
+    public function otherLvPlanViewData($uid)
     {
         $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
         $isMitarbeiter = getData($isMitarbeiterResult);
@@ -59,16 +55,18 @@ class OtherLvPlan extends FHCAPI_Controller
         $personResult = $this->BenutzerModel->load([$uid]);
         $person = hasData($personResult) ? getData($personResult) : null;
 
-        $result = [
-            "username" => $uid,
-            "is_student" => $isStudent,
-            "is_mitarbeiter" => $isMitarbeiter,
-            "foto" => $person[0]->foto,
-            "vorname" => $person[0]->vorname,
-            "nachname" => $person[0]->nachname,
+        $viewData = [
+            "user_data" => [
+                "username" => $uid,
+                "is_student" => $isStudent,
+                "is_mitarbeiter" => $isMitarbeiter,
+                "foto" => $person[0]->foto,
+                "vorname" => $person[0]->vorname,
+                "nachname" => $person[0]->nachname,
+            ],
         ];
 
-        $this->terminateWithSuccess($result);
+        $this->terminateWithSuccess($viewData);
     }
 
     // -----------------------------------------------------------------------------------------------------------------
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 3133b107a..96cdea855 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 class Profil extends FHCAPI_Controller
 {
@@ -27,13 +28,13 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-            'fotoSperre' => self::PERM_LOGGED,
+			'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
 			'profilViewData' => self::PERM_LOGGED,
 		]);
-		
+
 		$this->load->library('PermissionLib');
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -48,28 +49,37 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-	public function profilViewData($uid=null){
+
+	/**
+     * retrieves view data for profile view
+     * @access public
+     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
+     */
+	public function profilViewData($uid = null)
+	{
+		$authUid = getAuthUID();
+		$isProfilOfAuthUser = !$uid || $uid === $authUid;
+
 		$this->load->library('ProfilLib');
-		$editable = false;
-		if(isset($uid) && $uid != null){
-			$profil_data = $this->profillib->getView($uid);
-			if($uid == getAuthUID()){
-				$editable = true;
-			}
-		}else{
-			$editable = true;
-			$profil_data = $this->profillib->getView(getAuthUID());
+		$profileData = $this->profillib->getView($uid ?? $authUid);
+		$profileData = hasData($profileData) ? getData($profileData) : null;
+
+		$viewData = [
+			'editable' => $isProfilOfAuthUser,
+			'profil_data' => $profileData,
+			'permissions' => [
+				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan'))
+			]
+		];
+
+		if ($isProfilOfAuthUser) {
+			$viewData['calendar_sync_urls'] = $this->getCalendarSyncUrlData();
 		}
-		
-		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
-		$viewData = array(
-			'editable'=>$editable,
-			'profil_data' => $profil_data,
-		);
+
 		$this->terminateWithSuccess($viewData);
 	}
 
-    /**
+	/**
 	 * update column foto_sperre in public.tbl_person
 	 * @access public
 	 * @param  boolean $value  new value for the column
@@ -77,9 +87,9 @@ class Profil extends FHCAPI_Controller
 	 */
 	public function fotoSperre($value)
 	{
-        if(!isset($value)){
-            $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
-        }
+		if (!isset($value)) {
+			$this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+		}
 
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
@@ -87,10 +97,10 @@ class Profil extends FHCAPI_Controller
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-		
-        $res = $this->getDataOrTerminateWithError($res);
-		
-        $this->terminateWithSuccess(current($res));
+
+		$res = $this->getDataOrTerminateWithError($res);
+
+		$this->terminateWithSuccess(current($res));
 	}
 
 	/**
@@ -109,7 +119,7 @@ class Profil extends FHCAPI_Controller
 		if (isError($nation_res)) {
 			$this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
 		}
-		
+
 		$nation_res = $this->getDataOrTerminateWithError($nation_res);
 
 		$this->terminateWithSuccess($nation_res);
@@ -117,30 +127,30 @@ class Profil extends FHCAPI_Controller
 
 	public function getGemeinden($nation, $zip)
 	{
-		if(!isset($nation) || !isset($zip)){
+		if (!isset($nation) || !isset($zip)) {
 			echo json_encode(error("Missing parameters"));
 			return;
 		}
-		
+
 		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
-		
+
 
 		$gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
-		
+
 		if (isError($gemeinde_res)) {
-			$this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($gemeinde_res), self::ERROR_TYPE_GENERAL);
 		}
 		$gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
-		
+
 		/* $gemeinde_res = array_map(function ($obj) {
 			return $obj->ortschaftsname;
 		}, $gemeinde_res); */
 
-		$this->terminateWithSuccess($gemeinde_res);	
-		
+		$this->terminateWithSuccess($gemeinde_res);
+
 	}
 
-    
+
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -150,23 +160,48 @@ class Profil extends FHCAPI_Controller
 	public function isMitarbeiter($uid)
 	{
 
-		if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
-		
-		
+		if (!$uid)
+			$this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+
+
 		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-		
+
 		if (isError($result)) {
 			$this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
 		}
 
 		$result = $this->getDataOrTerminateWithError($result);
-		
+
 		$this->terminateWithSuccess($result);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	
+	/**
+	 * gets the identifier, phrase, and url for each calendar sync option
+	 * @access private
+	 * @return array array of arrays, where each child array is a sync option
+	 */
+	private function getCalendarSyncUrlData()
+	{
+		return [
+			[
+				"identifier" => "cal_dav",
+				"labelPhrase" => "profil/calendar_sync_cal_dav",
+				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
+			],
+			[
+				"identifier" => "cal_dav_principal",
+				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
+				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
+			],
+			[
+				"identifier" => "i_cal",
+				"labelPhrase" => "profil/calendar_sync_i_cal",
+				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
+			],
+		];
+	}
 }
 
diff --git a/application/controllers/api/frontend/v1/StgOrgLvPlan.php b/application/controllers/api/frontend/v1/StgOrgLvPlan.php
new file mode 100644
index 000000000..ffbf85e57
--- /dev/null
+++ b/application/controllers/api/frontend/v1/StgOrgLvPlan.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class StgOrgLvPlan extends FHCAPI_Controller
+{
+
+    /**
+     * Object initialization
+     */
+    public function __construct()
+    {
+        parent::__construct([
+			'stgOrgLvPlanViewData' => self::PERM_LOGGED,
+        ]);
+
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Public methods
+
+    /**
+	 * fetches view data for stg org lv plan
+	 * @access public
+	 */
+	public function stgOrgLvPlanViewData()
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+		$result = $this->StudiengangModel->loadWhere([
+			'aktiv' => true
+		]);
+		$studiengaenge = $this->getDataOrTerminateWithError($result);
+
+		$viewData = array(
+			'studiengaenge' => $studiengaenge,
+		);
+
+        $this->terminateWithSuccess($viewData);
+	}
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+}
+
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 6ff428362..12e748a6c 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -47,8 +47,6 @@ $includesArray = array(
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 <div id="fhccontent" class="h-100" route=<?php echo $route ?>>
-	<router-view 
-			:view-data='<?php echo json_encode($viewData) ?>'
-	></router-view>
+	<router-view></router-view>
 </div>
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 41aa29299..e6285ec9a 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -16,6 +16,12 @@
  */
 
 export default {
+	getMyLvPlanViewData() {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/LvPlan/myLvPlanViewData`,
+		};
+	},
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'post',
diff --git a/public/js/api/factory/otherLvPlan.js b/public/js/api/factory/otherLvPlan.js
index 698531ea3..21a115496 100644
--- a/public/js/api/factory/otherLvPlan.js
+++ b/public/js/api/factory/otherLvPlan.js
@@ -16,10 +16,10 @@
  */
 
 export default {
-	getBasicUserAttributesForLvPlanDisplay(uid) {
+	getOtherLvPlanViewData(uid) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/OtherLvPlan/getBasicUserAttributesForLvPlanDisplay/${uid}`,
+			url: `/api/frontend/v1/OtherLvPlan/otherLvPlanViewData/${uid}`,
 		};
 	},
 };
\ No newline at end of file
diff --git a/public/js/api/factory/profil.js b/public/js/api/factory/profil.js
index 1d884c714..6959b4345 100644
--- a/public/js/api/factory/profil.js
+++ b/public/js/api/factory/profil.js
@@ -17,7 +17,7 @@
 
 export default {
 	
-	profilViewData(uid) {
+	getProfilViewData(uid = null) {
 		let url = "/api/frontend/v1/Profil/profilViewData";
 		if(uid){
 			url += `/${uid}`;
diff --git a/public/js/api/factory/stgOrgLvPlan.js b/public/js/api/factory/stgOrgLvPlan.js
new file mode 100644
index 000000000..bac753f6b
--- /dev/null
+++ b/public/js/api/factory/stgOrgLvPlan.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getStgOrgLvPlanViewData(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/StgOrgLvPlan/stgOrgLvPlanViewData`,
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b2b7752df..551a259b4 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -4,7 +4,7 @@ import Theme from '../../plugins/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
+import MyLvPlan from "../../components/Cis/LvPlan/MyLvPlan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index bb5c6a710..0d6ec1ab0 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -42,14 +42,6 @@ export const AbgabetoolAssistenz = {
 		stg_kz_prop: {
 			default: null
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
-			}
-		}
 	},
 	data() {
 		return {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 6791d31aa..0acb46bb6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -31,16 +31,6 @@ export const AbgabetoolMitarbeiter = {
 			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
 		}
 	},
-	props: {
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
-			}
-		}
-	},
 	data() {
 		return {
 			tableData: null,
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e8401d309..24b2f7619 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -3,6 +3,7 @@ import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass} from "./getDateStyleClass.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
@@ -24,14 +25,6 @@ export const AbgabetoolStudent = {
 		student_uid_prop: {
 			default: null
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({uid: ''}),
-			validator(value) {
-				return value && value.uid
-			}
-		}
 	},
 	data() {
 		return {
@@ -44,9 +37,18 @@ export const AbgabetoolStudent = {
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null,
-			moodle_link: null
+			moodle_link: null,
+			uid: null,
 		};
 	},
+	computed: {
+		isViewMode() {
+			return this.student_uid !== this.uid
+		},
+		student_uid() {
+			return this.student_uid_prop || this.uid || null
+		}
+	},
 	methods: {
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
@@ -258,18 +260,11 @@ export const AbgabetoolStudent = {
 		},
 		handleDownloadBeurteilung2(projektarbeit) {
 			window.open(projektarbeit.beurteilung2)
-		}
-	},
-	watch: {
-
-	},
-	computed: {
-		isViewMode() {
-			return this.student_uid !== this.viewData.uid
 		},
-		student_uid() {
-			return this.student_uid_prop || this.viewData?.uid || null
-		}
+		async fetchAuthUID() {
+			const authIdResponse = await this.$api.call(ApiAuthinfo.getAuthUID());
+			this.uid = authIdResponse.data.uid;
+		},
 	},
 	async created() {
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
@@ -302,6 +297,8 @@ export const AbgabetoolStudent = {
 		}).catch(e => {
 			this.loading = false
 		})
+
+		await this.fetchAuthUID();
 	},
 	mounted() {
 		this.setupMounted()
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 6d0ddd02d..5f6d1e159 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -10,14 +10,6 @@ export const DeadlineOverview = {
 		person_uid_prop: {
 			default: null	
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.name && value.uid
-			}
-		}
 	},
 	data() {
 		return {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index f7763c54b..bbc12a47f 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -11,22 +11,21 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			lv: null
+			lv: null,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 		};
 	},
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
@@ -35,7 +34,7 @@ export default {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -115,7 +114,7 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
-			:timezone="viewData.timezone"
+			:timezone="timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/MyLvPlan.js
similarity index 87%
rename from public/js/components/Cis/LvPlan/Personal.js
rename to public/js/components/Cis/LvPlan/MyLvPlan.js
index f6fd462da..f5070499e 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/MyLvPlan.js
@@ -11,7 +11,6 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
 	data() {
@@ -21,13 +20,14 @@ export default {
 			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
-			isStudent: false
+			isStudent: false,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 		};
 	},
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -47,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -102,16 +102,18 @@ export default {
 				this.$api.call(ApiLvPlan.eventsPersonal(start.toISODate(), end.toISODate())),
 				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		}
+		},
+		async fetchAuthInfo() {
+			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+			
+			const authInfo = authInfoResponse.data;
+			this.uid = authInfo.uid;
+			this.isMitarbeiter = authInfo.isMitarbeiter;
+			this.isStudent = authInfo.isStudent;
+		},
 	},
-	created() {
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
+	async created() {
+		await this.fetchAuthInfo();
 	},
 	template: /*html*/`
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
@@ -123,8 +125,9 @@ export default {
 		</h2>
 		<hr>
 		<fhc-calendar
+			v-if="timezone"
 			ref="calendar"
-			:timezone="viewData.timezone"
+			:timezone="timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"
diff --git a/public/js/components/Cis/LvPlan/OtherLvPlan.js b/public/js/components/Cis/LvPlan/OtherLvPlan.js
index f4948ca50..156ded7f6 100644
--- a/public/js/components/Cis/LvPlan/OtherLvPlan.js
+++ b/public/js/components/Cis/LvPlan/OtherLvPlan.js
@@ -9,196 +9,209 @@ import ApiAuthinfo from "../../../api/factory/authinfo.js";
 export const DEFAULT_MODE_LVPLAN = "Week";
 
 export default {
-  name: "OtherLvPlan",
-  components: {
-    FormForm,
-    FormInput,
-    FhcCalendar,
-  },
-  props: {
-    viewData: Object,
-    propsViewData: Object,
-  },
-  data() {
-    return {
-      localProps: {},
-      studiensemester_kurzbz: null,
-      studiensemester_start: null,
-      studiensemester_ende: null,
-      isOtherPersonMitarbeiter: false,
-      isOtherPersonStudent: false,
-      currentStgBezeichnung: null,
-      listVerband: [],
-      listGroup: [],
-      rangeIntervalFirst: null,
-      otherPersonData: {
-        fullName: "",
-        photo: "",
-      },
-    };
-  },
-  computed: {
-    currentDay() {
-      if (
-        !this.propsViewData?.focus_date ||
-        isNaN(new Date(this.propsViewData?.focus_date))
-      )
-        return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-      return this.propsViewData?.focus_date;
-    },
-    currentMode() {
-      if (
-        !this.propsViewData?.mode ||
-        !["day", "week", "month"].includes(
-          this.propsViewData?.mode.toLowerCase(),
-        )
-      )
-        return DEFAULT_MODE_LVPLAN;
-      return this.propsViewData?.mode;
-    },
-    downloadLinks() {
-      if (
-        !this.studiensemester_start ||
-        !this.studiensemester_ende ||
-        !this.propsViewData.otherUid
-      )
-        return false;
+	name: "OtherLvPlan",
+	components: {
+		FormForm,
+		FormInput,
+		FhcCalendar,
+	},
+	props: {
+		propsViewData: Object,
+	},
+	data() {
+		return {
+			localProps: {},
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			isOtherPersonMitarbeiter: false,
+			isOtherPersonStudent: false,
+			currentStgBezeichnung: null,
+			listVerband: [],
+			listGroup: [],
+			rangeIntervalFirst: null,
+			otherPersonData: {
+				fullName: "",
+				photo: "",
+			},
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+		};
+	},
+	computed: {
+		currentDay() {
+			if (
+				!this.propsViewData?.focus_date ||
+				isNaN(new Date(this.propsViewData?.focus_date))
+			)
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (
+				!this.propsViewData?.mode ||
+				!["day", "week", "month"].includes(
+					this.propsViewData?.mode.toLowerCase(),
+				)
+			)
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (
+				!this.studiensemester_start ||
+				!this.studiensemester_ende ||
+				!this.propsViewData.otherUid
+			)
+				return false;
 
-      const type = this.isOtherPersonStudent
-        ? "student"
-        : this.isOtherPersonMitarbeiter
-          ? "lektor"
-          : null;
+			const type = this.isOtherPersonStudent
+				? "student"
+				: this.isOtherPersonMitarbeiter
+					? "lektor"
+					: null;
 
-      if (!type) return;
+			if (!type) return;
 
-      const opts = { zone: this.viewData.timezone };
-      const start = luxon.DateTime.fromISO(
-        this.studiensemester_start,
-        opts,
-      ).toUnixInteger();
-      const ende = luxon.DateTime.fromISO(
-        this.studiensemester_ende,
-        opts,
-      ).toUnixInteger();
+			const opts = { zone: this.timezone };
+			const start = luxon.DateTime.fromISO(
+				this.studiensemester_start,
+				opts,
+			).toUnixInteger();
+			const ende = luxon.DateTime.fromISO(
+				this.studiensemester_ende,
+				opts,
+			).toUnixInteger();
 
-      const download_link =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        "cis/private/lvplan/stpl_kalender.php" +
-        "?type=" +
-        type +
-        "&pers_uid=" +
-        this.propsViewData.otherUid +
-        "&begin=" +
-        start +
-        "&ende=" +
-        ende;
+			const download_link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cis/private/lvplan/stpl_kalender.php" +
+				"?type=" +
+				type +
+				"&pers_uid=" +
+				this.propsViewData.otherUid +
+				"&begin=" +
+				start +
+				"&ende=" +
+				ende;
 
-      return [
-        {
-          title: "excel",
-          icon: "fa-solid fa-file-excel",
-          link: download_link + "&format=excel",
-        },
-        {
-          title: "csv",
-          icon: "fa-solid fa-file-csv",
-          link: download_link + "&format=csv",
-        },
-        {
-          title: "ical1",
-          icon: "fa-regular fa-calendar",
-          link: download_link + "&format=ical&version=1&target=ical",
-        },
-        {
-          title: "ical2",
-          icon: "fa-regular fa-calendar",
-          link: download_link + "&format=ical&version=2&target=ical",
-        },
-      ];
-    },
-    get_image_base64_src: function () {
-      if (!this.otherPersonData.photo?.length) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.otherPersonData.photo;
-    },
-  },
-  watch: {
-    "propsViewData.otherUid": {
-      handler() {
-        this.$router.go();
-      },
-    },
-  },
-  methods: {
-    handleChangeDate(day, newMode) {
-      return this.handleChangeMode(newMode, day);
-    },
-    handleChangeMode(newMode, day) {
-      const mode = newMode[0].toUpperCase() + newMode.slice(1);
-      const focus_date = day.toISODate();
+			return [
+				{
+					title: "excel",
+					icon: "fa-solid fa-file-excel",
+					link: download_link + "&format=excel",
+				},
+				{
+					title: "csv",
+					icon: "fa-solid fa-file-csv",
+					link: download_link + "&format=csv",
+				},
+				{
+					title: "ical1",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=1&target=ical",
+				},
+				{
+					title: "ical2",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=2&target=ical",
+				},
+			];
+		},
+		get_image_base64_src: function () {
+			if (!this.otherPersonData.photo?.length) {
+				return "";
+			}
+			return "data:image/jpeg;base64," + this.otherPersonData.photo;
+		},
+	},
+	watch: {
+		"propsViewData.otherUid": {
+			handler() {
+				this.$router.go();
+			},
+		},
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
+			const focus_date = day.toISODate();
 
-      this.$router.push({
-        name: "OtherLvPlan",
-        params: {
-          mode,
-          focus_date,
-        },
-      });
-    },
-    updateRange(rangeInterval) {
-      this.$api
-        .call(
-          ApiLvPlan.studiensemesterDateInterval(
-            rangeInterval.end.startOf("week").toISODate(),
-          ),
-        )
-        .then((res) => {
-          this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
-          this.studiensemester_start = res.data.start;
-          this.studiensemester_ende = res.data.ende;
-        });
-    },
-    getPromiseFunc(start, end) {
-      return [
-        this.$api.call(
-          ApiLvPlan.eventsPersonal(
-            start.toISODate(),
-            end.toISODate(),
-            this.propsViewData.otherUid,
-          ),
-        ),
-        this.$api.call(
-          ApiLvPlan.getLvPlanReservierungen(
-            start.toISODate(),
-            end.toISODate(),
-            this.propsViewData.otherUid,
-          ),
-        ),
-      ];
-    },
-  },
-  async created() {
-    const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
-    const authId = authInfoResponse.data.uid;
-    if (authId === this.propsViewData.otherUid) {
-      this.$router.push({ name: "MyLvPlan" });
-    }
+			this.$router.push({
+				name: "OtherLvPlan",
+				params: {
+					mode,
+					focus_date,
+				},
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(
+					ApiLvPlan.studiensemesterDateInterval(
+						rangeInterval.end.startOf("week").toISODate(),
+					),
+				)
+				.then((res) => {
+					this.studiensemester_kurzbz =
+						res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(
+					ApiLvPlan.eventsPersonal(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+				this.$api.call(
+					ApiLvPlan.getLvPlanReservierungen(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+			];
+		},
+		async fetchViewData() {
+			const viewDataResponse = await this.$api.call(
+				ApiOtherLvPlan.getOtherLvPlanViewData(
+					this.propsViewData.otherUid,
+				),
+			);
 
-    const userDataResponse = await this.$api.call(
-      ApiOtherLvPlan.getBasicUserAttributesForLvPlanDisplay(
-        this.propsViewData.otherUid,
-      ),
-    );
+			const viewData = viewDataResponse.data;
 
-    const userData = userDataResponse.data;
-    this.isOtherPersonMitarbeiter = !!userData.is_mitarbeiter;
-    this.isOtherPersonStudent = !!userData.is_student;
-    this.otherPersonData.fullName = userData.vorname + " " + userData.nachname;
-    this.otherPersonData.photo = userData.foto;
-  },
-  template: `
+			this.isOtherPersonMitarbeiter =
+				!!viewData?.user_data?.is_mitarbeiter;
+			this.isOtherPersonStudent = !!viewData?.user_data?.is_student;
+			this.otherPersonData.fullName =
+				viewData?.user_data?.vorname +
+				" " +
+				viewData?.user_data?.nachname;
+			this.otherPersonData.photo = viewData?.user_data?.foto;
+		},
+		async redirectToMyLvPlanIfAuthUid() {
+			const authInfoResponse = await this.$api.call(
+				ApiAuthinfo.getAuthInfo(),
+			);
+			const authId = authInfoResponse.data.uid;
+			if (authId === this.propsViewData.otherUid) {
+				this.$router.push({ name: "MyLvPlan" });
+			}
+		},
+	},
+	async created() {
+		await this.redirectToMyLvPlanIfAuthUid();
+		await this.fetchViewData();
+	},
+	template: `
     <div class="d-flex flex-column h-100">
         <h2>
             <div class="d-flex flex-row justify-content-between align-items-center">
@@ -215,8 +228,9 @@ export default {
 		</h2>
 		<hr>
         <fhc-calendar
+			v-if="timezone"
             ref="calendar"
-            :timezone="viewData.timezone"
+            :timezone="timezone"
             :get-promise-func="getPromiseFunc"
             :date="currentDay"
             :mode="currentMode"
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index f6bc51c12..03cfe1c34 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -3,6 +3,7 @@ import FormInput from '../../Form/Input.js';
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiStgOrgLvPlan from '../.././../api/factory/stgOrgLvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
 export const DEFAULT_MODE_LVPLAN = 'Week';
@@ -15,7 +16,6 @@ export default {
 		FhcCalendar,
 	},
 	props: {
-		viewData: Object,
 		propsViewData: Object
 	},
 	data() {
@@ -38,7 +38,8 @@ export default {
 			listSem: [1,2,3,4,5,6,7,8,9,10],
 			listVerband: [],
 			listGroup: [],
-			rangeIntervalFirst: null
+			rangeIntervalFirst: null,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 		};
 	},
 	computed: {
@@ -50,7 +51,7 @@ export default {
 		},
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -70,7 +71,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -139,7 +140,7 @@ export default {
 				params,
 			});
 
-			this.$refs['calendar'].resetEventLoader();
+			this.$refs['calendar']?.resetEventLoader();
 		},
 		loadListSem(){
 			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
@@ -208,24 +209,26 @@ export default {
 				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
 			];
 		},
+		async fetchAuthInfo() {
+			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+
+			const authInfo = authInfoResponse.data;
+			this.uid = authInfo.uid;
+			this.isMitarbeiter = authInfo.isMitarbeiter;
+			this.isStudent = authInfo.isStudent;
+		},
+		async fetchViewData() {
+			const viewDataResponse = await this.$api.call(ApiStgOrgLvPlan.getStgOrgLvPlanViewData());
+
+			const viewData = viewDataResponse.data;
+			this.listStg = viewData.studiengaenge;
+		},
 	},
-	created(){
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
+	async created(){
+		await this.fetchAuthInfo();
+    	await this.fetchViewData();
 
-		this.$api
-			.call(ApiLvPlan.getStudiengaenge())
-			.then(result => {
-				this. listStg = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		if(this.propsViewData) {
+		if (this.propsViewData) {
 			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
 			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
 			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
@@ -298,37 +301,39 @@ export default {
 	 		</form-form>
 	 	</div>
 
-		<fhc-calendar
-			v-show="propsViewData && propsViewData.stgkz"
-			ref="calendar"
-			v-model:lv="formData"
-			:timezone="viewData.timezone"
-			:get-promise-func="getPromiseFunc"
-			:date="currentDay"
-			:mode="currentMode"
-			@update:date="handleChangeDate"
-			@update:mode="handleChangeMode"
-			@update:range="updateRange"
-			class="responsive-calendar"
-		>
-			<div
-				v-if="downloadLinks"
-				class="d-flex gap-1 justify-items-start"
+		<template v-if="timezone">
+			<fhc-calendar
+				v-if="propsViewData && propsViewData.stgkz"
+				ref="calendar"
+				v-model:lv="formData"
+				:timezone="timezone"
+				:get-promise-func="getPromiseFunc"
+				:date="currentDay"
+				:mode="currentMode"
+				@update:date="handleChangeDate"
+				@update:mode="handleChangeMode"
+				@update:range="updateRange"
+				class="responsive-calendar"
+			>
+				<div
+					v-if="downloadLinks"
+					class="d-flex gap-1 justify-items-start"
 				>
-				<div v-for="{ title, icon, link } in downloadLinks">
-					<a
-						:href="link"
-						:aria-label="title"
-						class="py-1 btn btn-outline-secondary"
-					>
-						<div class="d-flex flex-column">
-							<i aria-hidden="true" :class="icon"></i>
-							<span style="font-size:.5rem">{{ title }}</span>
-						</div>
-					</a>
+					<div v-for="{ title, icon, link } in downloadLinks">
+						<a
+							:href="link"
+							:aria-label="title"
+							class="py-1 btn btn-outline-secondary"
+						>
+							<div class="d-flex flex-column">
+								<i aria-hidden="true" :class="icon"></i>
+								<span style="font-size:.5rem">{{ title }}</span>
+							</div>
+						</a>
+					</div>
 				</div>
-			</div>
-		</fhc-calendar>
+			</fhc-calendar>
+		</template>
 	</div>
 	`,
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 44e0ca6eb..fd3c1b072 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -105,7 +105,6 @@ export default {
 					},
 				],
 			},
-			quickLinks: [],
 			betriebsmittel_table_options: {
 				persistenceID: "filterTableMaProfilBetriebsmittel",
 				persistence: {
@@ -299,6 +298,11 @@ export default {
 				}
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			//
+			return quickLinks;
+		},
 	},
 
 	created() {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 42a2700f3..459ad6d29 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -1,11 +1,11 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
-import { dateFilter } from '../../../tabulator/filters/Dates.js';
+import { dateFilter } from "../../../tabulator/filters/Dates.js";
 
 export default {
 	components: {
@@ -20,11 +20,11 @@ export default {
 	data() {
 		return {
 			collapseIconFunktionen: true,
-			preloadedPhrasen:{},
+			preloadedPhrasen: {},
 			funktionen_table_options: {
 				persistenceID: "filterTableMaViewProfilFunktionen",
 				persistence: {
-					columns: false
+					columns: false,
 				},
 				minHeight: 300,
 				layout: "fitColumns",
@@ -35,62 +35,68 @@ export default {
 					//? option when wanting to hide the collapsed list
 
 					{
-						title:
-							"<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+						title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
 						field: "collapse",
 						headerSort: false,
 						headerFilter: false,
 						formatter: "responsiveCollapse",
 						maxWidth: 40,
 						headerClick: this.collapseFunction,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+						title: Vue.computed(() => this.$p.t("ui/bezeichnung")),
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+						title: Vue.computed(() =>
+							this.$p.t("lehre/organisationseinheit"),
+						),
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+						title: Vue.computed(() =>
+							this.$p.t("global/gueltigVon"),
+						),
 						field: "Gültig_von",
-						headerFilterFunc: 'dates',
+						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
 						visible: true,
-						formatter:"datetime",
-						formatterParams: this.datetimeFormatterParams()
+						formatter: "datetime",
+						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+						title: Vue.computed(() =>
+							this.$p.t("global/gueltigBis"),
+						),
 						field: "Gültig_bis",
-						headerFilterFunc: 'dates',
+						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
 						visible: true,
-						formatter:"datetime",
-						formatterParams: this.datetimeFormatterParams()
+						formatter: "datetime",
+						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+						title: Vue.computed(() =>
+							this.$p.t("profil/wochenstunden"),
+						),
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 				],
 			},
-			quickLinks: [],
 		};
 	},
 
@@ -100,42 +106,51 @@ export default {
 		funktionenTableBuilt: function () {
 			this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
 		},
-		datetimeFormatterParams: function() {
+		datetimeFormatterParams: function () {
 			const params = {
-				inputFormat:"yyyy-MM-dd",
-				outputFormat:"dd.MM.yyyy",
-				invalidPlaceholder:"(invalid date)",
-				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+				inputFormat: "yyyy-MM-dd",
+				outputFormat: "dd.MM.yyyy",
+				invalidPlaceholder: "(invalid date)",
+				timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 			};
 			return params;
-		}
+		},
 	},
 	watch: {
-		'data.funktionen'(newVal) {
-			if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
+		"data.funktionen"(newVal) {
+			if (this.$refs.funktionenTable)
+				this.$refs.funktionenTable.tabulator.setData(newVal);
+		},
+		"language.value"(newVal) {
+			// reevaluates computed phrasen
+			if (this.$refs.funktionenTable)
+				this.$refs.funktionenTable.tabulator.setColumns(
+					this.funktionen_table_options.columns,
+				);
 		},
-		'language.value'(newVal) {  // reevaluates computed phrasen
-			if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
-		}
 	},
 	computed: {
 		getTelefonValue() {
-			if(this.data.standort_telefon?.kontakt) {
-				return this.data.standort_telefon.kontakt + " " + this.data.telefonklappe
-			} else if(this.data.standort_telefon) {
-				return this.data.standort_telefon + " " + this.data.telefonklappe
+			if (this.data.standort_telefon?.kontakt) {
+				return (
+					this.data.standort_telefon.kontakt +
+					" " +
+					this.data.telefonklappe
+				);
+			} else if (this.data.standort_telefon) {
+				return (
+					this.data.standort_telefon + " " + this.data.telefonklappe
+				);
 			} else {
-				return this.data.telefonklappe
+				return this.data.telefonklappe;
 			}
 		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? null;
 		},
-
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
 		},
-
 		profilInformation() {
 			if (!this.data) {
 				return {};
@@ -152,59 +167,69 @@ export default {
 				foto: this.data.foto,
 			};
 		},
-
 		roleInformation() {
 			if (!this.data) {
 				return {};
 			}
 			return {
 				geburtsdatum: {
-					label: `${this.$p.t('profil','Geburtsdatum')}`,
-					value: this.data.gebdatum
+					label: `${this.$p.t("profil", "Geburtsdatum")}`,
+					value: this.data.gebdatum,
 				},
 				geburtsort: {
-					label: `${this.$p.t('profil','Geburtsort')}`,
-					value: this.data.gebort
+					label: `${this.$p.t("profil", "Geburtsort")}`,
+					value: this.data.gebort,
 				},
 				personenkennzeichen: {
-					label: `${this.$p.t('profil','Kurzzeichen')}`,
-					value: this.data.kurzbz
+					label: `${this.$p.t("profil", "Kurzzeichen")}`,
+					value: this.data.kurzbz,
 				},
 				telefon: {
-					label: `${this.$p.t('profil','Telefon')}`,
-					value: this.getTelefonValue
+					label: `${this.$p.t("profil", "Telefon")}`,
+					value: this.getTelefonValue,
 				},
 				office: {
-					label: `${this.$p.t('profil','Büro')}`,
-					value: this.data.ort_kurzbz
-				}
+					label: `${this.$p.t("profil", "Büro")}`,
+					value: this.data.ort_kurzbz,
+				},
 			};
 		},
-	},
-	created(){
-		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
-			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
-			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
-			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
-			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
-			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
-			this.preloadedPhrasen.loaded = true;
-		});
-
-		if (this.$props.permissions["basis/other_lv_plan"]) {
-			this.quickLinks.push(
-				{
+		quickLinks() {
+			let quickLinks = [];
+			if (
+				this.$props.permissions &&
+				this.$props.permissions["basis/other_lv_plan"]
+			) {
+				quickLinks.push({
 					icon: "fa-calendar-days",
 					phrase: "lehre/stundenplan",
 					action: () => {
 						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
+							name: "OtherLvPlan",
+							params: { otherUid: this.$props.data.username },
+						});
 					},
-				}
+				});
+			}
+			return quickLinks;
+		},
+	},
+	created() {
+		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
+			this.preloadedPhrasen.bezeichnungPhrase =
+				this.$p.t("ui/bezeichnung");
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t(
+				"lehre/organisationseinheit",
 			);
-		}
+			this.preloadedPhrasen.gueltigVonPhrase =
+				this.$p.t("global/gueltigVon");
+			this.preloadedPhrasen.gueltigBisPhrase =
+				this.$p.t("global/gueltigBis");
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t(
+				"profil/wochenstunden",
+			);
+			this.preloadedPhrasen.loaded = true;
+		});
 	},
 
 	template: /*html*/ `
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index b5f3fd552..c965652a1 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -48,9 +48,6 @@ export const Profil = {
 			type: String,
 			required: false,
 		},
-		viewData: {
-			type: Object,
-		},
 	},
 	data() {
 		return {
@@ -62,7 +59,9 @@ export const Profil = {
 			data: null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
 			notFoundUID: null,
-			isEditable: this.viewData.editable ?? false,
+			isEditable: false,
+			authPermissions: null,
+			calendarSyncUrls: [],
 		};
 	},
 	provide() {
@@ -143,6 +142,8 @@ export const Profil = {
 	},
 	methods: {
 		async load() {
+			await this.fetchViewData();
+
 			// fetch profilUpdateStates to provide them to children components
 			await this.$api
 				.call(ApiProfilUpdate.getStatus())
@@ -161,18 +162,20 @@ export const Profil = {
 				.catch((error) => {
 					console.error(error);
 				});
+		},
+		async fetchViewData() {
+			let viewDataResult = await this.$api.call(
+				ApiProfil.getProfilViewData(this.$route.params.uid ?? null),
+			);
 
-			this.$api
-				.call(ApiProfil.profilViewData(this.$route.params.uid ?? null))
-				.then((response) => response.data)
-				.then((data) => {
-					this.view = data?.profil_data.view;
-					this.data = data?.profil_data.data;
-					this.isEditable = data?.editable ?? false;
-				})
-				.catch((error) => {
-					console.error(error);
-				});
+			const data = viewDataResult.data;
+			if (!data) return;
+
+			this.view = data.profil_data.view;
+			this.isEditable = data.profil_data.editable;
+			this.data = data.profil_data.data;
+			this.calendarSyncUrls = data.calendar_sync_urls ?? [];
+			this.authPermissions = data.permissions;
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -408,8 +411,8 @@ export const Profil = {
 				:is="view"
 				:data="data"
 				:editData="filteredEditData"
-				:permissions="$props.viewData.permissions"
-				:calendarSyncUrls="$props.viewData.calendarSyncUrls"></component>
+				:permissions="authPermissions"
+				:calendarSyncUrls="calendarSyncUrls"></component>
 		</div>
 	</div>`,
 };
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index e3e90d3bf..57f933305 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -97,7 +97,6 @@ export default {
 					},
 				],
 			},
-			quickLinks: [],
 		};
 	},
 
@@ -244,6 +243,11 @@ export default {
 				}
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			//
+			return quickLinks;
+		},
 	},
 	created() {
 		// preload phrasen
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 3bc4dabd7..0f7a196f4 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -14,14 +14,14 @@ export default {
 	},
 	props: ["data", "permissions"],
 	data() {
-		return {
-			quickLinks: [],
-		};
+		return {};
 	},
 	provide() {
 		return {
-			studiengang_kz: Vue.computed({ get: () => this.data.studiengang_kz }),
-		}
+			studiengang_kz: Vue.computed({
+				get: () => this.data.studiengang_kz,
+			}),
+		};
 	},
 	computed: {
 		fotoStatus() {
@@ -43,65 +43,61 @@ export default {
 				foto: this.data.foto,
 			};
 		},
-
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
 		},
-
 		roleInformation() {
 			if (!this.data) {
 				return {};
 			}
 
-
 			return {
 				geburtsdatum: {
-					label: `${this.$p.t('profil','Geburtsdatum')}`,
-					value: this.data.gebdatum
+					label: `${this.$p.t("profil", "Geburtsdatum")}`,
+					value: this.data.gebdatum,
 				},
 				geburtsort: {
-					label: `${this.$p.t('profil','Geburtsort')}`,
-					value: this.data.gebort
+					label: `${this.$p.t("profil", "Geburtsort")}`,
+					value: this.data.gebort,
 				},
 				personenkennzeichen: {
-					label: `${this.$p.t('person','personenkennzeichen')}`,
-					value: this.data.personenkennzeichen
+					label: `${this.$p.t("person", "personenkennzeichen")}`,
+					value: this.data.personenkennzeichen,
 				},
 				studiengang: {
-					label: `${this.$p.t('lehre','studiengang')}`,
-					value: this.data.studiengang
+					label: `${this.$p.t("lehre", "studiengang")}`,
+					value: this.data.studiengang,
 				},
 				semester: {
-					label: `${this.$p.t('lehre','semester')}`,
-					value: this.data.semester
+					label: `${this.$p.t("lehre", "semester")}`,
+					value: this.data.semester,
 				},
 				verband: {
-					label: `${this.$p.t('lehre','lehrverband')}`,
-					value: this.data.verband
+					label: `${this.$p.t("lehre", "lehrverband")}`,
+					value: this.data.verband,
 				},
 				gruppe: {
-					label: `${this.$p.t('lehre','gruppe')}`,
-					value: this.data.gruppe.trim()
-				}
+					label: `${this.$p.t("lehre", "gruppe")}`,
+					value: this.data.gruppe.trim(),
+				},
 			};
 		},
-	},
-	methods: {},
-	created() {
-		if (this.$props.permissions["basis/other_lv_plan"]) {
-			this.quickLinks.push(
-				{
+		quickLinks() {
+			let quickLinks = [];
+			if (this.$props.permissions && this.$props.permissions["basis/other_lv_plan"]) {
+				quickLinks.push({
 					icon: "fa-calendar-days",
 					phrase: "lehre/stundenplan",
 					action: () => {
 						this.$router.push({
-      					  	name: "OtherLvPlan",
-      					  	params: { otherUid: this.$props.data.username },
-      					})
+							name: "OtherLvPlan",
+							params: { otherUid: this.$props.data.username },
+						});
 					},
-				}
-			);
-		}
+				});
+			}
+			return quickLinks;
+		},
 	},
 	template: /*html*/ ` 
 
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 365da4911..5cdc164c0 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -3,9 +3,6 @@ import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiOrt from '../../../api/factory/ort.js'
 export const Raumsuche =  {
 	name: "Raumsuche",
-	props: {
-		
-	},
 	components: {
 		VueDatePicker,
 		CoreFilterCmpt,
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e92e34f29..526bc45c7 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -2,6 +2,7 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
+import ApiDashboard from '../../api/factory/cis/dashboard.js';
 import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
 import ApiDashboardUser from '../../api/factory/dashboard/user.js';
 
@@ -17,27 +18,22 @@ export default {
 			required: true,
 			default: 'CIS'
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			validator(value) {
-				return value && value.name && value.timezone
-			}
-		}
 	},
 	data() {
 		return {
 			widgets: [],
 			originalWidgets: {},
 			widgetsSetup: null,
-			editMode: false
+			editMode: false,
+			timezone: null,
+			userFirstName: null,
 		}
 	},
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
 			widgetsSetup: Vue.computed(() => this.widgetsSetup),
-			timezone: Vue.computed(() => this.viewData.timezone)
+			timezone: this.timezone
 		}
 	},
 	methods: {
@@ -120,11 +116,19 @@ export default {
 					this.widgets = this.widgets.filter(widget => widget.id != id);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		async fetchViewData() {
+			let viewDataResult = await this.$api.call(ApiDashboard.getViewData());
+			const viewData = viewDataResult.data;
+			this.timezone = viewData?.timezone;
+			this.userFirstName = viewData?.name;
 		}
 	},
 	created() {
 		this.$p.loadCategory('dashboard');
 
+		this.fetchViewData();
+
 		this.$api
 			.call(ApiDashboardWidget.listAllowed(this.dashboard))
 			.then(res => {
@@ -158,7 +162,7 @@ export default {
 	template: `
 	<div class="core-dashboard">
 		<h3>
-			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
+			{{ userFirstName ? $p.t('global/personalGreeting', [ userFirstName ]) : '' }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>

From 5b5f6ac0b9158905c4d1d9933d7ae83ec264e33d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 15:49:35 +0200
Subject: [PATCH 087/189] missed one line in
 8ab83eaf41368f77603bbe68165044518aeaf994

---
 public/js/composables/GridLogic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 10d34189e..781e94613 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -113,7 +113,7 @@ class GridLogic {
 		let occupiers = this.getItemsInFrame(currItem.frame);
 		
 		// does not update if the target conatins pinned widgets
-		if (occupiers.some(frame => this.data[frame]?.data.place[this.w]?.pinned)) {
+		if (occupiers.some(frame => this.data[frame]?.pinned)) {
 			return [];
 		}
 		

From d577ac6d542f2dce00059d6683fa1a756af91e3c Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 16 Apr 2026 15:54:12 +0200
Subject: [PATCH 088/189] naming cleanup

---
 application/controllers/api/frontend/v1/Cis4FhcApi.php | 2 +-
 application/controllers/api/frontend/v1/LvPlan.php     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Cis4FhcApi.php b/application/controllers/api/frontend/v1/Cis4FhcApi.php
index b8698e3e8..4d0f906f0 100644
--- a/application/controllers/api/frontend/v1/Cis4FhcApi.php
+++ b/application/controllers/api/frontend/v1/Cis4FhcApi.php
@@ -27,7 +27,7 @@ class Cis4FhcApi extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getViewData' => self::PERM_LOGGED,
+			'dashboardViewData' => self::PERM_LOGGED,
 		]);
 		
 	}
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 606874ffe..99dc8bf59 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -33,7 +33,6 @@ class LvPlan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
-			'myLvPlanViewData' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
 			'Stunden' => self::PERM_LOGGED,
 			'getReservierungen' => self::PERM_LOGGED,

From 917a9ee7078d853aa9bcdf6928a5b2b6335773cc Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 16 Apr 2026 15:55:43 +0200
Subject: [PATCH 089/189] minor fix

---
 public/js/api/factory/cis/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/api/factory/cis/dashboard.js b/public/js/api/factory/cis/dashboard.js
index cb1ec16bb..694340b97 100644
--- a/public/js/api/factory/cis/dashboard.js
+++ b/public/js/api/factory/cis/dashboard.js
@@ -19,7 +19,7 @@ export default {
 	getViewData() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Cis4FhcApi/getViewData'
+			url: '/api/frontend/v1/Cis4FhcApi/dashboardViewData'
 		};
 	}
 };
\ No newline at end of file

From 992cb6b3108d67715fe3eaa3afbcd855e8092190 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Apr 2026 16:00:01 +0200
Subject: [PATCH 090/189] !some(!true) is the same as every(true) and we don't
 need to check for the originalFrame since only the moving item was in there
 and no other item hence no occupier

---
 public/js/composables/GridLogic.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 781e94613..d3d9b6ade 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -120,7 +120,8 @@ class GridLogic {
 		// checks if target contains widget with the same high and width
 		let occupiersData = occupiers.map(occupier => this.data[occupier]);
 		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
-		if (!occupiersFrame.some(frame => !currItem.frame.includes(frame)) && !occupiersFrame.some(frame => originalFrame.includes(frame))){
+		if (occupiersFrame.every(frame => currItem.frame.includes(frame))) {
+			// every slot of all items in the target zone is inside said zone
 			let replaceUpdate = [];
 			let newOccupierFrames = [];
 			for(let f of originalFrame){

From 98bdb8c526f02515b5a753e46bc4a9bb5b31729b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 09:57:24 +0200
Subject: [PATCH 091/189] bugfix: if the moving object is bigger than 1x1 and
 its target location touches the original location swapping could locate the
 occupier inside the overlapping slot making the occupier overlap the moving
 object

---
 public/js/composables/GridLogic.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index d3d9b6ade..ae2043698 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -116,7 +116,12 @@ class GridLogic {
 		if (occupiers.some(frame => this.data[frame]?.pinned)) {
 			return [];
 		}
-		
+
+		// checks if target contains moving widgets start position
+		// so swapping should be avoided
+		const targetAndItemOverlap = this.getItemFrame(item).some(frame => currItem.frame.includes(frame))
+		if (!targetAndItemOverlap) {
+
 		// checks if target contains widget with the same high and width
 		let occupiersData = occupiers.map(occupier => this.data[occupier]);
 		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
@@ -137,6 +142,7 @@ class GridLogic {
 			replaceUpdate[item.index] = { index: item.index, x, y };
 			
 			return replaceUpdate;
+			}
 		}
 		
 		const updates = this.add(currItem, prefer);

From ab699aafdc1924df649e3b41d6c1c48728d75126 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 09:59:38 +0200
Subject: [PATCH 092/189] using variables for better readability

---
 public/js/composables/GridLogic.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index ae2043698..773f766a2 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -122,10 +122,13 @@ class GridLogic {
 		const targetAndItemOverlap = this.getItemFrame(item).some(frame => currItem.frame.includes(frame))
 		if (!targetAndItemOverlap) {
 
-		// checks if target contains widget with the same high and width
 		let occupiersData = occupiers.map(occupier => this.data[occupier]);
-		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
-		if (occupiersFrame.every(frame => currItem.frame.includes(frame))) {
+			// checks if target contains widget with the same high and width
+			// so swapping is possible
+			const occupiersFrame = occupiers.map(occupier => this.data[occupier].frame).flat();
+			const occupiersInsideMovingItem = occupiersFrame.every(frame => currItem.frame.includes(frame));
+
+			if (occupiersInsideMovingItem) {
 			// every slot of all items in the target zone is inside said zone
 			let replaceUpdate = [];
 			let newOccupierFrames = [];

From 3b3e75003f063d4ae5acd2a4b22d2efdd9b66884 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 10:01:13 +0200
Subject: [PATCH 093/189] indentation

---
 public/js/composables/GridLogic.js | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 773f766a2..1a540ea06 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -122,29 +122,29 @@ class GridLogic {
 		const targetAndItemOverlap = this.getItemFrame(item).some(frame => currItem.frame.includes(frame))
 		if (!targetAndItemOverlap) {
 
-		let occupiersData = occupiers.map(occupier => this.data[occupier]);
+			let occupiersData = occupiers.map(occupier => this.data[occupier]);
 			// checks if target contains widget with the same high and width
 			// so swapping is possible
 			const occupiersFrame = occupiers.map(occupier => this.data[occupier].frame).flat();
 			const occupiersInsideMovingItem = occupiersFrame.every(frame => currItem.frame.includes(frame));
 
 			if (occupiersInsideMovingItem) {
-			// every slot of all items in the target zone is inside said zone
-			let replaceUpdate = [];
-			let newOccupierFrames = [];
-			for(let f of originalFrame){
-				if(newOccupierFrames.includes(f)){
-					continue;
+				// every slot of all items in the target zone is inside said zone
+				let replaceUpdate = [];
+				let newOccupierFrames = [];
+				for(let f of originalFrame){
+					if(newOccupierFrames.includes(f)){
+						continue;
+					}
+					let occ = occupiersData.shift();
+					if(occ){
+						newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
+						replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
+					}
 				}
-				let occ = occupiersData.shift();
-				if(occ){
-					newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
-					replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
-				}
-			}
-			replaceUpdate[item.index] = { index: item.index, x, y };
-			
-			return replaceUpdate;
+				replaceUpdate[item.index] = { index: item.index, x, y };
+				
+				return replaceUpdate;
 			}
 		}
 		

From aac26f672025b75fb5d0a152e2a32994c7252db5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 10:02:34 +0200
Subject: [PATCH 094/189] replace with faster logic

---
 public/js/composables/GridLogic.js | 45 +++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 1a540ea06..21c2936c0 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -104,8 +104,6 @@ class GridLogic {
 				prefer = DIR_RIGHT;
 		}
 
-		const originalFrame = Array.isArray(item.frame) ? [...item.frame] : [item.frame];
-
 		const currItem = {...item};
 		currItem.x = x;
 		currItem.y = y;
@@ -122,7 +120,6 @@ class GridLogic {
 		const targetAndItemOverlap = this.getItemFrame(item).some(frame => currItem.frame.includes(frame))
 		if (!targetAndItemOverlap) {
 
-			let occupiersData = occupiers.map(occupier => this.data[occupier]);
 			// checks if target contains widget with the same high and width
 			// so swapping is possible
 			const occupiersFrame = occupiers.map(occupier => this.data[occupier].frame).flat();
@@ -130,19 +127,35 @@ class GridLogic {
 
 			if (occupiersInsideMovingItem) {
 				// every slot of all items in the target zone is inside said zone
-				let replaceUpdate = [];
-				let newOccupierFrames = [];
-				for(let f of originalFrame){
-					if(newOccupierFrames.includes(f)){
-						continue;
-					}
-					let occ = occupiersData.shift();
-					if(occ){
-						newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
-						replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
-					}
-				}
-				replaceUpdate[item.index] = { index: item.index, x, y };
+				const replaceUpdate = [];
+			
+				const diffX = item.x - x;
+				const diffY = item.y - y;
+
+				occupiers.forEach(occupier => {
+					const data = { ...this.data[occupier] };
+					data.x += diffX;
+					data.y += diffY;
+					data.frame = this.getItemFrame(data);
+					this.remove(data);
+					this.add(data);
+					replaceUpdate[occupier] = {
+						index: data.index,
+						x: data.x,
+						y: data.y,
+						w: data.w,
+						h: data.h
+					};
+				});
+
+				this.add({ ...item, x, y });
+				replaceUpdate[item.index] = {
+					index: item.index,
+					x,
+					y,
+					w: item.w,
+					h: item.h
+				};
 				
 				return replaceUpdate;
 			}

From 4e88765a835b89b69a8085736e1ce666071fd2fd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 10:19:27 +0200
Subject: [PATCH 095/189] remove unused function

---
 public/js/composables/GridLogic.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 21c2936c0..7f1a860e9 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -275,9 +275,6 @@ class GridLogic {
 				frame.push(i + item.x + (j + item.y) * this.w);
 		return frame;
 	}
-	getSingleFramePosition(frame){
-		return { x: frame % this.w, y: Math.floor(frame / this.w)};
-	}
 	debug() {
 		return this.grid;
 	}

From 97baaf679723f5f44abad6214226e670fbc4f3da Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 10:21:54 +0200
Subject: [PATCH 096/189] rename items_placeholders => placeholders

---
 public/js/components/Drop/Grid.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 3e214de53..538418cc3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -108,7 +108,7 @@ export default {
 			}));
 		},
 		// item pipeline
-		items_placeholders() { // empty tiles
+		placeholders() { // empty tiles
 			return this.grid.getFreeSlots().map((item, index) => {
 				return {
 					x: item.x,
@@ -177,7 +177,7 @@ export default {
 		},
 		currentItems() { // final items with classes
 			if (this.mode == MODE_IDLE && this.active)
-				return [ ...this.placedItems, ...this.items_placeholders ];
+				return [ ...this.placedItems, ...this.placeholders ];
 
 			if (this.mode != MODE_IDLE && this.draggedItem) {
 				// add classes to dragged item

From 6787b9b553970253709587a72a8307c8e89ac03e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 10:46:00 +0200
Subject: [PATCH 097/189] correct pinned widget detection => before it only
 accounted for 1x1 widgets

---
 public/js/components/Drop/Grid.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 538418cc3..32918572f 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -527,22 +527,26 @@ export default {
 		},
 		checkPinnedWidgetAnimation() {
 			let itemAtPosition = [];
+			const itemCoord = {};
 			switch (this.mode) {
 				case MODE_RESIZE:
-					for (let x = this.draggedItem.x; x <= this.x; x++) {
-						for (let y = this.draggedItem.y; y <= this.y; y++) {
-							this.items.forEach(item => {
-								if (item.x == x && item.y == y) {
-									itemAtPosition.push(item);
-								}
-							});
-						}
-					}
+					itemCoord.x = this.draggedItem.x;
+					itemCoord.y = this.draggedItem.y;
+					itemCoord.w = this.x - this.draggedItem.x + 1;
+					itemCoord.h = this.y - this.draggedItem.y + 1;
 					break;
 				case MODE_MOVE:
-					itemAtPosition = this.items.filter(item=>item.x == this.x && item.y == this.y);
+					itemCoord.x = this.x;
+					itemCoord.y = this.y;
+					itemCoord.w = this.draggedItem.w;
+					itemCoord.h = this.draggedItem.h;
 					break;
 			}
+			const frame = this.grid.getItemFrame(itemCoord);
+			const itemsAtPosition = this.grid.getItemsInFrame(frame);
+			const blockersAtPosition = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
+
+			itemAtPosition = blockersAtPosition.map(index => this.indexedItems[index].data);
 			
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");

From 131edf12938868d83dcccde3d82939f46a39b623 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 11:41:31 +0200
Subject: [PATCH 098/189] move check into updateCursor block, it only needs to
 check if the hovered tile changes

---
 public/js/components/Drop/Grid.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 32918572f..cb622dcfc 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -414,8 +414,6 @@ export default {
 			if (!this.active)
 				return this.dragCancel();
 
-			this.checkPinnedWidgetAnimation();
-
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -457,6 +455,7 @@ export default {
 						break;
 					}
 				}
+				this.checkPinnedWidgetAnimation();
 			}
 		},
 		removeWidgetClones() {

From fef756f50848d6001aee22cf138da35a91a338b0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 11:44:25 +0200
Subject: [PATCH 099/189] change denied-dragging-animation to
 drop-grid-item-blocker and call it the vuejs way instead of vanilla js

---
 public/css/components/dashboard.css |  2 +-
 public/js/components/Drop/Grid.js   | 43 ++++++++++-------------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index b77d81f7d..700186235 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -174,7 +174,7 @@
 	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
-.denied-dragging-animation {
+.drop-grid-item-blocker [pinned='true'] {
 	animation: wiggle 0.5s linear;
 	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index cb622dcfc..c876d698a 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -198,7 +198,20 @@ export default {
 						modifiedDraggedItem.classes.push('drop-grid-item-sizechanged')
 				}
 
-				return this.placedItems.toSpliced(draggedItemIndex, 1, modifiedDraggedItem);
+				let currentItems = this.placedItems.toSpliced(draggedItemIndex, 1, modifiedDraggedItem);
+
+				if (!this.tempPositionUpdates?.length && this.draggedItem.blockers) {
+					this.draggedItem.blockers.forEach(index => {
+						const blockerIndex = this.placedItems.findIndex(item => item.index == index);
+						const modifiedBlocker = {
+							...this.placedItems[blockerIndex],
+							classes: ['drop-grid-item-blocker']
+						};
+						currentItems.splice(blockerIndex, 1, modifiedBlocker);
+					});
+				}
+
+				return currentItems;
 			}
 
 			return this.placedItems;
@@ -485,15 +498,6 @@ export default {
 			if (this.mode == MODE_IDLE) {
 				return;
 			}
-			// clean up unused classes
-			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
-			draggedItemNode.classList.remove("border-danger");
-			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
-				ele.classList.remove("denied-dragging-animation");
-			})
-			
-			//if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
-				//return this.dragCancel();
 
 			this.mode = MODE_IDLE;
 			let updated = [];
@@ -525,7 +529,6 @@ export default {
 			}
 		},
 		checkPinnedWidgetAnimation() {
-			let itemAtPosition = [];
 			const itemCoord = {};
 			switch (this.mode) {
 				case MODE_RESIZE:
@@ -543,23 +546,7 @@ export default {
 			}
 			const frame = this.grid.getItemFrame(itemCoord);
 			const itemsAtPosition = this.grid.getItemsInFrame(frame);
-			const blockersAtPosition = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
-
-			itemAtPosition = blockersAtPosition.map(index => this.indexedItems[index].data);
-			
-			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
-				ele.classList.remove("denied-dragging-animation");
-			});
-
-			itemAtPosition.forEach(item => {
-				if (item.place[this.cols] && item.place[this.cols].pinned) {
-					let pinnedWidget = document.getElementById(item.widgetid);
-					let pinNode = pinnedWidget.querySelector("[pinned='true']");
-					if (!pinNode.classList.contains("denied-dragging-animation")) {
-						pinNode.classList.add("denied-dragging-animation");
-					}
-				}	
-			});
+			this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
 		},
 		cropSizeToAllowed(type, w, h) {
 			if (w < 1)

From 3af93976895cffc5571afa30bb6287f571cfc8b2 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 12:08:03 +0200
Subject: [PATCH 100/189] move removeWidgetClones and this.mode=MODE_IDLE into
 _cleanupDragging function

---
 public/js/components/Drop/Grid.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index c876d698a..07ae8a1b3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -471,35 +471,30 @@ export default {
 				this.checkPinnedWidgetAnimation();
 			}
 		},
-		removeWidgetClones() {
-			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
-			for (let i = 0; i < widgetClones.length; i++) {
-				this.$refs.container.removeChild(widgetClones[i]);
-			}
-		},
 		_cleanupDragging() {
+			this.mode = MODE_IDLE;
 			if (this.draggedItem) {
 				const draggedItem = this.indexedItems.find(item => item.index == this.draggedItem.index);
 				delete draggedItem.classes;
 				this.draggedItem = null;
 			}
+			// removeWidgetClones
+			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
+			for (let i = 0; i < widgetClones.length; i++) {
+				this.$refs.container.removeChild(widgetClones[i]);
+			}
 		},
 		dragCancel() {
-			this.removeWidgetClones();
 			this.additionalRowComputed = false;
-			this.mode = MODE_IDLE;
 			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0];
 			this._cleanupDragging();
 		},
 		dragEnd() {
-			this.removeWidgetClones();
-			
 			if (this.mode == MODE_IDLE) {
 				return;
 			}
 
-			this.mode = MODE_IDLE;
 			let updated = [];
 			this.convertGridResultToUpdate(this.tempPositionUpdates, updated);
 			updated = this._updateCorrectedPositions(updated);

From 21fdf315180e36af5ec7e841a833c67eec6d359f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 12:10:37 +0200
Subject: [PATCH 101/189] move checkPinnedWidgetAnimation into dragOver
 function

---
 public/js/components/Drop/Grid.js | 42 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 07ae8a1b3..b11ffe2e0 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -459,8 +459,8 @@ export default {
 
 						[ w, h ] = this.cropSizeToAllowed(this.draggedItem.data.widget, w, h);
 
+						// check resize limits
 						this.draggedItem.oversized = (w !== targetW || h !== targetH);
-
 						if (this.draggedItem.oversized)
 							[ w, h ] = [ this.draggedItem.w, this.draggedItem.h ];
 
@@ -468,7 +468,25 @@ export default {
 						break;
 					}
 				}
-				this.checkPinnedWidgetAnimation();
+				// check for blocking pinned widgets
+				const itemCoord = {};
+				switch (this.mode) {
+					case MODE_RESIZE:
+						itemCoord.x = this.draggedItem.x;
+						itemCoord.y = this.draggedItem.y;
+						itemCoord.w = this.x - this.draggedItem.x + 1;
+						itemCoord.h = this.y - this.draggedItem.y + 1;
+						break;
+					case MODE_MOVE:
+						itemCoord.x = this.x;
+						itemCoord.y = this.y;
+						itemCoord.w = this.draggedItem.w;
+						itemCoord.h = this.draggedItem.h;
+						break;
+				}
+				const frame = this.grid.getItemFrame(itemCoord);
+				const itemsAtPosition = this.grid.getItemsInFrame(frame);
+				this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
 			}
 		},
 		_cleanupDragging() {
@@ -523,26 +541,6 @@ export default {
 				this.clonedWidget.style.left = `${constrainedLeft}px`;
 			}
 		},
-		checkPinnedWidgetAnimation() {
-			const itemCoord = {};
-			switch (this.mode) {
-				case MODE_RESIZE:
-					itemCoord.x = this.draggedItem.x;
-					itemCoord.y = this.draggedItem.y;
-					itemCoord.w = this.x - this.draggedItem.x + 1;
-					itemCoord.h = this.y - this.draggedItem.y + 1;
-					break;
-				case MODE_MOVE:
-					itemCoord.x = this.x;
-					itemCoord.y = this.y;
-					itemCoord.w = this.draggedItem.w;
-					itemCoord.h = this.draggedItem.h;
-					break;
-			}
-			const frame = this.grid.getItemFrame(itemCoord);
-			const itemsAtPosition = this.grid.getItemsInFrame(frame);
-			this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
-		},
 		cropSizeToAllowed(type, w, h) {
 			if (w < 1)
 				w = 1;

From 61a9feb8fddfa7e9a226dec0beda829d043e1a77 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 12:19:56 +0200
Subject: [PATCH 102/189] rearrange code and call preventDefault only if
 moving/resizing would be successful

---
 public/js/components/Drop/Grid.js | 42 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b11ffe2e0..33b06fed9 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -428,10 +428,11 @@ export default {
 				return this.dragCancel();
 
 			if (this.updateCursor(evt)) {
+				const targetCoordinates = {};
+				const dragGrid = new GridLogic(this.grid);
+
 				switch(this.mode) {
 					case MODE_MOVE: {
-						evt.preventDefault();
-						const dragGrid = new GridLogic(this.grid);
 						let x = this.x + this.draggedOffset[0];
 						let y = this.y + this.draggedOffset[1];
 						if (x < 0) {
@@ -446,12 +447,15 @@ export default {
 							y = 0;
 						}
 						
+						targetCoordinates.x = x;
+						targetCoordinates.y = y;
+						targetCoordinates.w = this.draggedItem.w;
+						targetCoordinates.h = this.draggedItem.h;
+
 						this.tempPositionUpdates = dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
 					case MODE_RESIZE: {
-						evt.preventDefault();
-						const dragGrid = new GridLogic(this.grid);
 						const targetW = this.x - this.draggedItem.x + 1;
 						const targetH = this.y - this.draggedItem.y + 1;
 						let w = Math.min(this.cols - this.draggedItem.x, targetW);
@@ -464,30 +468,24 @@ export default {
 						if (this.draggedItem.oversized)
 							[ w, h ] = [ this.draggedItem.w, this.draggedItem.h ];
 
+						targetCoordinates.x = this.draggedItem.x;
+						targetCoordinates.y = this.draggedItem.y;
+						targetCoordinates.w = w;
+						targetCoordinates.h = h;
+
 						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
 						break;
 					}
 				}
 				// check for blocking pinned widgets
-				const itemCoord = {};
-				switch (this.mode) {
-					case MODE_RESIZE:
-						itemCoord.x = this.draggedItem.x;
-						itemCoord.y = this.draggedItem.y;
-						itemCoord.w = this.x - this.draggedItem.x + 1;
-						itemCoord.h = this.y - this.draggedItem.y + 1;
-						break;
-					case MODE_MOVE:
-						itemCoord.x = this.x;
-						itemCoord.y = this.y;
-						itemCoord.w = this.draggedItem.w;
-						itemCoord.h = this.draggedItem.h;
-						break;
+				if (!this.tempPositionUpdates?.length) {
+					const frame = this.grid.getItemFrame(targetCoordinates);
+					const itemsAtPosition = this.grid.getItemsInFrame(frame);
+					this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
 				}
-				const frame = this.grid.getItemFrame(itemCoord);
-				const itemsAtPosition = this.grid.getItemsInFrame(frame);
-				this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
 			}
+			if (this.tempPositionUpdates?.length)
+				evt.preventDefault();
 		},
 		_cleanupDragging() {
 			this.mode = MODE_IDLE;
@@ -569,7 +567,7 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@dragover.prevent="dragOver"
+		@dragover="dragOver"
 		@drop="dragEnd"
 	>
 		<TransitionGroup>

From ff08ca140cacfb0dbb459e4ec50a6259aa427dfc Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 17 Apr 2026 12:22:12 +0200
Subject: [PATCH 103/189] remove unused variable

---
 public/js/components/Drop/Grid.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 33b06fed9..e4ffd5865 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -48,8 +48,7 @@ export default {
 			y: -1,
 			// mouse coordinates while dragging
 			clientX: 0,
-			clientY: 0,
-			reorderedItems: [] // holds items that have no inital place
+			clientY: 0
 		};
 	},
 	computed: {
@@ -289,7 +288,6 @@ export default {
 				
 				return a.weight > b.weight;
 			}); 
-			let reorderedItems = [];
 			sortedItems.forEach(item => {
 				let freeSlots = this.grid.getFreeSlots();
 				
@@ -302,7 +300,6 @@ export default {
 						item.x = firstFreeSlot.x;
 						item.y = firstFreeSlot.y;
 					}
-					reorderedItems.push(item);
 				}
 				if (item.x + item.w > this.cols) {
 					let targetW = this.cols-item.x,
@@ -326,7 +323,6 @@ export default {
 				item.frame = this.grid.getItemFrame(item);
 				this.convertGridResultToUpdate(this.grid.add(item), result, items);
 			});
-			this.reorderedItems = reorderedItems;
 			this.grid.clearWeights();
 			return result;
 		},

From 8f73489073db4d99c4c2e31b31d55cce91403753 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 14:51:20 +0200
Subject: [PATCH 104/189] code cleanup

---
 public/js/components/Dashboard/Dashboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 526bc45c7..d9684ea74 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -124,10 +124,10 @@ export default {
 			this.userFirstName = viewData?.name;
 		}
 	},
-	created() {
+	async created() {
 		this.$p.loadCategory('dashboard');
 
-		this.fetchViewData();
+		await this.fetchViewData();
 
 		this.$api
 			.call(ApiDashboardWidget.listAllowed(this.dashboard))

From 1d263033335bcbfbe31ded13c6518840e16aae51 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 15:59:32 +0200
Subject: [PATCH 105/189] fixed mobile header/searchbar appearance

---
 public/js/apps/Cis.js                       |  12 +
 public/js/apps/Dashboard/Fhc.js             |   8 -
 public/js/components/Cis/Menu.js            |  28 +-
 public/js/components/searchbar/searchbar.js | 540 +++++++++++---------
 4 files changed, 330 insertions(+), 258 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index c88a47a35..39fde01a2 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -136,6 +136,18 @@ const app = Vue.createApp({
             }
         };
     },
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		},
+	},
+	provide() {
+		return {
+			isMobile: this.isMobile
+		}
+	},
     methods: {
         searchfunction: function(searchsettings) {
         	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 140c76402..7b7d91fb7 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -233,18 +233,10 @@ const app = Vue.createApp({
 		renderers: null,
 	}),
 	components: {},
-	computed: {
-		isMobile() {
-			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
-			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
-			return smallScreen;// && touchCapable;
-		}	
-	},
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
-			isMobile: this.isMobile
 		}	
 	},
 	methods: {
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f073d5a38..f2f73de26 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -28,8 +28,10 @@ export default {
 			urlMatchRankings:[],
 			navUserDropdown:null,
 			menuOpen:true,
+			isSearchShownInMobileView: false,
         };
     },
+	inject: ["isMobile"],
 	provide(){
 		return{
 			setActiveEntry: this.setActiveEntry,
@@ -58,7 +60,10 @@ export default {
 		},
 		site_url(){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		}
+		},
+		areHeaderOptionsShown() {
+			return !this.isSearchShownInMobileView || !this.isMobile;
+		},
 	},
 	methods: {
 		fetchMenu() {
@@ -112,10 +117,21 @@ export default {
 		});
 	},
     template: /*html*/`
-	<button id="nav-main-btn" class="navbar-toggler rounded-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-	<fhc-searchbar ref="searchbar" id="nav-search" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+	<button v-if="areHeaderOptionsShown" id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+		<span class="navbar-toggler-icon"></span>
+   	</button>
+	<span v-if="isMobile && areHeaderOptionsShown" class="d-flex flex-row align-items-center px-2">
+		<theme-switch></theme-switch>
+	</span>
+	<fhc-searchbar
+		@isSearchShownInMobileViewUpdated="isSearchShownInMobileView = $event.isSearchShownInMobileView"
+		:searchoptions="searchbaroptions"
+		:searchfunction="searchfunction"
+		:class="{'px-2': isMobile}"
+		ref="searchbar"
+		id="nav-search"
+		class="fhc-searchbar w-100 py-1 py-lg-2"
+	></fhc-searchbar>
     <div id="nav-logo" class="d-none d-lg-block">
 		<div class="d-flex h-100 justify-content-between">
 			<a :href="rootUrl">
@@ -124,7 +140,7 @@ export default {
 			<theme-switch></theme-switch>
 		</div>
     </div>
-	<div id="nav-user">
+	<div v-if="areHeaderOptionsShown" id="nav-user">
 		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
 		</button>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index d6c93198e..498d4d964 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -21,69 +21,75 @@ export default {
 		dms,
 		cms,
 		mergedStudent,
-		mergedPerson
+		mergedPerson,
 	},
-    props: {
-    	searchoptions: {
-    		type: Object,
-    		required: true
-    	},
-    	searchfunction: {
-    		type: Function,
-    		required: true
-    	},
-    	showBtnSubmit: Boolean
-    },
-    provide() {
-        return {
-            query: Vue.computed(() => this.lastQuery)
-        };
-    },
-    data: function() {
-      return {
-        searchtimer: null,
-        hidetimer: null,
-        searchsettings: {
-            searchstr: this.getSearchStr(),
-            types: this.getInitiallySelectedTypes(),
-        },
-        searchresult: [],
-        searchmode: '',
-        showresult: false,  
-        searching: false,
-        error: null,
-            abortController: null,
+	props: {
+		searchoptions: {
+			type: Object,
+			required: true,
+		},
+		searchfunction: {
+			type: Function,
+			required: true,
+		},
+		showBtnSubmit: Boolean,
+	},
+	emits: ["isSearchShownInMobileViewUpdated"],
+	provide() {
+		return {
+			query: Vue.computed(() => this.lastQuery),
+		};
+	},
+	inject: ["isMobile"],
+	data: function () {
+		return {
+			searchtimer: null,
+			hidetimer: null,
+			searchsettings: {
+				searchstr: this.getSearchStr(),
+				types: this.getInitiallySelectedTypes(),
+			},
+			searchresult: [],
+			searchmode: "",
+			showresult: false,
+			searching: false,
+			error: null,
+			abortController: null,
 			settingsDropdown: null,
-            lastQuery: ''
-      };
-    },
+			lastQuery: "",
+			isSearchShownInMobileView: false,
+		};
+	},
 	computed: {
 		searchTypesPlaceholder() {
 			if (!this.searchsettings.types.length) {
-				return Object.values(this.typeLabels).join(' / ');
+				return Object.values(this.typeLabels).join(" / ");
 			}
-			return this.searchsettings.types.map(type => this.typeLabels[type]).join(' / ');
+			return this.searchsettings.types
+				.map((type) => this.typeLabels[type])
+				.join(" / ");
 		},
 		types() {
-			if (!this.searchoptions.types)
-				return [];
+			if (!this.searchoptions.types) return [];
 			if (Array.isArray(this.searchoptions.types))
 				return this.searchoptions.types;
 			return Object.keys(this.searchoptions.types);
 		},
 		typeLabels() {
-			if (!this.searchoptions.types)
-				return {};
+			if (!this.searchoptions.types) return {};
 			if (Array.isArray(this.searchoptions.types)) {
 				return this.searchoptions.types.reduce((res, type) => {
 					res[type] = type;
-					return res
+					return res;
 				}, {});
 			}
 			return this.searchoptions.types;
-		}
+		},
+		isSearchShown() {
+			return !this.isMobile ? true : this.isSearchShownInMobileView;
+		},
 	},
-	template: /*html*/`
+	template: /*html*/ `
 		<form
 			ref="searchform"
 			class="d-flex me-3"
@@ -91,14 +97,30 @@ export default {
 			action="javascript:void(0);"
 			@focusin="searchfocusin"
 			@focusout="searchfocusout"
-		>
+		> 
+			<span
+				v-if="isMobile && !isSearchShown"
+				@click="expandSearch()"
+			 	class="d-flex flex-row align-items-center"
+			>
+				<i class="fa-solid fa-magnifying-glass"></i>
+			</span>
 			<div
+				v-if="isSearchShown"
 				ref="searchbox"
 				class="h-100 input-group me-2 searchbar_searchbox"
 				:class="showresult ? 'open' : 'closed'"
 			>
-				<span class="input-group-text">
-					<i class="fa-solid fa-magnifying-glass"></i>
+				<span
+					v-if="isMobile"
+					@click="minimizeSearch()"
+					class="input-group-text">
+					<i class="fa-solid fa-chevron-left"></i>
+				</span>
+				<span
+					v-else
+					class="input-group-text">
+					<i class="fa-solid fa-magnifying-glass color-white"></i>
 				</span>
                 <input
                 	ref="input"
@@ -110,15 +132,6 @@ export default {
                     :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                     :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                 >
-				<button
-					v-if="searchsettings.searchstr"
-					type="button"
-					class="searchbar_input_clear btn btn-outline-secondary"
-					@click="clearInput"
-					@focusin.stop
-				>
-					<i class="fas fa-close"></i>
-				</button>
 				<button
 					v-if="showBtnSubmit"
 					type="submit"
@@ -139,7 +152,7 @@ export default {
                     :title="$p.t('search/button_filter_label')"
                     :aria-label="$p.t('search/button_filter_label')"
                 >
-                    <i class="fas fa-cog"></i>
+                    <i class="fas fa-filter"></i>
                 </button>
             </div>
 
@@ -207,34 +220,42 @@ export default {
             </div>
 		</form>
     `,
-    watch:{
-		'searchsettings.searchstr': function (newSearchValue) {
-			if(this.searchoptions.origin){
-				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+	watch: {
+		"searchsettings.searchstr": function (newSearchValue) {
+			if (this.searchoptions.origin) {
+				sessionStorage.setItem(
+					`${this.searchoptions.origin}_searchstr`,
+					newSearchValue,
+				);
 			}
 		},
-		'searchsettings.types'(newValue) {
+		"searchsettings.types"(newValue) {
 			if (Array.isArray(newValue) && newValue.length === 0) {
 				this.searchsettings.types = [...this.types];
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if (Array.isArray(newValue) && this.searchoptions.origin) {
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
+				localStorage.setItem(
+					`${this.searchoptions.origin}_searchtypes`,
+					JSON.stringify(newValue),
+				);
 			}
 			this.search();
-		}
-    },
-	mounted(){
+		},
+	},
+	mounted() {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
-			toggle: false
+			toggle: false,
 		});
 
-		if (!this.searchoptions.origin){
-			console.warn("No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.");
+		if (!this.searchoptions.origin) {
+			console.warn(
+				"No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.",
+			);
 		}
 	},
 	updated() {
-		if(this.showresult) {
+		if (this.showresult) {
 			Vue.nextTick(() => {
 				this.calcSearchResultHeight();
 			});
@@ -249,32 +270,34 @@ export default {
 		getInitiallySelectedTypes() {
 			let result = false;
 			if (this.searchoptions.origin) {
-				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				let localStorageValue = localStorage.getItem(
+					`${this.searchoptions.origin}_searchtypes`,
+				);
 				if (localStorageValue) {
 					result = JSON.parse(localStorageValue);
 				}
 			}
-			if (result)
-				return result;
-			if (!this.searchoptions.types)
-				return [];
+			if (result) return result;
+			if (!this.searchoptions.types) return [];
 			if (Array.isArray(this.searchoptions.types))
 				return [...this.searchoptions.types];
 			return Object.keys(this.searchoptions.types);
 		},
-		getSearchStr: function(){
-			if (!this.searchoptions.origin)
-				return '';
-			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
+		getSearchStr: function () {
+			if (!this.searchoptions.origin) return "";
+			return (
+				sessionStorage.getItem(
+					`${this.searchoptions.origin}_searchstr`,
+				) ?? ""
+			);
 		},
-		checkSettingsVisibility: function(event) {
+		checkSettingsVisibility: function (event) {
 			// hides the settings collapsible if the user clicks somewhere else
-			if (!this.$refs.settings.contains(event.target))
-			{
+			if (!this.$refs.settings.contains(event.target)) {
 				this.settingsDropdown.hide();
 			}
 		},
-		handleShowSettings: function() {
+		handleShowSettings: function () {
 			// adds the event listener checkSettingsVisibility only when the collapsible is shown
 			document.addEventListener("click", this.checkSettingsVisibility);
 		},
@@ -282,183 +305,212 @@ export default {
 			// removes the event listener checkSettingsVisibility when the collapsible is hidden
 			document.removeEventListener("click", this.checkSettingsVisibility);
 		},
-		calcSearchResultHeight: function() {
+		calcSearchResultHeight: function () {
 			const rect = this.$refs.results.getBoundingClientRect();
-			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {
-				this.$refs.result.style.height = Math.ceil(rect.height + 16) + 'px';
+			if (rect.height > 0 && rect.height < window.innerHeight * 0.8) {
+				this.$refs.result.style.height =
+					Math.ceil(rect.height + 16) + "px";
 			} else {
-				this.$refs.result.style.height = Math.floor(window.innerHeight * 0.8) + 'px';
+				this.$refs.result.style.height =
+					Math.floor(window.innerHeight * 0.8) + "px";
 			}
 		},
-        calcSearchResultExtent: function() {
-			if(!this.showresult) {
+		calcSearchResultExtent: function () {
+			if (!this.showresult) {
 				return;
 			}
-			if(this.searchoptions?.calcheightonly === undefined 
-				|| this.searchoptions.calcheightonly === false) {
+			if (
+				this.searchoptions?.calcheightonly === undefined ||
+				this.searchoptions.calcheightonly === false
+			) {
 				var rect = this.$refs.searchbox.getBoundingClientRect();
-				this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
-				this.$refs.result.style.right = Math.floor(rect.right) + 'px';
-				this.$refs.result.style.width = Math.floor(rect.width) + 'px';
+				this.$refs.result.style.top =
+					Math.floor(rect.bottom + 3) + "px";
+				this.$refs.result.style.right = Math.floor(rect.right) + "px";
+				this.$refs.result.style.width = Math.floor(rect.width) + "px";
 			}
-            this.calcSearchResultHeight();
-        },
-        search: function() {
-            if(this.searchoptions?.nolivesearch === true) return;
+			this.calcSearchResultHeight();
+		},
+		search: function () {
+			if (this.searchoptions?.nolivesearch === true) return;
 
-            this.abort();
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.calcSearchResultExtent();
-                this.searchtimer = setTimeout(
-                    this.callsearchapi,
-                    500
-                );
-            } else {                
-                this.showresult = false;
-            }
-        },
-        abort() {
-            if (this.searchtimer !== null) {
-                clearTimeout(this.searchtimer);
-            }
-            if (this.abortController) {
-                this.abortController.abort();
-                this.abortController = null;
-            }
-            this.searchresult = [];
-        },
-        callsearchapi: function() {
-            this.error = null;
-            this.searchresult.splice(0, this.searchresult.length);
-            this.searching = true;
-            this.showsearchresult();
-            if(this.searchsettings.types.length === 0) {
-                this.error = this.$p.t('search/error_missing_type');
-                this.searching = false;
-                return;
-            }
-
-            if (this.abortController)
-                this.abortController.abort();
-            this.abortController = new AbortController();
-
-            this.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
-            .then(response=>{
-                if (!response.data) {
-                    this.error = this.$p.t('search/error_general');
-                } else {
-                    let res = response.data.map(el => el.data ? {...el, ...JSON.parse(el.data)} : el);
-                    this.lastQuery = response.meta.searchstring;
-                    if (this.searchoptions.mergeResults) {
-                        let counter = 0;
-                        let mergeTypes = [];
-                        let mergedType = 'merged-';
-                        let mergeKey = '';
-
-                        switch (this.searchoptions.mergeResults) {
-                        case 'student':
-                            mergeTypes = ['student', 'prestudent'];
-                            mergedType += this.searchoptions.mergeResults;
-                            mergeKey = 'uid';
-                            break;
-                        case 'person':
-                            mergeTypes = ['person', 'employee', 'student', 'prestudent'];
-                            mergedType += this.searchoptions.mergeResults;
-                            mergeKey = 'person_id';
-                            break;
-                        }
-
-                        if (mergeTypes.length) {
-                            res = Object.values(res.reduce((a, c) => {
-                                if (!mergeTypes.includes(c.renderer)) {
-                                    a['nomerge' + counter++] = c;
-                                } else if (c[mergeKey] === null) {
-                                    a['nomerge' + counter++] = c;
-                                } else if (a[c[mergeKey]] === undefined) {
-                                    a[c[mergeKey]] = {
-                                        rank: c.rank,
-                                        renderer: mergedType,
-                                        type: mergedType,
-                                        list: [c]
-                                    };
-                                } else {
-                                    a[c[mergeKey]].list.push(c);
-                                    if (c.rank > a[c[mergeKey]].rank)
-                                        a[c[mergeKey]].rank = c.rank;
-                                }
-                                return a;
-                            }, {})).sort((a, b) => b.rank - a.rank);
-                        }
-                    }
-                    this.searchresult = res;
-                    this.searchmode = response.meta.mode;
-                }
-                this.searching = false;
-                this.retry = 0;
-            })
-            .catch(error=> {
-                if (error.code == "ERR_CANCELED") {
-                    return this.retry = 0;
-                }
-                if (error.code == "ECONNABORTED" && this.retry) {
-                    this.retry--;
-                    return this.callsearchapi();
-                }
-
-                this.error = this.$p.t('search/error_general', error);
-                this.searching = false;
-                this.retry = 0;
-            });
-        },
-        refreshsearch: function() {
-          this.search();
-          this.togglesettings();
-        },
-        hideresult: function() {
-            this.showresult = false;
-            window.removeEventListener('resize', this.calcSearchResultExtent);
-        },
-        showsearchresult: function() {
-            if(this.searchoptions?.nolivesearch === true) return;
-
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.showresult = true;
-                window.addEventListener('resize', this.calcSearchResultExtent);
+			this.abort();
+			if (this.searchsettings.searchstr.length >= 2) {
 				this.calcSearchResultExtent();
-            }
-        },
-        searchfocusin: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if( this.hidetimer !== null ) {
-                clearTimeout(this.hidetimer);
-            }
-			if (this.searchsettings.searchstr.length >= 2
-				&& this.searchresult.length === 0) {
+				this.searchtimer = setTimeout(this.callsearchapi, 500);
+			} else {
+				this.showresult = false;
+			}
+		},
+		abort() {
+			if (this.searchtimer !== null) {
+				clearTimeout(this.searchtimer);
+			}
+			if (this.abortController) {
+				this.abortController.abort();
+				this.abortController = null;
+			}
+			this.searchresult = [];
+		},
+		callsearchapi: function () {
+			this.error = null;
+			this.searchresult.splice(0, this.searchresult.length);
+			this.searching = true;
+			this.showsearchresult();
+			if (this.searchsettings.types.length === 0) {
+				this.error = this.$p.t("search/error_missing_type");
+				this.searching = false;
+				return;
+			}
+
+			if (this.abortController) this.abortController.abort();
+			this.abortController = new AbortController();
+
+			this.searchfunction(this.searchsettings, {
+				timeout: 50000,
+				signal: this.abortController.signal,
+			})
+				.then((response) => {
+					if (!response.data) {
+						this.error = this.$p.t("search/error_general");
+					} else {
+						let res = response.data.map((el) =>
+							el.data ? { ...el, ...JSON.parse(el.data) } : el,
+						);
+						this.lastQuery = response.meta.searchstring;
+						if (this.searchoptions.mergeResults) {
+							let counter = 0;
+							let mergeTypes = [];
+							let mergedType = "merged-";
+							let mergeKey = "";
+
+							switch (this.searchoptions.mergeResults) {
+								case "student":
+									mergeTypes = ["student", "prestudent"];
+									mergedType +=
+										this.searchoptions.mergeResults;
+									mergeKey = "uid";
+									break;
+								case "person":
+									mergeTypes = [
+										"person",
+										"employee",
+										"student",
+										"prestudent",
+									];
+									mergedType +=
+										this.searchoptions.mergeResults;
+									mergeKey = "person_id";
+									break;
+							}
+
+							if (mergeTypes.length) {
+								res = Object.values(
+									res.reduce((a, c) => {
+										if (!mergeTypes.includes(c.renderer)) {
+											a["nomerge" + counter++] = c;
+										} else if (c[mergeKey] === null) {
+											a["nomerge" + counter++] = c;
+										} else if (
+											a[c[mergeKey]] === undefined
+										) {
+											a[c[mergeKey]] = {
+												rank: c.rank,
+												renderer: mergedType,
+												type: mergedType,
+												list: [c],
+											};
+										} else {
+											a[c[mergeKey]].list.push(c);
+											if (c.rank > a[c[mergeKey]].rank)
+												a[c[mergeKey]].rank = c.rank;
+										}
+										return a;
+									}, {}),
+								).sort((a, b) => b.rank - a.rank);
+							}
+						}
+						this.searchresult = res;
+						this.searchmode = response.meta.mode;
+					}
+					this.searching = false;
+					this.retry = 0;
+				})
+				.catch((error) => {
+					if (error.code == "ERR_CANCELED") {
+						return (this.retry = 0);
+					}
+					if (error.code == "ECONNABORTED" && this.retry) {
+						this.retry--;
+						return this.callsearchapi();
+					}
+
+					this.error = this.$p.t("search/error_general", error);
+					this.searching = false;
+					this.retry = 0;
+				});
+		},
+		refreshsearch: function () {
+			this.search();
+			this.togglesettings();
+		},
+		hideresult: function () {
+			this.showresult = false;
+			window.removeEventListener("resize", this.calcSearchResultExtent);
+		},
+		showsearchresult: function () {
+			if (this.searchoptions?.nolivesearch === true) return;
+
+			if (this.searchsettings.searchstr.length >= 2) {
+				this.showresult = true;
+				window.addEventListener("resize", this.calcSearchResultExtent);
+				this.calcSearchResultExtent();
+			}
+		},
+		searchfocusin: function (e) {
+			e.preventDefault();
+			e.stopPropagation();
+			if (this.hidetimer !== null) {
+				clearTimeout(this.hidetimer);
+			}
+			if (
+				this.searchsettings.searchstr.length >= 2 &&
+				this.searchresult.length === 0
+			) {
 				this.search();
 			}
-        },
-        searchfocusout: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            this.hidetimer = setTimeout(
-                this.hideresult,
-                100
-            );
-        },
-        dash2camelCase(string) {
-            return string.replace(/-([a-z])/g, g => g[1].toUpperCase());
-        },
-        isValidRenderer(renderer) {
-            const camelCaseRenderer = this.dash2camelCase(renderer);
-            return Object.keys(this.$.components).includes(camelCaseRenderer);
-        },
+		},
+		searchfocusout: function (e) {
+			e.preventDefault();
+			e.stopPropagation();
+			this.hidetimer = setTimeout(this.hideresult, 100);
+		},
+		dash2camelCase(string) {
+			return string.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+		},
+		isValidRenderer(renderer) {
+			const camelCaseRenderer = this.dash2camelCase(renderer);
+			return Object.keys(this.$.components).includes(camelCaseRenderer);
+		},
 		getActions(res) {
-			let actions = this.searchoptions.actions[this.dash2camelCase(res.renderer)];
+			let actions =
+				this.searchoptions.actions[this.dash2camelCase(res.renderer)];
 			if (actions) {
 				return actions;
 			}
 			return this.searchoptions.actions[res.type];
-		}
-    }
+		},
+		expandSearch() {
+			this.isSearchShownInMobileView = true;
+			this.$emit("isSearchShownInMobileViewUpdated", {
+				isSearchShownInMobileView: true,
+			});
+		},
+		minimizeSearch() {
+			this.isSearchShownInMobileView = false;
+			this.$emit("isSearchShownInMobileViewUpdated", {
+				isSearchShownInMobileView: false,
+			});
+		},
+	},
 };

From 59d1ca34092149cc0a638cd70dbd2c9e7b2d8f14 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 16:36:54 +0200
Subject: [PATCH 106/189] animated searchbar display in header

---
 public/js/components/Cis/Menu.js            |  57 ++++---
 public/js/components/searchbar/searchbar.js | 156 ++++++++++----------
 2 files changed, 116 insertions(+), 97 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index f2f73de26..82cfbd2a7 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -117,17 +117,25 @@ export default {
 		});
 	},
     template: /*html*/`
-	<button v-if="areHeaderOptionsShown" id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-		<span class="navbar-toggler-icon"></span>
-   	</button>
-	<span v-if="isMobile && areHeaderOptionsShown" class="d-flex flex-row align-items-center px-2">
-		<theme-switch></theme-switch>
-	</span>
+	<div
+		id="header-options-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
+	>
+	<div
+		class="d-flex flex-row align-items-center gap-2 h-100"
+	>
+		<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<span v-if="isMobile" class="d-flex flex-row align-items-center">
+			<theme-switch></theme-switch>
+		</span>
+		</div>
+	</div>
 	<fhc-searchbar
 		@isSearchShownInMobileViewUpdated="isSearchShownInMobileView = $event.isSearchShownInMobileView"
 		:searchoptions="searchbaroptions"
 		:searchfunction="searchfunction"
-		:class="{'px-2': isMobile}"
 		ref="searchbar"
 		id="nav-search"
 		class="fhc-searchbar w-100 py-1 py-lg-2"
@@ -140,21 +148,26 @@ export default {
 			<theme-switch></theme-switch>
 		</div>
     </div>
-	<div v-if="areHeaderOptionsShown" id="nav-user">
-		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
-		</button>
-		<ul ref="navUserDropdown"
-		@[\`shown.bs.collapse\`]="handleShowNavUser"
-		@[\`hide.bs.collapse\`]="handleHideNavUser"
-		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li >
-				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
-			</li>
-			<li><hr class="dropdown-divider m-0 "></li>
-			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-		</ul>
+	<div
+		id="user-menu-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
+	>
+		<div id="nav-user">
+			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+				<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
+			</button>
+			<ul ref="navUserDropdown"
+			@[\`shown.bs.collapse\`]="handleShowNavUser"
+			@[\`hide.bs.collapse\`]="handleHideNavUser"
+			id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+				<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+				<li >
+					<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
+				</li>
+				<li><hr class="dropdown-divider m-0 "></li>
+				<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+			</ul>
+		</div>
 	</div>
     <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 498d4d964..ea3b7f931 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -97,88 +97,91 @@ export default {
 			action="javascript:void(0);"
 			@focusin="searchfocusin"
 			@focusout="searchfocusout"
-		> 
+		>
 			<span
-				v-if="isMobile && !isSearchShown"
-				@click="expandSearch()"
-			 	class="d-flex flex-row align-items-center"
+				v-if="isMobile"
+				@click="toggleIsSearchShownInMobileView()"
+				type="button"
+				data-bs-toggle="collapse"
+				data-bs-target=".multi-collapse"
+				aria-expanded="false"
+				aria-controls="searchbar-collapsible header-options-collapsible user-menu-collapsible"
+			 	class="d-flex flex-row align-items-center ps-3 pe-1"
 			>
-				<i class="fa-solid fa-magnifying-glass"></i>
+				<i v-if="isSearchShownInMobileView" class="fa-solid fa-chevron-left"></i>
+				<i v-else class="fa-solid fa-magnifying-glass"></i>
 			</span>
 			<div
-				v-if="isSearchShown"
-				ref="searchbox"
-				class="h-100 input-group me-2 searchbar_searchbox"
-				:class="showresult ? 'open' : 'closed'"
+				:class="{'collapse multi-collapse collapse-horizontal': isMobile}"
+				class="flex-grow-1"
+				id="searchbar-collapsible"
 			>
-				<span
-					v-if="isMobile"
-					@click="minimizeSearch()"
-					class="input-group-text">
-					<i class="fa-solid fa-chevron-left"></i>
-				</span>
-				<span
-					v-else
-					class="input-group-text">
-					<i class="fa-solid fa-magnifying-glass color-white"></i>
-				</span>
-                <input
-                	ref="input"
-                    @keyup="search"
-                    @focus="showsearchresult"
-                    v-model="searchsettings.searchstr"
-                    class="form-control searchbar_input"
-                    type="search"
-                    :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
-                    :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
-                >
-				<button
-					v-if="showBtnSubmit"
-					type="submit"
-					class="btn btn-primary"
-					:title="$p.t('search/submit')"
-					:aria-label="$p.t('search/submit')"
+				<div
+					ref="searchbox"
+					:class="{open: showresult, closed: showresult, 'px-2': isMobile}"
+					class="h-100 input-group me-2 searchbar_searchbox"
 				>
-					<i class="fas fa-search"></i>
-				</button>
-                <button
-                    data-bs-toggle="collapse"
-                    data-bs-target="#searchSettings"
-                    aria-expanded="false"
-                    aria-controls="searchSettings"
-                    ref="settingsbutton"
-                    class="searchbar_setting_btn btn btn-secondary"
-                    type="button"
-                    :title="$p.t('search/button_filter_label')"
-                    :aria-label="$p.t('search/button_filter_label')"
-                >
-                    <i class="fas fa-filter"></i>
-                </button>
-            </div>
+					<span class="input-group-text">
+						<i class="fa-solid fa-magnifying-glass color-white"></i>
+					</span>
+            	    <input
+            	    	ref="input"
+            	        @keyup="search"
+            	        @focus="showsearchresult"
+            	        v-model="searchsettings.searchstr"
+            	        class="form-control searchbar_input"
+            	        type="search"
+            	        :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+            	        :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+            	    >
+					<button
+						v-if="showBtnSubmit"
+						type="submit"
+						class="btn btn-primary"
+						:title="$p.t('search/submit')"
+						:aria-label="$p.t('search/submit')"
+					>
+						<i class="fas fa-search"></i>
+					</button>
+            	    <button
+            	        data-bs-toggle="collapse"
+            	        data-bs-target="#searchSettings"
+            	        aria-expanded="false"
+            	        aria-controls="searchSettings"
+            	        ref="settingsbutton"
+            	        class="searchbar_setting_btn btn btn-secondary"
+            	        type="button"
+            	        :title="$p.t('search/button_filter_label')"
+            	        :aria-label="$p.t('search/button_filter_label')"
+            	    >
+            	        <i class="fas fa-filter"></i>
+            	    </button>
+            	</div>
 
-            <div v-show="showresult"
-                 class="searchbar_results" tabindex="-1">
-              <div class="searchbar_results_scroller" ref="result">
-                <div class="searchbar_results_wrapper" ref="results">
-                  <div v-if="searching">
-                    <i class="fas fa-spinner fa-spin fa-2x"></i>
-                  </div>
-                  <div v-else-if="this.error !== null">{{ error }}</div>
-                  <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
-                  <template v-else v-for="res in searchresult">
-                    <component
-                        v-if="isValidRenderer(res.renderer)"
-                        :is="res.renderer"
-                        :mode="searchmode"
-                        :res="res"
-                        :actions="getActions(res)"
-                        @actionexecuted="hideresult"
-                    ></component>
-                    <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
-                  </template>
-                </div>
-              </div>
-            </div>
+            	<div v-show="showresult"
+            	     class="searchbar_results" tabindex="-1">
+            	  <div class="searchbar_results_scroller" ref="result">
+            	    <div class="searchbar_results_wrapper" ref="results">
+            	      <div v-if="searching">
+            	        <i class="fas fa-spinner fa-spin fa-2x"></i>
+            	      </div>
+            	      <div v-else-if="this.error !== null">{{ error }}</div>
+            	      <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
+            	      <template v-else v-for="res in searchresult">
+            	        <component
+            	            v-if="isValidRenderer(res.renderer)"
+            	            :is="res.renderer"
+            	            :mode="searchmode"
+            	            :res="res"
+            	            :actions="getActions(res)"
+            	            @actionexecuted="hideresult"
+            	        ></component>
+            	        <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
+            	      </template>
+            	    </div>
+            	  </div>
+            	</div>
+			</div>
 
 			<div
 				id="searchSettings"
@@ -512,5 +515,8 @@ export default {
 				isSearchShownInMobileView: false,
 			});
 		},
+		toggleIsSearchShownInMobileView() {
+			this.isSearchShownInMobileView = !this.isSearchShownInMobileView;
+		},
 	},
 };

From 3b2473039f7ba4c9ee4aa1063cfcebba67b88007 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 16:37:58 +0200
Subject: [PATCH 107/189] code formatting

---
 public/js/components/Cis/Menu.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 82cfbd2a7..20f232f33 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -121,15 +121,15 @@ export default {
 		id="header-options-collapsible"
 		class="collapse multi-collapse collapse-horizontal show"
 	>
-	<div
-		class="d-flex flex-row align-items-center gap-2 h-100"
-	>
-		<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-		<span v-if="isMobile" class="d-flex flex-row align-items-center">
-			<theme-switch></theme-switch>
-		</span>
+		<div
+			class="d-flex flex-row align-items-center gap-2 h-100"
+		>
+			<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<span v-if="isMobile" class="d-flex flex-row align-items-center">
+				<theme-switch></theme-switch>
+			</span>
 		</div>
 	</div>
 	<fhc-searchbar

From 202e6e88d2c83af05c93e344fd2ae5960b81e00e Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 17:44:23 +0200
Subject: [PATCH 108/189] redid searchbar animation with handmade transitions

---
 public/js/components/Cis/Menu.js            | 57 ++++++++++-----------
 public/js/components/searchbar/searchbar.js | 39 +++++---------
 2 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 20f232f33..841eb62da 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -118,19 +118,16 @@ export default {
 	},
     template: /*html*/`
 	<div
-		id="header-options-collapsible"
-		class="collapse multi-collapse collapse-horizontal show"
+		:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: 0px' : 'width: 79px')"
+		style="transition: width 0.5s"
+		class="d-flex flex-row align-items-center gap-2 h-100"
 	>
-		<div
-			class="d-flex flex-row align-items-center gap-2 h-100"
-		>
-			<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<span v-if="isMobile" class="d-flex flex-row align-items-center">
-				<theme-switch></theme-switch>
-			</span>
-		</div>
+		<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<span v-if="isMobile" class="d-flex flex-row align-items-center">
+			<theme-switch></theme-switch>
+		</span>
 	</div>
 	<fhc-searchbar
 		@isSearchShownInMobileViewUpdated="isSearchShownInMobileView = $event.isSearchShownInMobileView"
@@ -148,26 +145,26 @@ export default {
 			<theme-switch></theme-switch>
 		</div>
     </div>
+
 	<div
-		id="user-menu-collapsible"
-		class="collapse multi-collapse collapse-horizontal show"
+		:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: 0px' : 'width: 51px')"
+		style="transition: width 0.5s"
+		id="nav-user"
 	>
-		<div id="nav-user">
-			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
-			</button>
-			<ul ref="navUserDropdown"
-			@[\`shown.bs.collapse\`]="handleShowNavUser"
-			@[\`hide.bs.collapse\`]="handleHideNavUser"
-			id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-				<li >
-					<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
-				</li>
-				<li><hr class="dropdown-divider m-0 "></li>
-				<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-			</ul>
-		</div>
+		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
+		</button>
+		<ul ref="navUserDropdown"
+		@[\`shown.bs.collapse\`]="handleShowNavUser"
+		@[\`hide.bs.collapse\`]="handleHideNavUser"
+		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+			<li >
+				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
+			</li>
+			<li><hr class="dropdown-divider m-0 "></li>
+			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+		</ul>
 	</div>
     <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index ea3b7f931..789de6d8b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -85,9 +85,6 @@ export default {
 			}
 			return this.searchoptions.types;
 		},
-		isSearchShown() {
-			return !this.isMobile ? true : this.isSearchShownInMobileView;
-		},
 	},
 	template: /*html*/ `
 		<form
@@ -101,24 +98,22 @@ export default {
 			<span
 				v-if="isMobile"
 				@click="toggleIsSearchShownInMobileView()"
-				type="button"
-				data-bs-toggle="collapse"
-				data-bs-target=".multi-collapse"
-				aria-expanded="false"
-				aria-controls="searchbar-collapsible header-options-collapsible user-menu-collapsible"
 			 	class="d-flex flex-row align-items-center ps-3 pe-1"
 			>
 				<i v-if="isSearchShownInMobileView" class="fa-solid fa-chevron-left"></i>
 				<i v-else class="fa-solid fa-magnifying-glass"></i>
 			</span>
+
 			<div
-				:class="{'collapse multi-collapse collapse-horizontal': isMobile}"
-				class="flex-grow-1"
-				id="searchbar-collapsible"
+				:class="{'flex-grow-1': !isMobile}"
+				:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : 'width: 0px; overflow-x: hidden;')"
+				style="transition: width 0.5s;"
 			>
 				<div
+					:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : 'width: 150px;')"
+					style="transition: width 0.5s;"
+					:class="{open: showresult, closed: showresult, 'px-3': isMobile && isSearchShownInMobileView}"
 					ref="searchbox"
-					:class="{open: showresult, closed: showresult, 'px-2': isMobile}"
 					class="h-100 input-group me-2 searchbar_searchbox"
 				>
 					<span class="input-group-text">
@@ -157,7 +152,6 @@ export default {
             	        <i class="fas fa-filter"></i>
             	    </button>
             	</div>
-
             	<div v-show="showresult"
             	     class="searchbar_results" tabindex="-1">
             	  <div class="searchbar_results_scroller" ref="result">
@@ -503,20 +497,15 @@ export default {
 			}
 			return this.searchoptions.actions[res.type];
 		},
-		expandSearch() {
-			this.isSearchShownInMobileView = true;
-			this.$emit("isSearchShownInMobileViewUpdated", {
-				isSearchShownInMobileView: true,
-			});
-		},
-		minimizeSearch() {
-			this.isSearchShownInMobileView = false;
-			this.$emit("isSearchShownInMobileViewUpdated", {
-				isSearchShownInMobileView: false,
-			});
-		},
 		toggleIsSearchShownInMobileView() {
 			this.isSearchShownInMobileView = !this.isSearchShownInMobileView;
+			this.$emit("isSearchShownInMobileViewUpdated", {
+				isSearchShownInMobileView: this.isSearchShownInMobileView,
+			});
+		},
+		getMaxWidthOfSearchbarInMobileView() {
+			// body width - hardcoded chevron width; necessary for accurate width transition
+			return (document.querySelector("body").getBoundingClientRect().width - 27) + "px";
 		},
 	},
 };

From 4def45907bfa29f422fca9acd3e2a76af3a74854 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Fri, 17 Apr 2026 18:10:05 +0200
Subject: [PATCH 109/189] reworked searchbar animation

---
 public/js/components/Cis/Menu.js            | 63 +++++++++++----------
 public/js/components/searchbar/searchbar.js | 19 +++----
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 841eb62da..573e569ec 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -28,7 +28,6 @@ export default {
 			urlMatchRankings:[],
 			navUserDropdown:null,
 			menuOpen:true,
-			isSearchShownInMobileView: false,
         };
     },
 	inject: ["isMobile"],
@@ -61,9 +60,6 @@ export default {
 		site_url(){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 		},
-		areHeaderOptionsShown() {
-			return !this.isSearchShownInMobileView || !this.isMobile;
-		},
 	},
 	methods: {
 		fetchMenu() {
@@ -118,19 +114,19 @@ export default {
 	},
     template: /*html*/`
 	<div
-		:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: 0px' : 'width: 79px')"
-		style="transition: width 0.5s"
-		class="d-flex flex-row align-items-center gap-2 h-100"
+		id="header-options-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
 	>
-		<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-		<span v-if="isMobile" class="d-flex flex-row align-items-center">
-			<theme-switch></theme-switch>
-		</span>
+		<div class="d-flex flex-row align-items-center gap-2 h-100" style="width: 79px">
+			<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<span v-if="isMobile" class="d-flex flex-row align-items-center">
+				<theme-switch></theme-switch>
+			</span>
+		</div>
 	</div>
 	<fhc-searchbar
-		@isSearchShownInMobileViewUpdated="isSearchShownInMobileView = $event.isSearchShownInMobileView"
 		:searchoptions="searchbaroptions"
 		:searchfunction="searchfunction"
 		ref="searchbar"
@@ -147,25 +143,30 @@ export default {
     </div>
 
 	<div
-		:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: 0px' : 'width: 51px')"
-		style="transition: width 0.5s"
-		id="nav-user"
+		id="header-usermenu-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
 	>
-		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
-		</button>
-		<ul ref="navUserDropdown"
-		@[\`shown.bs.collapse\`]="handleShowNavUser"
-		@[\`hide.bs.collapse\`]="handleHideNavUser"
-		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li >
-				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
-			</li>
-			<li><hr class="dropdown-divider m-0 "></li>
-			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-		</ul>
+		<div
+			:style="!isMobile ? '' : 'width: 51px'"
+			id="nav-user"
+		>
+			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+				<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
+			</button>
+			<ul ref="navUserDropdown"
+			@[\`shown.bs.collapse\`]="handleShowNavUser"
+			@[\`hide.bs.collapse\`]="handleHideNavUser"
+			id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+				<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+				<li >
+					<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
+				</li>
+				<li><hr class="dropdown-divider m-0 "></li>
+				<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+			</ul>
+		</div>
 	</div>
+
     <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 789de6d8b..672e99da9 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -34,7 +34,6 @@ export default {
 		},
 		showBtnSubmit: Boolean,
 	},
-	emits: ["isSearchShownInMobileViewUpdated"],
 	provide() {
 		return {
 			query: Vue.computed(() => this.lastQuery),
@@ -98,6 +97,11 @@ export default {
 			<span
 				v-if="isMobile"
 				@click="toggleIsSearchShownInMobileView()"
+				type="button"
+				data-bs-toggle="collapse"
+				data-bs-target=".multi-collapse"
+				aria-controls="header-searchbar-collapsible header-options-collapsible header-usermenu-collapsible"
+				aria-expanded="false"
 			 	class="d-flex flex-row align-items-center ps-3 pe-1"
 			>
 				<i v-if="isSearchShownInMobileView" class="fa-solid fa-chevron-left"></i>
@@ -105,16 +109,14 @@ export default {
 			</span>
 
 			<div
-				:class="{'flex-grow-1': !isMobile}"
-				:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : 'width: 0px; overflow-x: hidden;')"
-				style="transition: width 0.5s;"
+				:class="{'flex-grow-1': !isMobile, 'collapse multi-collapse collapse-horizontal': isMobile}"
+				id="header-searchbar-collapsible"
 			>
 				<div
-					:style="!isMobile ? '' : (isSearchShownInMobileView ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : 'width: 150px;')"
-					style="transition: width 0.5s;"
-					:class="{open: showresult, closed: showresult, 'px-3': isMobile && isSearchShownInMobileView}"
+					:class="{open: showresult, closed: showresult, 'px-3': isMobile}"
 					ref="searchbox"
 					class="h-100 input-group me-2 searchbar_searchbox"
+					:style="isMobile ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : ''"
 				>
 					<span class="input-group-text">
 						<i class="fa-solid fa-magnifying-glass color-white"></i>
@@ -499,9 +501,6 @@ export default {
 		},
 		toggleIsSearchShownInMobileView() {
 			this.isSearchShownInMobileView = !this.isSearchShownInMobileView;
-			this.$emit("isSearchShownInMobileViewUpdated", {
-				isSearchShownInMobileView: this.isSearchShownInMobileView,
-			});
 		},
 		getMaxWidthOfSearchbarInMobileView() {
 			// body width - hardcoded chevron width; necessary for accurate width transition

From 16b238124ad02cbff76a62a3de669484e3072aa6 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 09:24:51 +0200
Subject: [PATCH 110/189] cleaned up search icon conditional render

---
 public/js/components/searchbar/searchbar.js | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 672e99da9..2abeaf507 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -96,7 +96,6 @@ export default {
 		>
 			<span
 				v-if="isMobile"
-				@click="toggleIsSearchShownInMobileView()"
 				type="button"
 				data-bs-toggle="collapse"
 				data-bs-target=".multi-collapse"
@@ -252,6 +251,17 @@ export default {
 				"No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.",
 			);
 		}
+
+		document
+			.getElementById("header-searchbar-collapsible")
+			.addEventListener("show.bs.collapse", (e) => {
+				this.isSearchShownInMobileView = true;
+			});
+		document
+			.getElementById("header-searchbar-collapsible")
+			.addEventListener("hidden.bs.collapse", (e) => {
+				this.isSearchShownInMobileView = false;
+			});
 	},
 	updated() {
 		if (this.showresult) {
@@ -499,12 +509,13 @@ export default {
 			}
 			return this.searchoptions.actions[res.type];
 		},
-		toggleIsSearchShownInMobileView() {
-			this.isSearchShownInMobileView = !this.isSearchShownInMobileView;
-		},
 		getMaxWidthOfSearchbarInMobileView() {
-			// body width - hardcoded chevron width; necessary for accurate width transition
-			return (document.querySelector("body").getBoundingClientRect().width - 27) + "px";
+			// body width - hardcoded chevron width; necessary for accurate collapse transition transition
+			return (
+				document.querySelector("body").getBoundingClientRect().width -
+				27 +
+				"px"
+			);
 		},
 	},
 };

From 1a813e52ce5a828ef29669c3a40b47c78a63911b Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 09:50:41 +0200
Subject: [PATCH 111/189] minor fix

---
 public/js/apps/Dashboard/Fhc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 7b7d91fb7..c9c81cddb 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -233,6 +233,7 @@ const app = Vue.createApp({
 		renderers: null,
 	}),
 	components: {},
+	inject: ["isMobile"],
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),

From eb8b4986d7d0fa891d3db78728c8689a2eee2ab5 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 11:36:53 +0200
Subject: [PATCH 112/189] fixed issue with sidenav covering search
 results/usermenu

---
 public/css/Cis4/Cis.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 3056d36b6..bb9655cb9 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -147,6 +147,8 @@ html {
 	--fhc-cis-menu-lvl-5-color-hover: var(--fhc-text);
 	--fhc-cis-grade-positive: var(--fhc-success);
 	--fhc-cis-grade-negative: var(--fhc-danger);
+
+  --fhc-offcanvas-zindex: 1045;
 }
 
 #themeSwitch i{
@@ -375,7 +377,7 @@ html {
 /* searchbar */
 #nav-search {
   background-color: var(--fhc-primary);
-  z-index: 1;
+ 	z-index: calc(var(--fhc-offcanvas-zindex) + 1) !important;
 }
 #nav-search.me-3 {
   margin: 0 !important;
@@ -413,10 +415,18 @@ html {
 	color: var(--fhc-link) !important;
 }
 
+#nav-main {
+   	z-index: var(--fhc-offcanvas-zindex);
+}
+
 #nav-main-sticky {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
 
+#nav-user-menu {
+   	z-index: calc(var(--fhc-offcanvas-zindex) + 1);
+}
+
 #nav-user-menu img {
   object-fit: cover;
   height: calc( 3 * var(--fhc-cis-header-py));

From 414d8bd383a5994e036caa9cb5685dccfe053cdf Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 11:40:26 +0200
Subject: [PATCH 113/189] minor fix

---
 public/js/components/searchbar/searchbar.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 2abeaf507..868a355cd 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -110,6 +110,8 @@ export default {
 			<div
 				:class="{'flex-grow-1': !isMobile, 'collapse multi-collapse collapse-horizontal': isMobile}"
 				id="header-searchbar-collapsible"
+				@[\`show.bs.collapse\`]="isSearchShownInMobileView = true"
+				@[\`hidden.bs.collapse\`]="isSearchShownInMobileView = false"
 			>
 				<div
 					:class="{open: showresult, closed: showresult, 'px-3': isMobile}"
@@ -251,17 +253,6 @@ export default {
 				"No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.",
 			);
 		}
-
-		document
-			.getElementById("header-searchbar-collapsible")
-			.addEventListener("show.bs.collapse", (e) => {
-				this.isSearchShownInMobileView = true;
-			});
-		document
-			.getElementById("header-searchbar-collapsible")
-			.addEventListener("hidden.bs.collapse", (e) => {
-				this.isSearchShownInMobileView = false;
-			});
 	},
 	updated() {
 		if (this.showresult) {

From a9d82de25c97ecc68fd43f8592d845da3c316808 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 12:47:48 +0200
Subject: [PATCH 114/189] handle custom prop like other internal props

---
 public/js/components/Dashboard/Admin/Presets.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index ef1c06e00..a28a8afc6 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -72,14 +72,13 @@ export default {
 					if (section.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'custom'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
 				payload[k].widgetid = k;
-				delete payload[k].custom;
 			}
 			this.$api
 				.call(Object.entries(payload).map(([key, widget]) => [

From 0b3f7d1fe38787adb369be2aa961a421e0650e90 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 12:50:20 +0200
Subject: [PATCH 115/189] code quality

---
 public/js/components/Dashboard/Dashboard.js |  2 +-
 public/js/components/Dashboard/Section.js   | 38 ++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 8bb5e7958..94b3621d6 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -70,7 +70,7 @@ export default {
 					if (this.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'preset'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index d312107e9..79780d63c 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -146,26 +146,26 @@ export default {
 				
 				let item = {...update.item};
 				if (!item.placeholder) {
-				if (!item.place[this.gridWidth])
-					item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
-				delete item.x;
-				delete item.y;
-				delete item.w;
-				delete item.h;
-				delete item.place[this.gridWidth].pinned;
-				if (update.x !== undefined)
-					item.place[this.gridWidth].x = update.x;
-				if (update.y !== undefined)
-					item.place[this.gridWidth].y = update.y;
-				if (update.w !== undefined)
-					item.place[this.gridWidth].w = update.w;
-				if (update.h !== undefined)
-					item.place[this.gridWidth].h = update.h;
-				if (pinned){
-					item.place[this.gridWidth].pinned = true;
-				}
+					if (!item.place[this.gridWidth])
+						item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
+					delete item.x;
+					delete item.y;
+					delete item.w;
+					delete item.h;
+					delete item.place[this.gridWidth].pinned;
+					if (update.x !== undefined)
+						item.place[this.gridWidth].x = update.x;
+					if (update.y !== undefined)
+						item.place[this.gridWidth].y = update.y;
+					if (update.w !== undefined)
+						item.place[this.gridWidth].w = update.w;
+					if (update.h !== undefined)
+						item.place[this.gridWidth].h = update.h;
+					if (pinned) {
+						item.place[this.gridWidth].pinned = true;
+					}
 
-				result[item.id] = item;
+					result[item.id] = item;
 				}
 			});
 			this.updatePreset(result);

From 9a281dfa71d1456d31cb9f36b5bf0dea1f461776 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 12:51:19 +0200
Subject: [PATCH 116/189] don't save source property for widgets since it get
 generated when fetched

---
 application/controllers/api/frontend/v1/dashboard/User.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 0dee430d7..e603573ed 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -70,6 +70,9 @@ class User extends FHCAPI_Controller
 		if (!isset($widget['widgetid']))
 			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
 
+		if (isset($widget['source']))
+			unset($widget['source']);
+
 		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
 
 		$override_decoded = json_decode($override->override, true);

From 4ab90567003cb9d564c7236930156829db395380 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 12:53:03 +0200
Subject: [PATCH 117/189] deep clone instead of shallow to prevent watchers
 from executing prematurely

---
 public/js/components/Dashboard/Section.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 79780d63c..a1ad33f65 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -3,6 +3,8 @@ import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
+import ObjectUtils from "../../helpers/ObjectUtils.js";
+
 export default {
 	name: 'Section',
 	components: {
@@ -144,7 +146,7 @@ export default {
 			let result = {};
 			updated.forEach(update => {
 				
-				let item = {...update.item};
+				let item = structuredClone(ObjectUtils.deepToRaw(update.item));
 				if (!item.placeholder) {
 					if (!item.place[this.gridWidth])
 						item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};

From 187b4a6e4b44f6cf9abc24b60211adc30e2ac83f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 14:05:16 +0200
Subject: [PATCH 118/189] guard indexedItems watcher so it won't run
 unnecessarily

---
 public/js/components/Drop/Grid.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index e4ffd5865..c13aea43f 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -232,7 +232,11 @@ export default {
 		},
 		indexedItems: {
 			handler(value) {
-				this.dragCancel();
+				if (!value?.length)
+					return;
+				
+				if (this.mode != MODE_IDLE)
+					this.dragCancel();
 
 				const updated = this.createNewGrid(value);
 

From cf145013110017f6a0b6a6215b5595ae82bff01c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 14:16:21 +0200
Subject: [PATCH 119/189] handle initial position and size in Grid.js no
 Section.js & add weights & add size properties of updated items to return
 value in GridLogic.add()

---
 public/js/components/Dashboard/Section.js | 16 ++++-
 public/js/components/Drop/Grid.js         | 75 ++++++++++-------------
 public/js/composables/GridLogic.js        |  4 +-
 3 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index a1ad33f65..cfb8dae05 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -103,7 +103,20 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 }) };
+
+				let weight = 5;
+				if (!item.source)
+					weight = 6;
+				else if (item.source == 'general')
+					weight = 4;
+
+				let placement = item.place[this.gridWidth];
+				if (!placement) {
+					weight -= 3;
+					placement = {};
+				}
+
+				return { ...item, ...placement, weight };
 			});
 
 			if (this.editModeIsActive)
@@ -155,6 +168,7 @@ export default {
 					delete item.w;
 					delete item.h;
 					delete item.place[this.gridWidth].pinned;
+					delete item.weight;
 					if (update.x !== undefined)
 						item.place[this.gridWidth].x = update.x;
 					if (update.y !== undefined)
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index c13aea43f..febccc53d 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -270,62 +270,55 @@ export default {
 				output[item.index] = result;
 			});
 		},
-		// has item an initial place
-		needsReordering(item) {
-			if (!item?.data?.place[this.cols]) {
-				return true;
-			}
-			return false;
-		},
 		// gridlogic
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
-			let sortedItems = [...items].sort((a, b) => {
-				if (this.needsReordering(a) && this.needsReordering(b)) {
-					return 0;
-				} else if (this.needsReordering(a)) {
-					return 999;
-				} else if (this.needsReordering(b)) {
-					return -999;
-				}
-				
-				return a.weight > b.weight;
-			}); 
+			const sortedItems = [...items].sort((a, b) => a.weight > b.weight);
 			sortedItems.forEach(item => {
-				let freeSlots = this.grid.getFreeSlots();
-				
-				if (this.needsReordering(item)) {
-					let firstFreeSlot = freeSlots.shift();
-					if (!firstFreeSlot) {
-						item.x = 0;
-						item.y = this.grid.h;
-					} else {
-						item.x = firstFreeSlot.x;
-						item.y = firstFreeSlot.y;
-					}
+				const target = { ...item };
+
+				if (target.x === undefined && target.y == undefined) {
+					target.x = 0;
+					target.y = 0;
+					const setup = this.sizeLimits[target.data.widget];
+					target.w = setup.width.min;
+					target.h = setup.height.min;
 				}
-				if (item.x + item.w > this.cols) {
-					let targetW = this.cols-item.x,
+
+				if (target.x + target.w > this.cols) {
+					let targetW = this.cols - target.x,
 						targetX = undefined;
 
-					[ targetW ] = this.cropSizeToAllowed(item.data.widget, targetW, item.h);
+					[ targetW ] = this.cropSizeToAllowed(target.data.widget, targetW, target.h);
 
 					if (targetW > this.cols)
 						targetW = this.cols;
-					if (item.x + targetW > this.cols) {
+					if (target.x + targetW > this.cols) {
 						targetX = this.cols - targetW;
 					}
-					if (targetW == item.w)
+					if (targetW == target.w)
 						targetW = undefined;
-					result[item.index] = {
-						item: item.data,
-						x: targetX,
-						w: targetW
-					};
+
+					if (targetX !== undefined)
+						target.x = targetX;
+					if (targetW !== undefined)
+						target.w = targetW;
 				}
-				item.frame = this.grid.getItemFrame(item);
-				this.convertGridResultToUpdate(this.grid.add(item), result, items);
+
+				target.frame = this.grid.getItemFrame(target);
+				this.convertGridResultToUpdate(this.grid.add(target), result, items);
+				
+				['x', 'y', 'h', 'w'].forEach(prop => {
+					if (target[prop] === item[prop])
+						return;
+					
+					if (!result[target.index])
+						result[target.index] = { item: target.data };
+
+					if (result[target.index][prop] === undefined)
+						result[target.index][prop] = target[prop];
+				});
 			});
 			this.grid.clearWeights();
 			return result;
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 7f1a860e9..ea4abb1db 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -71,7 +71,9 @@ class GridLogic {
 					result[move.index] = {
 						index: currItem.index,
 						x: currItem.x,
-						y: currItem.y
+						y: currItem.y,
+						w: currItem.w,
+						h: currItem.h
 					};
 				});
 				item.frame.forEach(f => this.grid[f] = item.index);

From cdf63840b01ef483e12ecbd09890b2399637a101 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 14:30:31 +0200
Subject: [PATCH 120/189] simplify widgetAdd, widgetUpdate and widgetRemove

---
 public/js/components/Dashboard/Admin/Presets.js |  7 +++----
 public/js/components/Dashboard/Dashboard.js     | 12 +++++-------
 public/js/components/Dashboard/Section.js       |  8 +++-----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index a28a8afc6..a66159466 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -23,7 +23,7 @@ export default {
 		}
 	},
 	methods: {
-		widgetAdd(section_name, widget) {
+		widgetAdd(widget, section_name) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
 				widget.id = 'loading_' + String((new Date()).valueOf());
@@ -64,8 +64,7 @@ export default {
 			})
 			.catch(() => {});
 		},
-		widgetUpdate(section_name, payload) {
-			payload = payload[section_name];
+		widgetUpdate(payload, section_name) {
 			for (var k in payload) {
 				const section = this.sections.find(section => section.name == section_name);
 				for (var wid in section.widgets) {
@@ -105,7 +104,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(section_name, id) {
+		widgetRemove(id, section_name) {
 			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 94b3621d6..f9fff9925 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -40,8 +40,7 @@ export default {
 		}
 	},
 	methods: {
-		widgetAdd(section_name, widget) {
-			// TODO(chris): remove section_name? (change order of params => get rid of it)
+		widgetAdd(widget) {
 			this.$refs.widgetpicker
 				.getWidget()
 				.then(widget_id => {
@@ -63,8 +62,7 @@ export default {
 				})
 				.catch(() => {});
 		},
-		widgetUpdate(section_name, payload) {
-			payload = payload[section_name];
+		widgetUpdate(payload) {
 			for (var k in payload) {
 				for (var wid in this.widgets) {
 					if (this.widgets[wid].id == k) {
@@ -112,7 +110,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(section_name, id) {
+		widgetRemove(id) {
 			this.$api
 				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
 				.then(() => {
@@ -148,7 +146,7 @@ export default {
 					}
 				}
 
-				remove.forEach(wid => this.widgetRemove('general', wid));
+				remove.forEach(wid => this.widgetRemove(wid));
 
 				this.widgets = widgets;
 			})
@@ -160,7 +158,7 @@ export default {
 			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index cfb8dae05..c2342e7d6 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -133,7 +133,7 @@ export default {
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
+				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', item.id, this.name));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
@@ -187,9 +187,7 @@ export default {
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
-			let payload = {};
-			payload[this.name] = update;
-			this.$emit('widgetUpdate', this.name, payload);
+			this.$emit('widgetUpdate', update, this.name);
 		}
 	},
 	mounted() {
@@ -230,7 +228,7 @@ export default {
 				<div
 					v-if="item.placeholder"
 					class="empty-tile-hover"
-					@click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"
+					@click="$emit('widgetAdd', { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 }, name)"
 				></div>
 				<dashboard-item 
 					v-else

From 33b5c370b17abe9ab50aedc2d09b1d4e2742ff23 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 14:41:28 +0200
Subject: [PATCH 121/189] code quality

---
 .../js/components/Dashboard/Admin/Presets.js  | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index a66159466..98f4fad88 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -12,16 +12,25 @@ export default {
 		dashboard: String,
 		widgets: Array
 	},
-	data: () => ({
-		funktionen: {},
-		sections: [],
-		tmpLoading: ''
-	}),
+	data() {
+		return {
+			funktionen: {},
+			sections: [],
+			tmpLoading: ''
+		};
+	},
 	computed: {
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
 	},
+	watch: {
+		dashboard() {
+			// TODO(chris): this should be done without a watcher
+			this.loadSections({target:this.$refs.funktionenList});
+			this.loadFunktionen();
+		}
+	},
 	methods: {
 		widgetAdd(widget, section_name) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
@@ -149,7 +158,6 @@ export default {
 					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-
 		},
 		loadFunktionen() {
 			this.$api
@@ -163,17 +171,17 @@ export default {
 	created() {
 		this.loadFunktionen();
 	},
-	watch: {
-		dashboard() {
-			// TODO(chris): this should be done without a watcher
-			this.loadSections({target:this.$refs.funktionenList});
-			this.loadFunktionen();
-		}
-	},
-	template: `<div class="dashboard-admin-presets">
+	template: /* html */`
+	<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
-				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
+				<select
+					ref="funktionenList"
+					style="height:30em"
+					class="form-control"
+					multiple
+					@input="loadSections"
+				>
 					<option
 						v-for="funktion in funktionen"
 						:key="funktion.funktion_kurzbz"
@@ -183,9 +191,20 @@ export default {
 				</select>
 			</div>
 			<div class="col-9">
-				<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
+				<dashboard-section
+					v-for="section in sections"
+					:key="section.name"
+					:name="section.name"
+					:widgets="section.widgets"
+					@widget-add="widgetAdd"
+					@widget-update="widgetUpdate"
+					@widget-remove="widgetRemove"
+				></dashboard-section>
 			</div>
 		</div>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="pickerWidgets"></dashboard-widget-picker>
+		<dashboard-widget-picker
+			ref="widgetpicker"
+			:widgets="pickerWidgets"
+		></dashboard-widget-picker>
 	</div>`
 }

From 9316016d242579a5afcd16bd3e1516cfa8087536 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 14:59:35 +0200
Subject: [PATCH 122/189] get selected funktionen the vuejs way

---
 public/js/components/Dashboard/Admin/Presets.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 98f4fad88..644e2f4bb 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -16,6 +16,7 @@ export default {
 		return {
 			funktionen: {},
 			sections: [],
+			selectedFunktionen: [],
 			tmpLoading: ''
 		};
 	},
@@ -26,8 +27,7 @@ export default {
 	},
 	watch: {
 		dashboard() {
-			// TODO(chris): this should be done without a watcher
-			this.loadSections({target:this.$refs.funktionenList});
+			this.loadSections();
 			this.loadFunktionen();
 		}
 	},
@@ -129,8 +129,8 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadSections(evt) {
-			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
+		loadSections() {
+			let funktionen = this.selectedFunktionen;
 			this.sections = [];
 			this.tmpLoading = funktionen.join('###');
 
@@ -176,11 +176,11 @@ export default {
 		<div class="row">
 			<div class="col-3">
 				<select
-					ref="funktionenList"
-					style="height:30em"
+					v-model="selectedFunktionen"
 					class="form-control"
+					style="height:30em"
 					multiple
-					@input="loadSections"
+					@change="loadSections"
 				>
 					<option
 						v-for="funktion in funktionen"

From a8fb45adc6a7f97c8c918476e72fd7242d6daf54 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 15:03:06 +0200
Subject: [PATCH 123/189] undo parts of
 187b4a6e4b44f6cf9abc24b60211adc30e2ac83f to prevent having no gridlogic
 available

---
 public/js/components/Drop/Grid.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index febccc53d..70d7f2c9a 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -232,9 +232,6 @@ export default {
 		},
 		indexedItems: {
 			handler(value) {
-				if (!value?.length)
-					return;
-				
 				if (this.mode != MODE_IDLE)
 					this.dragCancel();
 

From 239577e9cfde6680e62aac6c96cd0d804dec4817 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 15:17:07 +0200
Subject: [PATCH 124/189] safeguard watchers; move indexedItems watcher code
 into a method and reuse it in cols watcher

---
 public/js/components/Drop/Grid.js | 35 ++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 70d7f2c9a..0fb94289a 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -218,28 +218,27 @@ export default {
 	},
 	watch: {
 		active(active) {
-			if (!active)
+			if (!active && this.mode != MODE_IDLE)
 				this.dragCancel();
 		},
-		cols() {
-			this.dragCancel();
+		cols(value, oldValue) {
+			if (value == oldValue)
+				return;
+
+			this.reinitGrid();
 		},
 	    rows: {
-			handler(value) {
+			handler(value, oldValue) {
+				if (value == oldValue)
+					return;
+
 				this.$emit('gridHeight', value);
 			},
 			immediate: true
 		},
 		indexedItems: {
 			handler(value) {
-				if (this.mode != MODE_IDLE)
-					this.dragCancel();
-
-				const updated = this.createNewGrid(value);
-
-				this.correctedPositionUpdates = updated;
-				if (updated.length)
-					this.$emit('rearrangeItems', updated.filter(v => v));
+				this.reinitGrid();
 			},
 			immediate: true,
 			deep: true
@@ -247,6 +246,18 @@ export default {
 	},
 	methods: {
 		// helpers
+		reinitGrid() {
+			if (this.mode != MODE_IDLE)
+				this.dragCancel();
+
+			const updated = this.createNewGrid(this.indexedItems);
+
+			this.correctedPositionUpdates = updated;
+			if (updated.length)
+				updated = updated.filter(v => v);
+			if (updated.length)
+				this.$emit('rearrangeItems', updated);
+		},
 		convertGridResultToUpdate(input, output, baseArray) {
 			if (!input)
 				return;

From 28d65ac1146ebda1b16377455a02f4c52d64b1f6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 20 Apr 2026 15:22:52 +0200
Subject: [PATCH 125/189] replace tmpLoading with an abortcontroller

---
 .../js/components/Dashboard/Admin/Presets.js  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 644e2f4bb..4b0c9f7ea 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -17,7 +17,7 @@ export default {
 			funktionen: {},
 			sections: [],
 			selectedFunktionen: [],
-			tmpLoading: ''
+			abortController: null
 		};
 	},
 	computed: {
@@ -130,20 +130,21 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadSections() {
-			let funktionen = this.selectedFunktionen;
-			this.sections = [];
-			this.tmpLoading = funktionen.join('###');
-
 			const params = {
 				db: this.dashboard,
-				funktionen
+				funktionen: this.selectedFunktionen
 			};
 
+			if (this.abortController)
+				this.abortController.abort();
+			this.abortController = new AbortController();
+			const signal = this.abortController.signal;
+
+			this.sections = [];
+			
 			return this.$api
-				.call(ApiDashboardPreset.getBatch(params))
+				.call(ApiDashboardPreset.getBatch(params), { signal })
 				.then(result => {
-					if (this.tmpLoading !== funktionen.join('###'))
-						return; // NOTE(chris): prevent race condition
 					for (var section in result.data) {
 						let widgets = [];
 						for (var wid in result.data[section]) {

From 6a53c9fae4b061460cbc76b14a92a6b9669f3485 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 15:54:24 +0200
Subject: [PATCH 126/189] fixed multiple news page issues

---
 public/js/apps/Cis.js                         |  12 +
 public/js/apps/Dashboard/Fhc.js               |   9 +-
 public/js/components/Cis/Cms/News.js          | 206 ++++++++++--------
 public/js/components/Pagination/Pagination.js |  81 ++++---
 4 files changed, 179 insertions(+), 129 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index c88a47a35..39fde01a2 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -136,6 +136,18 @@ const app = Vue.createApp({
             }
         };
     },
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		},
+	},
+	provide() {
+		return {
+			isMobile: this.isMobile
+		}
+	},
     methods: {
         searchfunction: function(searchsettings) {
         	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 140c76402..c9c81cddb 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -233,18 +233,11 @@ const app = Vue.createApp({
 		renderers: null,
 	}),
 	components: {},
-	computed: {
-		isMobile() {
-			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
-			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
-			return smallScreen;// && touchCapable;
-		}	
-	},
+	inject: ["isMobile"],
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
-			isMobile: this.isMobile
 		}	
 	},
 	methods: {
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index bf17666a2..bc800094a 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -2,115 +2,137 @@ import Pagination from "../../Pagination/Pagination.js";
 import StudiengangInformation from "./StudiengangInformation/StudiengangInformation.js";
 import BsConfirm from "../../Bootstrap/Confirm.js";
 
-import ApiCms from '../../../api/factory/cms.js';
+import ApiCms from "../../../api/factory/cms.js";
 
 export default {
 	name: "NewsComponent",
-  components: {
-    Pagination,
-	StudiengangInformation,
-  },
-  data() {
-    return {
-      content: null,
-      maxPageCount: 0,
-      page_size: 10,
-	  page:1,
-    };
-  },
-  watch:{
-	'$p.user_language.value':function(sprache){
-		this.fetchNews();
-	}
-  },
-  computed:{
-	sprache: function(){
-		return this.$p.user_language.value;
+	components: {
+		Pagination,
+		StudiengangInformation,
 	},
-  },
-  methods: {
-		fetchNews() {
-			return this.$api
-				.call(ApiCms.getNews(this.page, this.page_size, this.sprache))
-				.then(res => res.data)
-				.then(result => {
-					this.content = result;
+	inject: ["isMobile"],
+	data() {
+		return {
+			content: null,
+			maxPageCount: 0,
+			page_size: 10,
+			page: 1,
+		};
+	},
+	watch: {
+		"$p.user_language.value": function (sprache) {
+			this.fetchNews();
+		},
+	},
+	computed: {
+		sprache: function () {
+			return this.$p.user_language.value;
+		},
+	},
+	methods: {
+		async fetchNews() {
+			let newsResponse = await this.$api.call(
+				ApiCms.getNews(this.page, this.page_size, this.sprache),
+			);
+			this.content = newsResponse.data;
 
-					document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
-						el.addEventListener("click", (evt) => {
-							evt.preventDefault();
-							BsConfirm.popup(el.dataset.confirm)
-								.then(() => {
-									Axios.get(el.href)
-										.then((res) => {
-											// TODO(chris): check for success then show message and/or reload
-											location = location;
-										})
-										.catch((err) => console.error("ERROR:", err));
+			document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+				el.addEventListener("click", (evt) => {
+					evt.preventDefault();
+					BsConfirm.popup(el.dataset.confirm)
+						.then(() => {
+							Axios.get(el.href)
+								.then((res) => {
+									// TODO(chris): check for success then show message and/or reload
+									location = location;
 								})
-								.catch(() => {
-								});
-						});
-					});
-					document.querySelectorAll("#cms [data-href]").forEach((el) => {
-						el.href = el.dataset.href.replace(
-							/^ROOT\//,
-							FHC_JS_DATA_STORAGE_OBJECT.app_root
-						);
-					});
-					Vue.nextTick(()=>{
-						document.querySelectorAll(".card-header").forEach((el) => {
-							el.classList.add("fhc-primary");
-						});
-						document.querySelectorAll(".row").forEach((el) => {
-							el.classList.add("w-100");
-							el.classList.add("align-items-center");
-							
-						});
-						document.querySelectorAll(".row h2").forEach((el) => {
-							el.classList.add("mb-0");
-						});
+								.catch((err) => console.error("ERROR:", err));
+						})
+						.catch(() => {});
+				});
+			});
+			document.querySelectorAll("#cms [data-href]").forEach((el) => {
+				el.href = el.dataset.href.replace(
+					/^ROOT\//,
+					FHC_JS_DATA_STORAGE_OBJECT.app_root,
+				);
+			});
 
-					})
+			await this.$nextTick();
+			this.formatExternalHtml();
+		},
+		async loadNewPageContent(data) {
+			let newsResponse = await this.$api.call(
+				ApiCms.getNews(data.page, data.rows),
+			);
+			this.content = newsResponse.data;
+
+			await this.$nextTick();
+
+			this.formatExternalHtml();
+		},
+		formatExternalHtml() {
+			document
+				.querySelectorAll(".news-list-item .card-header")
+				.forEach((el) => {
+					el.classList.add("fhc-primary");
+				});
+			document.querySelectorAll(".news-list-item .row").forEach((el) => {
+				el.classList.add("w-100");
+				el.classList.add("align-items-center");
+			});
+			document
+				.querySelectorAll(".news-list-item .row h2")
+				.forEach((el) => {
+					el.classList.add("mb-0");
 				});
 		},
-		loadNewPageContent(data) {
-			this.$api
-				.call(ApiCms.getNews(data.page, data.rows))
-				.then(res => res.data)
-				.then(result => {
-					this.content = result;
-					
-				});
-		}
-  },
-  created() {
-    this.fetchNews();
+		afterPageUpdated(event) {
+			this.page = event.page;
+			this.page_size = event.rows;
+			this.$refs.newsPageHeading.scrollIntoView({block: 'end'});
+			this.loadNewPageContent(event);
+		},
+	},
+	created() {
+		this.fetchNews();
 
 		this.$api
 			.call(ApiCms.getNewsRowCount())
-			.then(res => res.data)
-			.then(result => {
+			.then((res) => res.data)
+			.then((result) => {
 				this.maxPageCount = result;
 			});
-  },
-  template: /*html*/ `
-  	<h2 class="fhc-primary-color">News</h2>
-	<hr/>
-	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
-	</pagination>
-	<div class="container-fluid mt-4">
-		<div class="row">
-			<div class="col" v-html="content">
-			</div>
-			<div class="col-auto">
-				<div style="width:15rem">
-					<studiengang-information></studiengang-information>
+	},
+	template: /*html*/ `
+	<div :class="{'overflow-y-scroll pb-3': isMobile}" class="overflow-x-hidden">
+  		<h2 ref="newsPageHeading" class="fhc-primary-color">News</h2>
+		<hr/>
+		<pagination
+			v-show="content?true:false"
+			:page="page"
+			:page_size="page_size"
+			@pageUpdated="afterPageUpdated($event)"
+			:maxPageCount="maxPageCount"
+		></pagination>
+		<div class="container-fluid mt-4">
+			<div class="row">
+				<div class="col" v-html="content">
+				</div>
+				<div class="col-auto">
+					<div style="width:15rem">
+						<studiengang-information></studiengang-information>
+					</div>
 				</div>
 			</div>
 		</div>
+		<pagination
+			v-show="content?true:false"
+			:page="page"
+			:page_size="page_size"
+			@pageUpdated="afterPageUpdated($event)"
+			:maxPageCount="maxPageCount"
+		></pagination>
 	</div>
-	<pagination v-show="content?true:false" :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
-	</pagination>
     `,
 };
diff --git a/public/js/components/Pagination/Pagination.js b/public/js/components/Pagination/Pagination.js
index 1a2b6fe0f..8198f3e64 100644
--- a/public/js/components/Pagination/Pagination.js
+++ b/public/js/components/Pagination/Pagination.js
@@ -1,37 +1,60 @@
 export default {
-  components: {
-    paginator: primevue.paginator,
-  },
-  emits: ["update:rows"],
-  props: {
-    maxPageCount: {
-      type: Number,
-      default: 0,
-    },
-    page_size: {
-      type: Number,
-      required: true,
-    },
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    newPageEvent: function (data) {
-      
-    },
-  },
-  mounted() {},
-  template: /*html*/ `
- 	<!-- Desktop -->
+	components: {
+		paginator: primevue.paginator,
+	},
+	emits: ["pageUpdated"],
+	props: {
+		maxPageCount: {
+			type: Number,
+			default: 0,
+		},
+		page_size: {
+			type: Number,
+			required: true,
+		},
+		page: {
+			type: Number | null,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			first: 0,
+			rowsPerPageOptions: [10, 20, 30],
+		};
+	},
+	watch: {
+		page(newValue) {
+			this.first = (newValue - 1) * this.$props.page_size;
+		},
+	},
+	methods: {
+		afterPageUpdated(data) {
+			this.$emit("pageUpdated", { ...data, page: data.page + 1 });
+			this.first = data.page * this.$props.page_size;
+		},
+	},
+	template: /*html*/ `
+	<!-- Desktop -->
 	<div class="d-none d-md-block">
-		<paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" >
-		</paginator>
+        <paginator 
+			v-model:rows="page_size"
+			v-model:first="first"
+			@page="afterPageUpdated($event)"
+			:totalRecords="maxPageCount"
+			:rowsPerPageOptions="rowsPerPageOptions"
+		></paginator>
 	</div>
 	<!-- Mobile -->
 	<div class="d-block d-md-none">
-		<paginator v-model:rows="page_size" @page="(data)=>$emit('page',{...data, page:data.page+1})" :rows="page_size" :totalRecords="maxPageCount" :rowsPerPageOptions="[10, 20, 30]" template="FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink RowsPerPageDropdown">
-		</paginator>
+		<paginator
+			v-model:rows="page_size"
+			v-model:first="first"
+			@page="afterPageUpdated($event)"
+			:totalRecords="maxPageCount"
+			:rowsPerPageOptions="rowsPerPageOptions"
+			template="FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink RowsPerPageDropdown"
+		></paginator>
 	</div>
   `,
 };

From 536e66eed9a196dd13357e405244b08587f03eba Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Mon, 20 Apr 2026 16:39:28 +0200
Subject: [PATCH 127/189] added padding at the bottom of the profile page

---
 public/js/components/Cis/Profil/Profil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index da205816d..49f17b806 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -382,7 +382,7 @@ export const Profil = {
 		this.load()
 	},
 	template: `
-	<div>
+	<div class="pb-4">
 		<div v-if="notFoundUID">
 			<h3>Es wurde keine Person mit der UID {{this.notFoundUID}} gefunden</h3>
 		</div>

From 89e0326435582415585ea4e73371d425b38869b7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 09:34:15 +0200
Subject: [PATCH 128/189] code quality

---
 public/js/components/Dashboard/Admin.js       | 113 ++++++++++++++----
 public/js/components/Dashboard/Admin/Edit.js  |  43 +++++--
 .../js/components/Dashboard/Admin/Widgets.js  |  32 +++--
 public/js/components/Dashboard/Dashboard.js   |  25 +++-
 4 files changed, 164 insertions(+), 49 deletions(-)

diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index 8921400b8..e554dd905 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -33,33 +33,32 @@ export default {
 	methods: {
 		dashboardAdd() {
 			let _name = '';
-			BsPrompt.popup('New Dashboard name').then(
-				name => {
-					_name = name;
+			BsPrompt
+				.popup('New Dashboard name')
+				.then(dashboard_kurzbz => {
 					const params = {
-						dashboard_kurzbz: name
+						dashboard_kurzbz
 					};
 					return this.$api
 						.call(ApiDashboardBoard.add(params))
-						.then(response =>{
+						.then(response => {
 							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 							let newDashboard = {
 								dashboard_id: response.data,
-								dashboard_kurzbz: _name,
+								dashboard_kurzbz,
 								beschreibung: ''
 							};
 							this.dashboards.push(newDashboard);
 							this.current = newDashboard.dashboard_id;
 						})
 						.catch(this.$fhcAlert.handleSystemError);
-					});
+				});
 		},
 		dashboardUpdate(dashboard) {
-			return this.$api
+			this.$api
 				.call(ApiDashboardBoard.update(dashboard))
 				.then(response => {
-
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
@@ -69,10 +68,11 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			return this.$api
+			this.$api
 				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
 					this.current = -1;
 					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
 				})
@@ -90,37 +90,100 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `<div class="dashboard-admin">
-
+	template: /* html */`
+	<div class="dashboard-admin">
 		<div class="input-group">
-			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
-			<select id="dashboard-select" class="form-select" v-model="current">
-				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
+			<label for="dashboard-select" class="input-group-text">
+				Dashboard:
+			</label>
+			<select id="dashboard-select" v-model="current" class="form-select">
+				<option
+					v-for="dashboard in dashboards"
+					:key="dashboard.dashboard_id"
+					:value="dashboard.dashboard_id"
+				>{{ dashboard.dashboard_kurzbz }}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
+			<button
+				class="btn btn-outline-secondary"
+				type="button"
+				@click="dashboardAdd"
+			><i class="fa-solid fa-plus"></i></button>
 		</div>
 
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
+					<button
+						id="edit-tab"
+						class="nav-link"
+						data-bs-toggle="tab"
+						data-bs-target="#edit"
+						type="button"
+						role="tab"
+						aria-controls="edit"
+						aria-selected="false"
+					>{{ this.$p.t('ui', 'bearbeiten') }}</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
+					<button
+						id="widgets-tab"
+						class="nav-link active"
+						data-bs-toggle="tab"
+						data-bs-target="#widgets"
+						type="button"
+						role="tab"
+						aria-controls="widgets"
+						aria-selected="true"
+					>Widgets</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="presets-tab" data-bs-toggle="tab" data-bs-target="#presets" type="button" role="tab" aria-controls="presets" aria-selected="false">Presets</button>
+					<button
+						class="nav-link"
+						id="presets-tab"
+						data-bs-toggle="tab"
+						data-bs-target="#presets"
+						type="button"
+						role="tab"
+						aria-controls="presets"
+						aria-selected="false"
+					>Presets</button>
 				</li>
 			</ul>
 			<div class="tab-content pt-3">
-				<div class="tab-pane fade" id="edit" role="tabpanel" aria-labelledby="edit-tab">
-					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
+				<div
+					id="edit"
+					class="tab-pane fade"
+					role="tabpanel"
+					aria-labelledby="edit-tab"
+				>
+					<dashboard-admin-edit
+						v-bind="dashboard"
+						@change="dashboardUpdate($event)"
+						@delete="dashboardDelete($event)"
+					></dashboard-admin-edit>
 				</div>
-				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
-					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+				<div
+					id="widgets"
+					class="tab-pane fade show active"
+					role="tabpanel"
+					aria-labelledby="widgets-tab"
+				>
+					<dashboard-admin-widgets
+						:dashboard_id="dashboard.dashboard_id"
+						:widgets="widgets"
+						@assign-widgets="assignWidgets"
+					></dashboard-admin-widgets>
 				</div>
-				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
-					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>
+				<div
+					id="presets"
+					class="tab-pane fade"
+					role="tabpanel"
+					aria-labelledby="presets-tab"
+				>
+					<dashboard-admin-presets
+						:dashboard="dashboard.dashboard_kurzbz"
+						:widgets="widgets"
+					></dashboard-admin-presets>
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
index c40d91183..aea461f1d 100644
--- a/public/js/components/Dashboard/Admin/Edit.js
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -1,15 +1,15 @@
 import BsConfirm from '../../Bootstrap/Confirm.js';
 
 export default {
-	emits: [
-		"change",
-		"delete"
-	],
 	props: {
 		dashboard_id: Number,
 		dashboard_kurzbz: String,
 		beschreibung: String
 	},
+	emits: [
+		"change",
+		"delete"
+	],
 	data() {
 		return {
 			kurzbz: this.dashboard_kurzbz,
@@ -18,22 +18,43 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
-				.then(() => this.$emit('delete', this.dashboard_id)).catch();
+			BsConfirm
+				.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id))
+				.catch();
 		}
 	},
-	template: `<div class="dashboard-admin-edit px-3">
+	template: /* html */`
+	<div class="dashboard-admin-edit px-3">
 		<div class="mb-3">
 			<label for="dashboard-admin-edit-kurzbz">Kurz Bezeichnung</label>
-			<input id="dashboard-admin-edit-kurzbz" type="text" class="form-control" v-model="kurzbz">
+			<input
+				id="dashboard-admin-edit-kurzbz"
+				v-model="kurzbz"
+				type="text"
+				class="form-control"
+			>
 		</div>
 		<div class="mb-3">
 			<label for="dashboard-admin-edit-beschreibung">Beschreibung</label>
-			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
+			<textarea
+				id="dashboard-admin-edit-beschreibung"
+				v-model="desc"
+				class="form-control"
+			></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
-			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
+			<button class="btn btn-danger" @click="sendDelete">
+				{{ this.$p.t('ui', 'loeschen') }}
+			</button>
+			<button
+				class="btn btn-primary"
+				@click="$emit('change', {
+					dashboard_id
+					dashboard_kurzbz: kurzbz,
+					beschreibung: desc
+				})"
+			>{{ this.$p.t('ui', 'btnAktualisieren') }}</button>
 		</div>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index a0c7b2139..ddf0517f9 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -1,14 +1,14 @@
 import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
 
 export default {
-	emits: [
-		"change",
-		"assignWidgets"
-	],
 	props: {
 		dashboard_id: Number,
 		widgets: Array
 	},
+	emits: [
+		"change",
+		"assignWidgets"
+	],
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
@@ -29,11 +29,27 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="dashboard-admin-widgets">
-		<div v-for="widget in widgets" :key="widget.widget_id" class="form-check form-switch">
-			<input class="form-check-input" type="checkbox" role="switch" :id="'dashboard-admin-widgets-' + widget.widget_id" v-model="widget.allowed" @input.prevent="sendChange(widget.widget_id)">
-			<label class="form-check-label" :for="'dashboard-admin-widgets-' + widget.widget_id">{{(widget.setup && widget.setup.name) || widget.widget_kurzbz}}</label>
+		<div
+			v-for="widget in widgets"
+			:key="widget.widget_id"
+			class="form-check form-switch"
+		>
+			<input
+				:id="'dashboard-admin-widgets-' + widget.widget_id"
+				v-model="widget.allowed"
+				class="form-check-input"
+				type="checkbox"
+				role="switch"
+				@input.prevent="sendChange(widget.widget_id)"
+			>
+			<label
+				class="form-check-label"
+				:for="'dashboard-admin-widgets-' + widget.widget_id"
+			>
+				{{ (widget.setup && widget.setup.name) || widget.widget_kurzbz }}
+			</label>
 		</div>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index f9fff9925..d715db15a 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -35,7 +35,7 @@ export default {
 	},
 	provide() {
 		return {
-			editMode: Vue.computed(()=>this.editMode),
+			editMode: Vue.computed(() => this.editMode),
 			widgetsSetup: Vue.computed(() => this.widgetsSetup)
 		}
 	},
@@ -152,13 +152,28 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="core-dashboard">
 		<h3>
 			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
-			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
+			<button
+				class="btn ms-2"
+				aria-label="edit dashboard"
+				v-tooltip="{ showDelay: 1000, value: 'edit dashboard' }"
+				@click="editMode = !editMode"
+			><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
+		<dashboard-section
+			name="general"
+			:seperator="0"
+			:widgets="widgets"
+			@widget-add="widgetAdd"
+			@widget-update="widgetUpdate"
+			@widget-remove="widgetRemove"
+		></dashboard-section>
+		<dashboard-widget-picker
+			ref="widgetpicker"
+			:widgets="widgetsSetup"
+		></dashboard-widget-picker>
 	</div>`
 }

From 9a113e2993f697df3b0afac52deb118628c84caa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 09:35:17 +0200
Subject: [PATCH 129/189] remove prop that is not needed anymore

---
 public/js/components/Dashboard/Dashboard.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index d715db15a..4185210ab 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -165,7 +165,6 @@ export default {
 		</h3>
 		<dashboard-section
 			name="general"
-			:seperator="0"
 			:widgets="widgets"
 			@widget-add="widgetAdd"
 			@widget-update="widgetUpdate"

From 6c2820f90034e9b5aa3a8c3905203956589bfe23 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 11:19:36 +0200
Subject: [PATCH 130/189] minor fix

---
 public/js/apps/Dashboard/Fhc.js      | 8 ++++++++
 public/js/components/Cis/Cms/News.js | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index c9c81cddb..5d8686c72 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -234,10 +234,18 @@ const app = Vue.createApp({
 	}),
 	components: {},
 	inject: ["isMobile"],
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		},
+	},
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
+			isMobile: this.isMobile,
 		}	
 	},
 	methods: {
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index bc800094a..edf700db5 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -105,7 +105,7 @@ export default {
 			});
 	},
 	template: /*html*/ `
-	<div :class="{'overflow-y-scroll pb-3': isMobile}" class="overflow-x-hidden">
+	<div :class="{'pb-3': isMobile}" class="overflow-x-hidden">
   		<h2 ref="newsPageHeading" class="fhc-primary-color">News</h2>
 		<hr/>
 		<pagination

From fac320bfcef688c0d8e46011e9a4a1244046b8ab Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 11:20:38 +0200
Subject: [PATCH 131/189] minor fix

---
 public/js/apps/Dashboard/Fhc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 5d8686c72..9c55b5f17 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -233,7 +233,6 @@ const app = Vue.createApp({
 		renderers: null,
 	}),
 	components: {},
-	inject: ["isMobile"],
 	computed: {
 		isMobile() {
 			const smallScreen = window.matchMedia("(max-width: 767px)").matches;

From 2f1edfeeab733e171c3f66cf98df296e6ce214b3 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 11:21:50 +0200
Subject: [PATCH 132/189] minor fix

---
 public/js/apps/Dashboard/Fhc.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index c9c81cddb..956af1a94 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -232,12 +232,19 @@ const app = Vue.createApp({
 		appSideMenuEntries: {},
 		renderers: null,
 	}),
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		},
+	},
 	components: {},
-	inject: ["isMobile"],
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
+			isMobile: this.isMobile,
 		}	
 	},
 	methods: {

From b90dabeb2c9aa661b6d49bf9d75400e8975d3a96 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 11:23:17 +0200
Subject: [PATCH 133/189] minor fix

---
 public/js/apps/Dashboard/Fhc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 956af1a94..9c55b5f17 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -232,6 +232,7 @@ const app = Vue.createApp({
 		appSideMenuEntries: {},
 		renderers: null,
 	}),
+	components: {},
 	computed: {
 		isMobile() {
 			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
@@ -239,7 +240,6 @@ const app = Vue.createApp({
 			return smallScreen;// && touchCapable;
 		},
 	},
-	components: {},
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),

From 79b5defb6372b4e6ca65bf007b4baef4ccae936f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 13:37:53 +0200
Subject: [PATCH 134/189] accidentially deleted a colon in
 89e0326435582415585ea4e73371d425b38869b7

---
 public/js/components/Dashboard/Admin/Edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
index aea461f1d..426dea7b0 100644
--- a/public/js/components/Dashboard/Admin/Edit.js
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -50,7 +50,7 @@ export default {
 			<button
 				class="btn btn-primary"
 				@click="$emit('change', {
-					dashboard_id
+					dashboard_id,
 					dashboard_kurzbz: kurzbz,
 					beschreibung: desc
 				})"

From 21065a3c9523d631fbdf2fb9005a6f91900d1c80 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 13:47:08 +0200
Subject: [PATCH 135/189] because of 4ab90567003cb9d564c7236930156829db395380
 pinned property can't be deleted (will get overwritten by the original value)
 so work around that with boolean values that are later removed if false

---
 .../js/components/Dashboard/Admin/Presets.js  |  6 ++++++
 public/js/components/Dashboard/Dashboard.js   |  6 ++++++
 public/js/components/Dashboard/Item.js        |  4 ++--
 public/js/components/Dashboard/Section.js     | 19 ++++++++++---------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 4b0c9f7ea..63e8b99e0 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -86,6 +86,12 @@ export default {
 						break;
 					}
 				}
+				if (payload[k].place) {
+					Object.values(payload[k].place).forEach(place => {
+						if (place.pinned === false)
+							delete place.pinned;
+					});
+				}
 				payload[k].widgetid = k;
 			}
 			this.$api
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 4185210ab..64d4de71d 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -74,6 +74,12 @@ export default {
 						break;
 					}
 				}
+				if (payload[k].place) {
+					Object.values(payload[k].place).forEach(place => {
+						if (place.pinned === false)
+							delete place.pinned;
+					});
+				}
 				payload[k].widgetid = k;
 			}
 			this.$api
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 00951cdd5..4a7333591 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -118,11 +118,11 @@ export default {
 			// Unpinning is only possible in edit mode
 			if (!this.editMode)
 				return;
-			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			let result = { item: this.item_data, pinned: false };
 			this.$emit('unPinItem', [result]);
 		},
 		pinItem() {
-			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			let result = { item: this.item_data, pinned: true };
 			this.$emit('pinItem', [result]);
 		},
 		getWidgetC4Link(widget) {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index c2342e7d6..b01658182 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -155,20 +155,22 @@ export default {
 			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
-		updatePositions(updated, pinned=false) {
+		updatePositions(updated) {
 			let result = {};
 			updated.forEach(update => {
-				
 				let item = structuredClone(ObjectUtils.deepToRaw(update.item));
+
 				if (!item.placeholder) {
 					if (!item.place[this.gridWidth])
-						item.place[this.gridWidth] = {x: 0, y: 0, w: 1, h: 1};
+						item.place[this.gridWidth] = { x: 0, y: 0, w: 1, h: 1 };
+					
 					delete item.x;
 					delete item.y;
 					delete item.w;
 					delete item.h;
-					delete item.place[this.gridWidth].pinned;
+					delete item.pinned;
 					delete item.weight;
+
 					if (update.x !== undefined)
 						item.place[this.gridWidth].x = update.x;
 					if (update.y !== undefined)
@@ -177,9 +179,8 @@ export default {
 						item.place[this.gridWidth].w = update.w;
 					if (update.h !== undefined)
 						item.place[this.gridWidth].h = update.h;
-					if (pinned) {
-						item.place[this.gridWidth].pinned = true;
-					}
+					if (update.pinned !== undefined)
+						item.place[this.gridWidth].pinned = update.pinned;
 
 					result[item.id] = item;
 				}
@@ -250,8 +251,8 @@ export default {
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
 					@config-closed="handleConfigClosed"
-					@pinItem="updatePositions($event,true)"
-					@unPinItem="updatePositions"
+					@pin-item="updatePositions"
+					@un-pin-item="updatePositions"
 				></dashboard-item>
 			</template>
 		</drop-grid>

From dbf945dfe54dcd1d563aad41c0d4da808930d1dc Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 13:48:49 +0200
Subject: [PATCH 136/189] Comments for GridLogic

---
 public/js/composables/GridLogic.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index ea4abb1db..d03e9e9ba 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -1,4 +1,10 @@
-// TODO(chris): Comments
+/**
+ * This class arranges rectangular items on a grid with a defined width and
+ * a potential infinite height. It calculates repositioning of already placed
+ * items if a new item would overlap one or more of said placed items.
+ * This can be manipulated by adding weights to the items or by defining an
+ * item as pinned.
+ */
 
 const DIR_UP = 0;
 const DIR_LEFT = 1;

From 38ea4811774465ca8824f1843dbd0cc7f21cdd5c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 21 Apr 2026 13:49:39 +0200
Subject: [PATCH 137/189] add safety measures to add function of GridLogic

---
 public/js/composables/GridLogic.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index d03e9e9ba..c5bc99597 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -44,6 +44,8 @@ class GridLogic {
 		return freeSlots;
 	}
 	add(item, prefer) {
+		if (!item.frame)
+			item.frame = this.getItemFrame(item);
 		let occupiers = this.getItemsInFrame(item.frame);
 		if (!occupiers.length) {
 			item.frame.forEach(f => this.grid[f] = item.index);

From 999827b3ecdce3661c05187e8bd1f0a4b557871b Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 15:49:51 +0200
Subject: [PATCH 138/189] in mobile replacing lvplan weekview with listview

---
 public/js/apps/Dashboard/Fhc.js               |  9 ++---
 public/js/components/Calendar/LvPlan.js       | 36 ++++++++++++++-----
 public/js/components/Calendar/Mode/List.js    |  2 +-
 .../Cis/LvPlan/Lehrveranstaltung.js           | 13 +++++--
 public/js/components/Cis/LvPlan/LvPlan.js     |  7 ++--
 public/js/components/Cis/LvPlan/Personal.js   | 13 +++++--
 .../js/components/Cis/Mylv/RoomInformation.js |  7 ++--
 7 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 140c76402..97d3a37c8 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -11,7 +11,7 @@ import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO_DESKTOP, DEFAULT_MODE_RAUMINFO_MOBILE} from "../../components/Cis/Mylv/RoomInformation.js";
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
@@ -23,6 +23,7 @@ import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+const isMobile = window.matchMedia("(max-width: 767px)").matches;
 
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
@@ -85,7 +86,7 @@ const router = VueRouter.createRouter({
 					name: "RoomInformation",
 					params: { // in this case always populate other params since they are not optional
 						ort_kurzbz: to.params.ort_kurzbz,
-						mode: DEFAULT_MODE_RAUMINFO,
+						mode: isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP,
 						focus_date: new Date().toISOString().split("T")[0]
 					},
 				};
@@ -102,7 +103,7 @@ const router = VueRouter.createRouter({
 				const mode = route.params.mode &&
 				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
 					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-					: DEFAULT_MODE_RAUMINFO;
+					: (isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP);
 
 				// default to today date if not provided
 				const d = new Date(route.params.focus_date)
@@ -124,7 +125,7 @@ const router = VueRouter.createRouter({
 					next({
 						name: "RoomInformation",
 						params: {
-							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
+							mode: to.params.mode || (isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP),
 							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
 							ort_kurzbz: route.params.ort_kurzbz
 						}
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index e0e918f01..d03e06171 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -7,6 +7,7 @@ import { useEventLoader } from '../../composables/EventLoader.js';
 import ModeDay from './Mode/Day.js';
 import ModeWeek from './Mode/Week.js';
 import ModeMonth from './Mode/Month.js';
+import ModeList from './Mode/List.js';
 
 export default {
 	name: "CalendarLvPlan",
@@ -14,7 +15,8 @@ export default {
 		FhcCalendar
 	},
 	inject: [
-		"renderers"
+		"renderers",
+		"isMobile",
 	],
 	props: {
 		timezone: {
@@ -27,7 +29,7 @@ export default {
 		},
 		mode: {
 			type: String,
-			default: 'Week'
+			default: 'Day'
 		},
 		getPromiseFunc: {
 			type: Function,
@@ -41,11 +43,6 @@ export default {
 	],
 	data() {
 		return {
-			modes: {
-				day: Vue.markRaw(ModeDay),
-				week: Vue.markRaw(ModeWeek),
-				month: Vue.markRaw(ModeMonth)
-			},
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
@@ -53,6 +50,9 @@ export default {
 				},
 				week: {
 					collapseEmptyDays: false
+				},
+				list: {
+					length: 7
 				}
 			},
 			teachingunits: null
@@ -77,7 +77,20 @@ export default {
 					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
 				}
 			];
-		}
+		},
+		modes() {
+			let modes = {
+				day: Vue.markRaw(ModeDay),
+				month: Vue.markRaw(ModeMonth)
+			};
+			if (this.isMobile) {
+				modes.list = Vue.markRaw(ModeList);
+			} else {
+				modes.week = Vue.markRaw(ModeWeek);
+			}
+
+			return modes;
+		},
 	},
 	methods: {
 		eventStyle(event) {
@@ -136,6 +149,13 @@ export default {
 	>
 		<template v-slot="{ event, mode }">
 			<div
+				v-if="!event"
+				class="h-100 d-flex justify-content-center align-items-center"
+			>
+				{{ $p.t('lehre/noLvFound') }}
+			</div>
+			<div
+				v-else
 				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
 				:type="mode == 'day' ? 'button' : undefined"
  				:style="eventStyle(event)"
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
index 76acfc610..92a42a1e9 100644
--- a/public/js/components/Calendar/Mode/List.js
+++ b/public/js/components/Calendar/Mode/List.js
@@ -93,7 +93,7 @@ export default {
 	mounted() {
 		this.$emit('update:range', this.range);
 	},
-	template: `
+	template: /*html*/ `
 	<div
 		class="fhc-calendar-mode-list flex-grow-1 position-relative"
 		@cal-click-default.capture="handleClickDefaults"
diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 4364a5df4..35c92b622 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -3,7 +3,8 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-export const DEFAULT_MODE_LVPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN_MOBILE = 'List';
+export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
 
 export default {
 	name: 'LvPlanLehrveranstaltung',
@@ -19,6 +20,7 @@ export default {
 			lv: null
 		};
 	},
+	inject: ["isMobile"],
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
@@ -26,8 +28,13 @@ export default {
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
+			let validModes = ['day', 'month'];
+			validModes.push(this.isMobile ? 'list' : 'week');
+
+			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
+
+			if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
+				return defaultMode;
 			return this.propsViewData?.mode;
 		},
 		currentLv() {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index f7763c54b..b86ab0366 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -3,7 +3,8 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-export const DEFAULT_MODE_LVPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN_MOBILE = 'List';
+export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
 
 export default {
 	name: 'LvPlan',
@@ -24,12 +25,14 @@ export default {
 			lv: null
 		};
 	},
+	inject: ["isMobile"],
 	computed:{
 		currentDay() {
 			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
-			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
+			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
+			return this.propsViewData?.mode || defaultMode;
 		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
index f6fd462da..c77c6eea0 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -3,7 +3,8 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-export const DEFAULT_MODE_LVPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
+export const DEFAULT_MODE_LVPLAN_MOBILE = 'List';
 
 export default {
 	name: 'LvPlanPersonal',
@@ -24,6 +25,7 @@ export default {
 			isStudent: false
 		};
 	},
+	inject: ["isMobile"],
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
@@ -31,8 +33,13 @@ export default {
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
+			let validModes = ['day', 'month'];
+			validModes.push(this.isMobile ? 'list' : 'week');
+
+			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
+
+			if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
+				return defaultMode;
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 2dd3d518d..ac4c57a77 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -2,7 +2,8 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
-export const DEFAULT_MODE_RAUMINFO = 'Week'
+export const DEFAULT_MODE_RAUMINFO_MOBILE = 'List';
+export const DEFAULT_MODE_RAUMINFO_DESKTOP = 'Week';
 
 export default {
 	name: "RoomInformation",
@@ -13,12 +14,14 @@ export default {
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
+	inject: ["isMobile"],
 	computed: {
 		currentDay() {
 			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
-			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
+			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
+			return this.propsViewData?.mode || defaultMode;
 		}
 	},
 	methods:{

From b41c8acddd697efb08ad10da39db775b3be4e8f1 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 16:04:30 +0200
Subject: [PATCH 139/189] adapted other/stgorg lvplans to mobile view changes

---
 .../js/components/Cis/LvPlan/OtherLvPlan.js   | 379 +++++++++---------
 public/js/components/Cis/LvPlan/Personal.js   | 163 +++++---
 public/js/components/Cis/LvPlan/StgOrg.js     | 278 ++++++++-----
 3 files changed, 484 insertions(+), 336 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/OtherLvPlan.js b/public/js/components/Cis/LvPlan/OtherLvPlan.js
index f4948ca50..c932c5338 100644
--- a/public/js/components/Cis/LvPlan/OtherLvPlan.js
+++ b/public/js/components/Cis/LvPlan/OtherLvPlan.js
@@ -6,199 +6,212 @@ import ApiLvPlan from "../.././../api/factory/lvPlan.js";
 import ApiOtherLvPlan from "../.././../api/factory/otherLvPlan.js";
 import ApiAuthinfo from "../../../api/factory/authinfo.js";
 
-export const DEFAULT_MODE_LVPLAN = "Week";
+export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
+export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
 
 export default {
-  name: "OtherLvPlan",
-  components: {
-    FormForm,
-    FormInput,
-    FhcCalendar,
-  },
-  props: {
-    viewData: Object,
-    propsViewData: Object,
-  },
-  data() {
-    return {
-      localProps: {},
-      studiensemester_kurzbz: null,
-      studiensemester_start: null,
-      studiensemester_ende: null,
-      isOtherPersonMitarbeiter: false,
-      isOtherPersonStudent: false,
-      currentStgBezeichnung: null,
-      listVerband: [],
-      listGroup: [],
-      rangeIntervalFirst: null,
-      otherPersonData: {
-        fullName: "",
-        photo: "",
-      },
-    };
-  },
-  computed: {
-    currentDay() {
-      if (
-        !this.propsViewData?.focus_date ||
-        isNaN(new Date(this.propsViewData?.focus_date))
-      )
-        return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-      return this.propsViewData?.focus_date;
-    },
-    currentMode() {
-      if (
-        !this.propsViewData?.mode ||
-        !["day", "week", "month"].includes(
-          this.propsViewData?.mode.toLowerCase(),
-        )
-      )
-        return DEFAULT_MODE_LVPLAN;
-      return this.propsViewData?.mode;
-    },
-    downloadLinks() {
-      if (
-        !this.studiensemester_start ||
-        !this.studiensemester_ende ||
-        !this.propsViewData.otherUid
-      )
-        return false;
+	name: "OtherLvPlan",
+	components: {
+		FormForm,
+		FormInput,
+		FhcCalendar,
+	},
+	props: {
+		viewData: Object,
+		propsViewData: Object,
+	},
+	data() {
+		return {
+			localProps: {},
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			isOtherPersonMitarbeiter: false,
+			isOtherPersonStudent: false,
+			currentStgBezeichnung: null,
+			listVerband: [],
+			listGroup: [],
+			rangeIntervalFirst: null,
+			otherPersonData: {
+				fullName: "",
+				photo: "",
+			},
+		};
+	},
+	inject: ["isMobile"],
+	computed: {
+		currentDay() {
+			if (
+				!this.propsViewData?.focus_date ||
+				isNaN(new Date(this.propsViewData?.focus_date))
+			)
+				return luxon.DateTime.now()
+					.setZone(this.viewData.timezone)
+					.toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			let validModes = ["day", "month"];
+			validModes.push(this.isMobile ? "list" : "week");
 
-      const type = this.isOtherPersonStudent
-        ? "student"
-        : this.isOtherPersonMitarbeiter
-          ? "lektor"
-          : null;
+			const defaultMode = this.isMobile
+				? DEFAULT_MODE_LVPLAN_MOBILE
+				: DEFAULT_MODE_LVPLAN_DESKTOP;
 
-      if (!type) return;
+			if (
+				!this.propsViewData?.mode ||
+				!validModes.includes(this.propsViewData?.mode.toLowerCase())
+			)
+				return defaultMode;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (
+				!this.studiensemester_start ||
+				!this.studiensemester_ende ||
+				!this.propsViewData.otherUid
+			)
+				return false;
 
-      const opts = { zone: this.viewData.timezone };
-      const start = luxon.DateTime.fromISO(
-        this.studiensemester_start,
-        opts,
-      ).toUnixInteger();
-      const ende = luxon.DateTime.fromISO(
-        this.studiensemester_ende,
-        opts,
-      ).toUnixInteger();
+			const type = this.isOtherPersonStudent
+				? "student"
+				: this.isOtherPersonMitarbeiter
+					? "lektor"
+					: null;
 
-      const download_link =
-        FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        "cis/private/lvplan/stpl_kalender.php" +
-        "?type=" +
-        type +
-        "&pers_uid=" +
-        this.propsViewData.otherUid +
-        "&begin=" +
-        start +
-        "&ende=" +
-        ende;
+			if (!type) return;
 
-      return [
-        {
-          title: "excel",
-          icon: "fa-solid fa-file-excel",
-          link: download_link + "&format=excel",
-        },
-        {
-          title: "csv",
-          icon: "fa-solid fa-file-csv",
-          link: download_link + "&format=csv",
-        },
-        {
-          title: "ical1",
-          icon: "fa-regular fa-calendar",
-          link: download_link + "&format=ical&version=1&target=ical",
-        },
-        {
-          title: "ical2",
-          icon: "fa-regular fa-calendar",
-          link: download_link + "&format=ical&version=2&target=ical",
-        },
-      ];
-    },
-    get_image_base64_src: function () {
-      if (!this.otherPersonData.photo?.length) {
-        return "";
-      }
-      return "data:image/jpeg;base64," + this.otherPersonData.photo;
-    },
-  },
-  watch: {
-    "propsViewData.otherUid": {
-      handler() {
-        this.$router.go();
-      },
-    },
-  },
-  methods: {
-    handleChangeDate(day, newMode) {
-      return this.handleChangeMode(newMode, day);
-    },
-    handleChangeMode(newMode, day) {
-      const mode = newMode[0].toUpperCase() + newMode.slice(1);
-      const focus_date = day.toISODate();
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime.fromISO(
+				this.studiensemester_start,
+				opts,
+			).toUnixInteger();
+			const ende = luxon.DateTime.fromISO(
+				this.studiensemester_ende,
+				opts,
+			).toUnixInteger();
 
-      this.$router.push({
-        name: "OtherLvPlan",
-        params: {
-          mode,
-          focus_date,
-        },
-      });
-    },
-    updateRange(rangeInterval) {
-      this.$api
-        .call(
-          ApiLvPlan.studiensemesterDateInterval(
-            rangeInterval.end.startOf("week").toISODate(),
-          ),
-        )
-        .then((res) => {
-          this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
-          this.studiensemester_start = res.data.start;
-          this.studiensemester_ende = res.data.ende;
-        });
-    },
-    getPromiseFunc(start, end) {
-      return [
-        this.$api.call(
-          ApiLvPlan.eventsPersonal(
-            start.toISODate(),
-            end.toISODate(),
-            this.propsViewData.otherUid,
-          ),
-        ),
-        this.$api.call(
-          ApiLvPlan.getLvPlanReservierungen(
-            start.toISODate(),
-            end.toISODate(),
-            this.propsViewData.otherUid,
-          ),
-        ),
-      ];
-    },
-  },
-  async created() {
-    const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
-    const authId = authInfoResponse.data.uid;
-    if (authId === this.propsViewData.otherUid) {
-      this.$router.push({ name: "MyLvPlan" });
-    }
+			const download_link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cis/private/lvplan/stpl_kalender.php" +
+				"?type=" +
+				type +
+				"&pers_uid=" +
+				this.propsViewData.otherUid +
+				"&begin=" +
+				start +
+				"&ende=" +
+				ende;
 
-    const userDataResponse = await this.$api.call(
-      ApiOtherLvPlan.getBasicUserAttributesForLvPlanDisplay(
-        this.propsViewData.otherUid,
-      ),
-    );
+			return [
+				{
+					title: "excel",
+					icon: "fa-solid fa-file-excel",
+					link: download_link + "&format=excel",
+				},
+				{
+					title: "csv",
+					icon: "fa-solid fa-file-csv",
+					link: download_link + "&format=csv",
+				},
+				{
+					title: "ical1",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=1&target=ical",
+				},
+				{
+					title: "ical2",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=2&target=ical",
+				},
+			];
+		},
+		get_image_base64_src: function () {
+			if (!this.otherPersonData.photo?.length) {
+				return "";
+			}
+			return "data:image/jpeg;base64," + this.otherPersonData.photo;
+		},
+	},
+	watch: {
+		"propsViewData.otherUid": {
+			handler() {
+				this.$router.go();
+			},
+		},
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
+			const focus_date = day.toISODate();
 
-    const userData = userDataResponse.data;
-    this.isOtherPersonMitarbeiter = !!userData.is_mitarbeiter;
-    this.isOtherPersonStudent = !!userData.is_student;
-    this.otherPersonData.fullName = userData.vorname + " " + userData.nachname;
-    this.otherPersonData.photo = userData.foto;
-  },
-  template: `
+			this.$router.push({
+				name: "OtherLvPlan",
+				params: {
+					mode,
+					focus_date,
+				},
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(
+					ApiLvPlan.studiensemesterDateInterval(
+						rangeInterval.end.startOf("week").toISODate(),
+					),
+				)
+				.then((res) => {
+					this.studiensemester_kurzbz =
+						res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(
+					ApiLvPlan.eventsPersonal(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+				this.$api.call(
+					ApiLvPlan.getLvPlanReservierungen(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+			];
+		},
+	},
+	async created() {
+		const authInfoResponse = await this.$api.call(
+			ApiAuthinfo.getAuthInfo(),
+		);
+		const authId = authInfoResponse.data.uid;
+		if (authId === this.propsViewData.otherUid) {
+			this.$router.push({ name: "MyLvPlan" });
+		}
+
+		const userDataResponse = await this.$api.call(
+			ApiOtherLvPlan.getBasicUserAttributesForLvPlanDisplay(
+				this.propsViewData.otherUid,
+			),
+		);
+
+		const userData = userDataResponse.data;
+		this.isOtherPersonMitarbeiter = !!userData.is_mitarbeiter;
+		this.isOtherPersonStudent = !!userData.is_student;
+		this.otherPersonData.fullName =
+			userData.vorname + " " + userData.nachname;
+		this.otherPersonData.photo = userData.foto;
+	},
+	template: `
     <div class="d-flex flex-column h-100">
         <h2>
             <div class="d-flex flex-row justify-content-between align-items-center">
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
index c77c6eea0..e0adc6ae7 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -1,19 +1,19 @@
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiAuthinfo from '../../../api/factory/authinfo.js';
+import ApiLvPlan from "../../../api/factory/lvPlan.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
 
-export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
-export const DEFAULT_MODE_LVPLAN_MOBILE = 'List';
+export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
+export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
 
 export default {
-	name: 'LvPlanPersonal',
+	name: "LvPlanPersonal",
 	components: {
-		FhcCalendar
+		FhcCalendar,
 	},
 	props: {
 		viewData: Object, // NOTE(chris): this is inherited from router-view
-		propsViewData: Object
+		propsViewData: Object,
 	},
 	data() {
 		return {
@@ -22,105 +22,152 @@ export default {
 			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
-			isStudent: false
+			isStudent: false,
 		};
 	},
 	inject: ["isMobile"],
-	computed:{
+	computed: {
 		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			if (
+				!this.propsViewData?.focus_date ||
+				isNaN(new Date(this.propsViewData?.focus_date))
+			)
+				return luxon.DateTime.now()
+					.setZone(this.viewData.timezone)
+					.toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			let validModes = ['day', 'month'];
-			validModes.push(this.isMobile ? 'list' : 'week');
+			let validModes = ["day", "month"];
+			validModes.push(this.isMobile ? "list" : "week");
 
-			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
+			const defaultMode = this.isMobile
+				? DEFAULT_MODE_LVPLAN_MOBILE
+				: DEFAULT_MODE_LVPLAN_DESKTOP;
 
-			if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
+			if (
+				!this.propsViewData?.mode ||
+				!validModes.includes(this.propsViewData?.mode.toLowerCase())
+			)
 				return defaultMode;
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
-			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+			if (
+				!this.studiensemester_start ||
+				!this.studiensemester_ende ||
+				!this.uid
+			)
 				return false;
 
 			let type = false;
-			type = this.isStudent ? 'student' : type;
-			type = this.isMitarbeiter ? 'lektor' : type;
-			if (false === type)
-			{
+			type = this.isStudent ? "student" : type;
+			type = this.isMitarbeiter ? "lektor" : type;
+			if (false === type) {
 				return;
 			}
 
 			const opts = { zone: this.viewData.timezone };
-			const start = luxon.DateTime
-				.fromISO(this.studiensemester_start, opts)
-				.toUnixInteger();
-			const ende = luxon.DateTime
-				.fromISO(this.studiensemester_ende, opts)
-				.toUnixInteger();
+			const start = luxon.DateTime.fromISO(
+				this.studiensemester_start,
+				opts,
+			).toUnixInteger();
+			const ende = luxon.DateTime.fromISO(
+				this.studiensemester_ende,
+				opts,
+			).toUnixInteger();
 
-			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=' + type
-				+ '&pers_uid=' + this.uid
-				+ '&begin=' + start
-				+ '&ende=' + ende;
+			const download_link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cis/private/lvplan/stpl_kalender.php" +
+				"?type=" +
+				type +
+				"&pers_uid=" +
+				this.uid +
+				"&begin=" +
+				start +
+				"&ende=" +
+				ende;
 
 			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+				{
+					title: "excel",
+					icon: "fa-solid fa-file-excel",
+					link: download_link + "&format=excel",
+				},
+				{
+					title: "csv",
+					icon: "fa-solid fa-file-csv",
+					link: download_link + "&format=csv",
+				},
+				{
+					title: "ical1",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=1&target=ical",
+				},
+				{
+					title: "ical2",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=2&target=ical",
+				},
 			];
-		}
+		},
 	},
 	methods: {
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
 		},
 		handleChangeMode(newMode, day) {
-			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
 			const focus_date = day.toISODate();
-			
+
 			this.$router.push({
 				name: "MyLvPlan",
 				params: {
 					mode,
-					focus_date
-				}
+					focus_date,
+				},
 			});
 		},
 		updateRange(rangeInterval) {
 			this.$api
-				.call(ApiLvPlan.studiensemesterDateInterval(
-					rangeInterval.end.startOf('week').toISODate()
-				))
-				.then(res => {
-					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+				.call(
+					ApiLvPlan.studiensemesterDateInterval(
+						rangeInterval.end.startOf("week").toISODate(),
+					),
+				)
+				.then((res) => {
+					this.studiensemester_kurzbz =
+						res.data.studiensemester_kurzbz;
 					this.studiensemester_start = res.data.start;
 					this.studiensemester_ende = res.data.ende;
 				});
 		},
 		getPromiseFunc(start, end) {
 			return [
-				this.$api.call(ApiLvPlan.eventsPersonal(start.toISODate(), end.toISODate())),
-				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+				this.$api.call(
+					ApiLvPlan.eventsPersonal(
+						start.toISODate(),
+						end.toISODate(),
+					),
+				),
+				this.$api.call(
+					ApiLvPlan.getLvPlanReservierungen(
+						start.toISODate(),
+						end.toISODate(),
+					),
+				),
 			];
-		}
+		},
 	},
 	created() {
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
+		this.$api.call(ApiAuthinfo.getAuthInfo()).then((res) => {
+			this.uid = res.data.uid;
+			this.isMitarbeiter = res.data.isMitarbeiter;
+			this.isStudent = res.data.isStudent;
+		});
 	},
-	template: /*html*/`
+	template: /*html*/ `
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
 		<h2>
 			{{ $p.t('lehre/stundenplan') }}
@@ -158,5 +205,5 @@ export default {
 				</div>
 			</div>
 		</fhc-calendar>
-	</div>`
+	</div>`,
 };
diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js
index f6bc51c12..08bec3674 100644
--- a/public/js/components/Cis/LvPlan/StgOrg.js
+++ b/public/js/components/Cis/LvPlan/StgOrg.js
@@ -1,14 +1,15 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
+import FormForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
 import FhcCalendar from "../../Calendar/LvPlan.js";
 
-import ApiLvPlan from '../.././../api/factory/lvPlan.js';
-import ApiAuthinfo from '../../../api/factory/authinfo.js';
+import ApiLvPlan from "../.././../api/factory/lvPlan.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
 
-export const DEFAULT_MODE_LVPLAN = 'Week';
+export const DEFAULT_MODE_LVPLAN_DESKTOP = "Week";
+export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
 
 export default {
-	name: 'LvPlanStgOrg',
+	name: "LvPlanStgOrg",
 	components: {
 		FormForm,
 		FormInput,
@@ -16,7 +17,7 @@ export default {
 	},
 	props: {
 		viewData: Object,
-		propsViewData: Object
+		propsViewData: Object,
 	},
 	data() {
 		return {
@@ -28,85 +29,134 @@ export default {
 			isMitarbeiter: false,
 			isStudent: false,
 			currentStgBezeichnung: null,
-			formData:  {
+			formData: {
 				stgkz: null,
 				sem: null,
 				verband: null,
 				gruppe: null,
 			},
 			listStg: [],
-			listSem: [1,2,3,4,5,6,7,8,9,10],
+			listSem: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
 			listVerband: [],
 			listGroup: [],
-			rangeIntervalFirst: null
+			rangeIntervalFirst: null,
 		};
 	},
+	inject: ["isMobile"],
 	computed: {
-		maxSemester(){
+		maxSemester() {
 			const currentStg = this.listStg.find(
-				item => item.studiengang_kz === this.formData.stgkz
+				(item) => item.studiengang_kz === this.formData.stgkz,
 			);
 			return currentStg?.max_semester;
 		},
 		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			if (
+				!this.propsViewData?.focus_date ||
+				isNaN(new Date(this.propsViewData?.focus_date))
+			)
+				return luxon.DateTime.now()
+					.setZone(this.viewData.timezone)
+					.toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
+			let validModes = ["day", "month"];
+			validModes.push(this.isMobile ? "list" : "week");
+
+			const defaultMode = this.isMobile
+				? DEFAULT_MODE_LVPLAN_MOBILE
+				: DEFAULT_MODE_LVPLAN_DESKTOP;
+
+			if (
+				!this.propsViewData?.mode ||
+				!validModes.includes(this.propsViewData?.mode.toLowerCase())
+			)
+				return defaultMode;
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
-			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+			if (
+				!this.studiensemester_start ||
+				!this.studiensemester_ende ||
+				!this.uid
+			)
 				return false;
 
 			let type = false;
-			type = this.isStudent ? 'student' : type;
-			type = this.isMitarbeiter ? 'lektor' : type;
-			if (false === type)
-			{
+			type = this.isStudent ? "student" : type;
+			type = this.isMitarbeiter ? "lektor" : type;
+			if (false === type) {
 				return;
 			}
 
 			const opts = { zone: this.viewData.timezone };
-			const start = luxon.DateTime
-				.fromISO(this.studiensemester_start, opts)
-				.toUnixInteger();
-			const ende = luxon.DateTime
-				.fromISO(this.studiensemester_ende, opts)
-				.toUnixInteger();
+			const start = luxon.DateTime.fromISO(
+				this.studiensemester_start,
+				opts,
+			).toUnixInteger();
+			const ende = luxon.DateTime.fromISO(
+				this.studiensemester_ende,
+				opts,
+			).toUnixInteger();
 
-			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=' + type
-				+ '&pers_uid=' + this.uid
-				+ '&begin=' + start
-				+ '&ende=' + ende;
+			const download_link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cis/private/lvplan/stpl_kalender.php" +
+				"?type=" +
+				type +
+				"&pers_uid=" +
+				this.uid +
+				"&begin=" +
+				start +
+				"&ende=" +
+				ende;
 
 			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+				{
+					title: "excel",
+					icon: "fa-solid fa-file-excel",
+					link: download_link + "&format=excel",
+				},
+				{
+					title: "csv",
+					icon: "fa-solid fa-file-csv",
+					link: download_link + "&format=csv",
+				},
+				{
+					title: "ical1",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=1&target=ical",
+				},
+				{
+					title: "ical2",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=2&target=ical",
+				},
 			];
-		}
+		},
 	},
 	methods: {
-		loadLvPlan(){
-			if(!this.formData.stgkz){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
+		loadLvPlan() {
+			if (!this.formData.stgkz) {
+				this.$fhcAlert.alertError(this.$p.t("LvPlan", "chooseStg"));
 				return;
 			}
 
-			if(!this.formData.sem && (this.formData.verband || this.formData.gruppe)){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
+			if (
+				!this.formData.sem &&
+				(this.formData.verband || this.formData.gruppe)
+			) {
+				this.$fhcAlert.alertError(
+					this.$p.t("LvPlan", "error_SemMissing"),
+				);
 				return;
 			}
 
-			if(!this.formData.verband && this.formData.gruppe){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
+			if (!this.formData.verband && this.formData.gruppe) {
+				this.$fhcAlert.alertError(
+					this.$p.t("LvPlan", "error_VerbandMissing"),
+				);
 				return;
 			}
 
@@ -120,18 +170,17 @@ export default {
 			};
 
 			//ensure logic: no value after a null value in route
-			if(params.sem == null)
-			{
+			if (params.sem == null) {
 				params.verband = null;
 				params.gruppe = null;
 			}
-			if(params.verband == null) {
+			if (params.verband == null) {
 				params.gruppe = null;
 			}
 
 			//delete all null values to avoid null in router
 			Object.keys(params).forEach(
-				key => params[key] == null && delete params[key]
+				(key) => params[key] == null && delete params[key],
 			);
 
 			this.$router.push({
@@ -139,37 +188,60 @@ export default {
 				params,
 			});
 
-			this.$refs['calendar'].resetEventLoader();
+			this.$refs["calendar"].resetEventLoader();
 		},
-		loadListSem(){
-			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+		loadListSem() {
+			this.listSem = [...Array(this.maxSemester).keys()].map(
+				(i) => i + 1,
+			);
 		},
-		loadListVerband(){
+		loadListVerband() {
 			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
-				.then(result => {
+				.call(
+					ApiLvPlan.getLehrverband(
+						this.formData.stgkz,
+						this.formData.semester,
+						this.formData.verband,
+					),
+				)
+				.then((result) => {
 					const data = result.data;
-					const mappedData = data.map(item => item.verband);
-					this.listVerband = [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""
-					))]
-						.sort();
+					const mappedData = data.map((item) => item.verband);
+					this.listVerband = [
+						...new Set(
+							mappedData.filter(
+								(v) =>
+									v !== null &&
+									v !== undefined &&
+									String(v).trim() !== "",
+							),
+						),
+					].sort();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadListGroup(){
+		loadListGroup() {
 			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
-				.then(result => {
+				.call(
+					ApiLvPlan.getGruppe(
+						this.formData.stgkz,
+						this.formData.semester,
+						this.formData.verband,
+					),
+				)
+				.then((result) => {
 					const data = result.data;
-					const mappedData = data.map(item => item.gruppe);
-					this.listGroup =  [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""))]
-						.sort();
+					const mappedData = data.map((item) => item.gruppe);
+					this.listGroup = [
+						...new Set(
+							mappedData.filter(
+								(v) =>
+									v !== null &&
+									v !== undefined &&
+									String(v).trim() !== "",
+							),
+						),
+					].sort();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -194,42 +266,60 @@ export default {
 		},
 		updateRange(rangeInterval) {
 			this.$api
-				.call(ApiLvPlan.studiensemesterDateInterval(
-					rangeInterval.end.startOf('week').toISODate()
-				))
-				.then(res => {
-					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+				.call(
+					ApiLvPlan.studiensemesterDateInterval(
+						rangeInterval.end.startOf("week").toISODate(),
+					),
+				)
+				.then((res) => {
+					this.studiensemester_kurzbz =
+						res.data.studiensemester_kurzbz;
 					this.studiensemester_start = res.data.start;
 					this.studiensemester_ende = res.data.ende;
 				});
 		},
 		getPromiseFunc(start, end) {
 			return [
-				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
+				this.$api.call(
+					ApiLvPlan.eventsStgOrg(
+						start,
+						end,
+						this.formData.stgkz,
+						this.formData.sem,
+						this.formData.verband,
+						this.formData.gruppe,
+					),
+				),
 			];
 		},
 	},
-	created(){
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
+	created() {
+		this.$api.call(ApiAuthinfo.getAuthInfo()).then((res) => {
+			this.uid = res.data.uid;
+			this.isMitarbeiter = res.data.isMitarbeiter;
+			this.isStudent = res.data.isStudent;
+		});
 
 		this.$api
 			.call(ApiLvPlan.getStudiengaenge())
-			.then(result => {
-				this. listStg = result.data;
+			.then((result) => {
+				this.listStg = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		if(this.propsViewData) {
-			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
-			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
-			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
-			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
+		if (this.propsViewData) {
+			this.formData.stgkz = this.propsViewData.stgkz
+				? this.propsViewData.stgkz
+				: null;
+			this.formData.sem = this.propsViewData.sem
+				? this.propsViewData.sem
+				: null;
+			this.formData.verband = this.propsViewData.verband
+				? this.propsViewData.verband
+				: null;
+			this.formData.gruppe = this.propsViewData.gruppe
+				? this.propsViewData.gruppe
+				: null;
 		}
 	},
 	template: `
@@ -331,6 +421,4 @@ export default {
 		</fhc-calendar>
 	</div>
 	`,
-
-
-};
\ No newline at end of file
+};

From 5171a7b7b343769c784894fe2ca3a423c2281f79 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Tue, 21 Apr 2026 17:22:32 +0200
Subject: [PATCH 140/189] minor fix

---
 public/js/components/Cis/LvPlan/Lehrveranstaltung.js | 2 +-
 public/js/components/Cis/LvPlan/LvPlan.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 35c92b622..2ed0bf48a 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -31,7 +31,7 @@ export default {
 			let validModes = ['day', 'month'];
 			validModes.push(this.isMobile ? 'list' : 'week');
 
-			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
+			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
 
 			if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
 				return defaultMode;
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index b86ab0366..bc332fb76 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -31,7 +31,7 @@ export default {
 			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
-			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
+			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
 			return this.propsViewData?.mode || defaultMode;
 		},
 		downloadLinks() {

From 91a5b2d4fcbc369f75c2d6ed87cad51bd1c3a7b4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 09:28:20 +0200
Subject: [PATCH 141/189] fire correct method for draganddrop cancel

---
 public/js/components/Drop/Grid.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 0fb94289a..130838065 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -502,6 +502,10 @@ export default {
 			}
 		},
 		dragCancel() {
+			if (this.mode == MODE_IDLE) {
+				return;
+			}
+
 			this.additionalRowComputed = false;
 			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0];
@@ -589,7 +593,7 @@ export default {
 				@start-move="startMove"
 				@start-resize="startResize"
 				@drag="moveGhostImage"
-				@dragend="dragEnd"
+				@dragend="dragCancel"
 			>
 				<template v-slot="item">
 					<slot

From d7e509979aa0bc7707fed234bc456e0047fa135a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 09:32:53 +0200
Subject: [PATCH 142/189] account for additionalRow prop when computing
 placeholders (missed this in 262b17024422f9d6619483afd62f337841246653)

---
 public/js/components/Drop/Grid.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 130838065..1115e6ed6 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -108,7 +108,7 @@ export default {
 		},
 		// item pipeline
 		placeholders() { // empty tiles
-			return this.grid.getFreeSlots().map((item, index) => {
+			let placeholders = this.grid.getFreeSlots().map((item, index) => {
 				return {
 					x: item.x,
 					y: item.y,
@@ -120,6 +120,22 @@ export default {
 					}
 				};
 			});
+
+			if (this.additionalRowComputed) {
+				for (var x = 0; x < this.cols; x++)
+					placeholders.push({
+						x,
+						y: this.grid.h,
+						h: 1,
+						w: 1,
+						placeholder: true,
+						data: {
+							id: 'placeholder_' + placeholders.length
+						}
+					});
+			}
+
+			return placeholders;
 		},
 		indexedItems() { // indexed
 			return this.items.map(

From 95d85c7f5be93c815e16c79669dc1d8da1a290ab Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 09:36:11 +0200
Subject: [PATCH 143/189] temporary change height on dragging if the reordering
 process needs it (otherwise we get some ugly overflow issue on the preview
 item or if another item is moved to the bottom it vanishes during the drag
 and drop operation and reappears after the drop)

---
 public/js/components/Drop/Grid.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1115e6ed6..b3f331200 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -42,6 +42,7 @@ export default {
 			mode: MODE_IDLE,
 			draggedOffset: [0, 0],
 			draggedItem: null,
+			overwriteRows: null,
 			clonedWidget: null, // ghost image
 			// tile coordinates while dragging
 			x: -1,
@@ -55,8 +56,12 @@ export default {
 		// gridlogic
 		rows() {
 			if (this.additionalRowComputed) {
+				if (this.overwriteRows !== null)
+					return this.overwriteRows + 1;
 				return this.grid ? (this.grid.h+1) : 1;
 			}
+			if (this.overwriteRows !== null)
+				return this.overwriteRows;
 			return this.grid ? this.grid.h : 1;
 		},
 		additionalRowComputed: {
@@ -470,6 +475,7 @@ export default {
 						targetCoordinates.h = this.draggedItem.h;
 
 						this.tempPositionUpdates = dragGrid.move(this.draggedItem, x, y);
+						this.overwriteRows = dragGrid.h;
 						break;
 					}
 					case MODE_RESIZE: {
@@ -491,6 +497,7 @@ export default {
 						targetCoordinates.h = h;
 
 						this.tempPositionUpdates = dragGrid.resize(this.draggedItem, w, h);
+						this.overwriteRows = dragGrid.h;
 						break;
 					}
 				}
@@ -506,6 +513,8 @@ export default {
 		},
 		_cleanupDragging() {
 			this.mode = MODE_IDLE;
+			this.overwriteRows = null;
+			
 			if (this.draggedItem) {
 				const draggedItem = this.indexedItems.find(item => item.index == this.draggedItem.index);
 				delete draggedItem.classes;

From 557135346459906447c3e8fd2e23722c52d6769c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 09:37:50 +0200
Subject: [PATCH 144/189] let items jump over pinned items (this may be
 especially relevant if pinned items trap one or more items involved in a drag
 and drop operation)

---
 public/js/composables/GridLogic.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index c5bc99597..9f5b96ba6 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -57,6 +57,14 @@ class GridLogic {
 			
 			item.frame.forEach(f => intermGrid.grid[f] = -1);
 
+			intermGrid.data.forEach(currItem => {
+				if (currItem.pinned) {
+					if (!currItem.frame)
+						currItem.frame = intermGrid.getItemFrame(currItem);
+					currItem.frame.forEach(f => intermGrid.grid[f] = -1);
+				}
+			});
+
 			const possiblities = intermGrid.tryMoving(occupiers, prefer);
 			if (possiblities.length) {
 				const bestOption = possiblities.sort((a,b) => {

From 3ab7a61a47bf06e28b532e88d30b7fa01f46472d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 10:03:13 +0200
Subject: [PATCH 145/189] handle additionalRow disabling outside Grid.js and
 recreate behavior before commit a8f680810ffaaf5e538872a402f570fb86b136d4

---
 public/js/components/Dashboard/Section.js |  9 +++++++--
 public/js/components/Drop/Grid.js         | 16 +++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index b01658182..95a6e4731 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -40,7 +40,7 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
-			additionalRow:false
+			additionalRow: false
 		};
 	},
 	provide() {
@@ -124,6 +124,11 @@ export default {
 			return placedItems.filter(item => !item.hidden);
 		}
 	},
+	watch: {
+		items() {
+			this.additionalRow = false;
+		}
+	},
 	methods: {
 		handleConfigOpened() {
 			this.configOpened = true
@@ -217,7 +222,7 @@ export default {
 		>+</button>
 		<drop-grid
 			v-model:cols="gridWidth"
-			v-model:additional-row="additionalRow"
+			:additional-row="additionalRow"
 			:items="items"
 			:items-setup="indexedWidgetsTemplates"
 			:active="editModeIsActive"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b3f331200..10fc89f12 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -29,8 +29,7 @@ export default {
 	},
 	emits: [
 		"rearrangeItems",
-		"gridHeight",
-		"update:additionalRow"
+		"gridHeight"
 	],
 	data() {
 		return {
@@ -55,7 +54,7 @@ export default {
 	computed: {
 		// gridlogic
 		rows() {
-			if (this.additionalRowComputed) {
+			if (this.additionalRow) {
 				if (this.overwriteRows !== null)
 					return this.overwriteRows + 1;
 				return this.grid ? (this.grid.h+1) : 1;
@@ -64,14 +63,6 @@ export default {
 				return this.overwriteRows;
 			return this.grid ? this.grid.h : 1;
 		},
-		additionalRowComputed: {
-			get() {
-				return this.additionalRow;
-			},
-			set(value) {
-				this.$emit('update:additionalRow', value);
-			}
-		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;
 			return {
@@ -126,7 +117,7 @@ export default {
 				};
 			});
 
-			if (this.additionalRowComputed) {
+			if (this.additionalRow) {
 				for (var x = 0; x < this.cols; x++)
 					placeholders.push({
 						x,
@@ -531,7 +522,6 @@ export default {
 				return;
 			}
 
-			this.additionalRowComputed = false;
 			this.tempPositionUpdates = null;
 			this.draggedOffset = [0,0];
 			this._cleanupDragging();

From 416451eb0b91b5a3545d51979a1603604be99f14 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 10:23:51 +0200
Subject: [PATCH 146/189] remove marginForExtraRow and add the required space
 via CSS

---
 public/css/components/dashboard.css       |  9 +++++++++
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 12 +++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 700186235..eb9f0a4b1 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -43,6 +43,15 @@
 	cursor: pointer;
 }
 
+.dashboard-section.edit-active {
+	/**
+	 * replaces margin for extra row
+	 * 10% equals 0.1 of 100%
+	 * 1rem equals the padding of pb-3 that is overwritten here
+	 */
+	padding-bottom: calc(10% / var(--fhc-dashboard-grid-size) + 1rem) !important;
+}
+
 .dashboard-section > .newGridRow {
 	position: absolute;
 	width: 20px;
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 95a6e4731..27556afcd 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -209,6 +209,7 @@ export default {
 	<div
 		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
 		ref="container"
+		:class="{ 'edit-active': editModeIsActive }"
 	>
 		<h4 v-if="adminMode" class=" mb-2">
 			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
@@ -226,7 +227,6 @@ export default {
 			:items="items"
 			:items-setup="indexedWidgetsTemplates"
 			:active="editModeIsActive"
-			:margin-for-extra-row=".01"
 			@rearrange-items="updatePositions"
 			@grid-height="gridHeight=$event"
 		>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 10fc89f12..580ac56d0 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -18,10 +18,6 @@ export default {
 			type: Boolean,
 			default: true
 		},
-		marginForExtraRow: {
-			type: Number,
-			default: 0
-		},
 		additionalRow: {
 			type: Boolean,
 			default: false
@@ -64,15 +60,14 @@ export default {
 			return this.grid ? this.grid.h : 1;
 		},
 		gridStyle() {
-			const addH = this.active ? this.marginForExtraRow : 0;
 			return {
-				'--fhc-dg-row-height': 100/(this.rows + addH) + '%',
+				'--fhc-dg-row-height': 100/this.rows + '%',
 				'--fhc-dg-col-width': 100/this.cols + '%',
 				'--fhc-dg-item-padding':
 					'var(--fhc-dg-item-py, var(--fhc-dg-item-p, .25%))' +
 					' ' +
 					'var(--fhc-dg-item-px, var(--fhc-dg-item-p, .25%))',
-				'padding-bottom': 100 * (this.rows + addH)/this.cols + '%'
+				'padding-bottom': 100 * this.rows/this.cols + '%'
 			};
 		},
 		// dragging
@@ -412,7 +407,6 @@ export default {
 				this.x = this.y = -1;
 				return false;
 			}
-			const addH = this.active ? this.marginForExtraRow : 0;
 			const rect = this.$refs.container.getBoundingClientRect();
 			
 			if (!evt.clientX && !evt.clientY && evt.touches){
@@ -423,7 +417,7 @@ export default {
 			this.clientX = (evt.clientX - rect.left);
 			this.clientY = (evt.clientY - rect.top);
 			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
-			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+			const gridY = Math.floor(this.rows * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 			
 			if (this.x == gridX && this.y == gridY)
 				return false;

From 20f043abc6c09cc3181e5a162d69f12523abad03 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 11:01:35 +0200
Subject: [PATCH 147/189] ignore additionRow when overwriteRows is active &
 only activate overwriteRows if it is bigger

---
 public/js/components/Drop/Grid.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 580ac56d0..f6bfb39f5 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -50,14 +50,15 @@ export default {
 	computed: {
 		// gridlogic
 		rows() {
-			if (this.additionalRow) {
-				if (this.overwriteRows !== null)
-					return this.overwriteRows + 1;
-				return this.grid ? (this.grid.h+1) : 1;
-			}
-			if (this.overwriteRows !== null)
+			const gridH = this.grid?.h || 1;
+
+			if (this.overwriteRows !== null && this.overwriteRows > gridH)
 				return this.overwriteRows;
-			return this.grid ? this.grid.h : 1;
+			
+			if (this.additionalRow)
+				return this.grid ? gridH + 1 : 1;
+			
+			return gridH;
 		},
 		gridStyle() {
 			return {

From 6c818e5c306a49bcf2324e0537640de6f06c8da3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 11:01:58 +0200
Subject: [PATCH 148/189] add dragClick to the additionalRow button

---
 public/js/components/Dashboard/Section.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 27556afcd..4f83436e3 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -3,6 +3,8 @@ import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
+import dragClick from '../../directives/dragClick.js';
+
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
 export default {
@@ -12,6 +14,9 @@ export default {
 		DashboardItem,
 		WidgetIcon,
 	},
+	directives: {
+		dragClick
+	},
 	inject: {
 		widgetsSetup: {
 			type: Array,
@@ -218,8 +223,9 @@ export default {
 		<button
 			v-tooltip="$p.t('dashboard','addLine')"
 			v-if="!additionalRow && editModeIsActive"
-			@click="additionalRow=true"
 			class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center"
+			@click="additionalRow=true"
+			v-drag-click="() => additionalRow=true"
 		>+</button>
 		<drop-grid
 			v-model:cols="gridWidth"

From e57846566ea48aba3e49b2e49db0188e6c36f217 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Wed, 22 Apr 2026 14:35:06 +0200
Subject: [PATCH 149/189] displaying 'compacted' events in mobile monthview lv
 plan

---
 .../js/components/Calendar/Base/Grid/Line.js  | 157 +++++++++++++-----
 public/js/components/Calendar/LvPlan.js       |   5 +
 2 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index 9a6c2f579..e5241de1d 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -1,5 +1,5 @@
-import LineEvent from './Line/Event.js';
-import LineBackground from './Line/Background.js';
+import LineEvent from "./Line/Event.js";
+import LineBackground from "./Line/Background.js";
 
 /**
  * TODO(chris):
@@ -10,54 +10,117 @@ export default {
 	name: "GridLine",
 	components: {
 		LineEvent,
-		LineBackground
-	},
-	inject: {
-		axisRow: "axisRow"
+		LineBackground,
 	},
+	inject: ["axisRow", "shouldCompactEvents"],
 	props: {
 		date: {
 			type: luxon.DateTime,
-			required: true
+			required: true,
 		},
 		start: {
 			type: luxon.DateTime,
-			required: true
+			required: true,
 		},
 		end: {
 			type: luxon.DateTime,
-			required: true
+			required: true,
 		},
 		events: {
 			type: Array,
-			default: []
+			default: [],
 		},
 		backgrounds: {
 			type: Array,
-			default: []
-		}
+			default: [],
+		},
 	},
 	computed: {
-		eventsWithRowInfo() {
-			const events = [];
-			this.events.forEach(event => {
-				const rows = [1, -1];
+		formattedEvents() {
+			let formattedEvents = this.events.map((event) => {
+				event.rows = [1, -1];
 				if (event.startsHere) {
-					rows[0] = 't_' + event.start.diff(this.date).toMillis();
+					event.rows[0] =
+						"t_" + event.start.diff(this.date).toMillis();
 				}
 				if (event.endsHere) {
-					rows[1] = 't_' + event.end.diff(this.date).toMillis();
+					event.rows[1] = "t_" + event.end.diff(this.date).toMillis();
 				}
 
-				events.push({
-					...event,
-					rows
-				});
+				return event;
 			});
-			return events;
-		}
+
+			if (this.shouldCompactEvents) {
+				formattedEvents =
+					this.compactEventsForMobileView(formattedEvents);
+			}
+
+			return formattedEvents;
+		},
 	},
-	template: /* html */`
+	methods: {
+		compactEventsForMobileView(events) {
+			let formattedEvents = events
+				.filter(
+					(event) =>
+						!["lehreinheit", "reservierung"].includes(event.type),
+				)
+				.map((event) => {
+					event.display = "default";
+					return event;
+				});
+			let eventsToBeCompacted = events.filter((event) =>
+				["lehreinheit", "reservierung"].includes(event.type),
+			);
+			let compactedEvents = [];
+
+			eventsToBeCompacted.forEach((event) => {
+				let existingCompactedEvent = compactedEvents.find(
+					(compactedEvent) =>
+						event.rows[0] === compactedEvent.rows[0] &&
+						event.rows[1] === compactedEvent.rows[1],
+				);
+
+				if (!existingCompactedEvent) {
+					compactedEvents.push({
+						events: [
+							{
+								farbe: event.orig.farbe,
+							},
+						],
+						rows: event.rows,
+					});
+				} else {
+					existingCompactedEvent.events.push({
+						farbe: event.orig.farbe,
+					});
+				}
+			});
+
+			compactedEvents.forEach((compactedEvent) => {
+				if (compactedEvent.events.length < 4) {
+					formattedEvents.push({
+						display: "compacted",
+						...compactedEvent,
+					});
+				} else {
+					formattedEvents.push({
+						display: "compacted",
+						events: compactedEvent.events.slice(0, 3),
+						rows: compactedEvent.rows,
+					});
+					formattedEvents.push({
+						display: "compactedExtra",
+						events: compactedEvent.events.slice(3),
+						rows: compactedEvent.rows,
+					});
+				}
+			});
+
+			return formattedEvents;
+		},
+	},
+	template: /* html */ `
 	<div
 		class="fhc-calendar-base-grid-line"
 		style="position:relative;display:grid;grid-auto-flow:dense"
@@ -69,17 +132,37 @@ export default {
 			:end="end"
 			:background="bg"
 		></line-background>
-		<line-event
-			v-for="(event, i) in eventsWithRowInfo"
-			:key="i"
-			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
-			:event="event"
-		>
-			<template v-slot="slot">
-				<slot name="event" v-bind="slot" />
-			</template>
-		</line-event>
+		<template v-for="(event, i) in formattedEvents" :key="i">
+			<line-event
+				v-if="!event.display || event.display === 'default'"
+				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+				:event="event"
+			>
+				<template v-slot="slot">
+					<slot name="event" v-bind="slot" />
+				</template>
+			</line-event>
+			<div
+				v-else-if="event.display === 'compacted'"
+				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+				class="d-flex flex-row justify-content-center gap-1 align-items-center"
+			>
+				<i
+					v-for="(subEvent, subEventIndex) in event.events"
+					:key="subEventIndex"
+					class="fa-solid fa-circle fa-2xs"
+					:style="subEvent.farbe ? {color: '#' + subEvent.farbe} : {}"
+				></i>
+			</div>
+			<div
+				v-else-if="event.display === 'compactedExtra'"
+				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+				class="w-100 d-flex flex-row justify-content-center"
+			>
+				{{"+" + event.events.length}}
+			</div>
+		</template>
 		<slot name="dropzone" />
 	</div>
-	`
-}
+	`,
+};
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index 9016622ee..7f96b3d2f 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -36,6 +36,11 @@ export default {
 			required: true
 		}
 	},
+	provide() {
+		return {
+			shouldCompactEvents: Vue.computed(() => this.$props.mode === "Month" && this.isMobile)
+		}
+	},
 	emits: [
 		"update:date",
 		"update:mode",

From 0751aa5a0fc842b81814b1744a43172e2955caf0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 14:36:55 +0200
Subject: [PATCH 150/189] basic semantics

---
 public/js/components/Dashboard/Item.js    | 2 +-
 public/js/components/Dashboard/Section.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 4a7333591..3655eac09 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -213,7 +213,7 @@ export default {
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
 				</Transition>
-				<span class="col mx-2 px-2">{{ widgetTemplate.setup.name }}</span>
+				<h5 class="col mx-2 px-2">{{ widgetTemplate.setup.name }}</h5>
 				<div
 					v-if="source"
 					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4f83436e3..a19f3a797 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -211,12 +211,12 @@ export default {
 		});
 	},
 	template: /* html */`
-	<div
+	<section
 		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
 		ref="container"
 		:class="{ 'edit-active': editModeIsActive }"
 	>
-		<h4 v-if="adminMode" class=" mb-2">
+		<h4 v-if="adminMode" class="mb-2">
 			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
 			{{ sectionNameTranslation }}:
 		</h4>
@@ -267,7 +267,7 @@ export default {
 				></dashboard-item>
 			</template>
 		</drop-grid>
-	</div>`
+	</section>`
 }
 
 /*

From 392cfbdc4eb60a6e9c3a80a741ca9ac43e630eec Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 15:32:10 +0200
Subject: [PATCH 151/189] remove margin from h5

---
 public/js/components/Dashboard/Item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 3655eac09..ffd6b4640 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -213,7 +213,7 @@ export default {
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
 				</Transition>
-				<h5 class="col mx-2 px-2">{{ widgetTemplate.setup.name }}</h5>
+				<h5 class="col mx-2 my-0 px-2">{{ widgetTemplate.setup.name }}</h5>
 				<div
 					v-if="source"
 					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"

From 3e832f95266504107bdc72013cfa97adcbb44858 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 15:32:59 +0200
Subject: [PATCH 152/189] remove unused resizeOverlay

---
 public/js/components/Dashboard/Item.js    | 3 +--
 public/js/components/Dashboard/Section.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index ffd6b4640..83a89fc00 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -43,7 +43,6 @@ export default {
 		"item_data",
 		"place",
 		"widgetTemplate",
-		"resizeOverlay",
 		"source"
 	],
 	computed: {
@@ -193,7 +192,7 @@ export default {
 		v-if="!hidden || editMode"
 		:id="widgetID"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
-		:class="{'hidden-widget':hidden, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}"
+		:class="{'hidden-widget':hidden, [arguments?.className]:arguments && arguments.className}"
 	>
 		<div v-if="loading" class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index a19f3a797..ea78de9e3 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -245,7 +245,6 @@ export default {
 				<dashboard-item 
 					v-else
 					:id="item.widget"
-					:resizeOverlay="item.resizeOverlay"
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"

From 0f7188a347ca62abc32ab463039f30bcf92bb7ad Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 22 Apr 2026 15:35:05 +0200
Subject: [PATCH 153/189] remove id (it's bad practice) and we don't need it
 anymore

---
 public/js/components/Dashboard/Item.js    | 2 --
 public/js/components/Dashboard/Section.js | 1 -
 2 files changed, 3 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 83a89fc00..ec75fb7e6 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -32,7 +32,6 @@ export default {
 	],
 	props: [
 		"id",
-		"widgetID",
 		"config",
 		"width",
 		"height",
@@ -190,7 +189,6 @@ export default {
 	template: /*html*/ `
 	<div
 		v-if="!hidden || editMode"
-		:id="widgetID"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
 		:class="{'hidden-widget':hidden, [arguments?.className]:arguments && arguments.className}"
 	>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index ea78de9e3..bd99e388a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -245,7 +245,6 @@ export default {
 				<dashboard-item 
 					v-else
 					:id="item.widget"
-					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
 					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"

From 26d468aa6feae1ba652602ab71561c33970bfe8b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 09:28:23 +0200
Subject: [PATCH 154/189] more semantics and code quality

---
 public/js/components/Dashboard/Item.js    | 122 ++++++++++++++++++----
 public/js/components/Dashboard/Section.js |   4 +-
 2 files changed, 104 insertions(+), 22 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index ec75fb7e6..8b26e92eb 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -187,16 +187,22 @@ export default {
 		this.initializeComponent();
 	},
 	template: /*html*/ `
-	<div
+	<article
 		v-if="!hidden || editMode"
 		class="dashboard-item card overflow-hidden h-100 position-relative"
-		:class="{'hidden-widget':hidden, [arguments?.className]:arguments && arguments.className}"
+		:class="{
+			'hidden-widget': hidden,
+			[arguments?.className]: arguments && arguments.className
+		}"
 	>
 		<div v-if="loading" class="d-flex justify-content-center align-items-center h-100">
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
-		<div v-else class="h-100 card border-0">
-			<div v-if="widgetTemplate" class="card-header d-flex ps-0 pe-2 align-items-center">
+		<template v-else>
+			<header
+				v-if="widgetTemplate"
+				class="card-header d-flex ps-0 pe-2 align-items-center"
+			>
 				<Transition>
 					<span
 						v-if="editMode && !isPinned"
@@ -210,7 +216,9 @@ export default {
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
 				</Transition>
-				<h5 class="col mx-2 my-0 px-2">{{ widgetTemplate.setup.name }}</h5>
+				<h4 class="col mb-0 fs-6 lh-base">
+					{{ widgetTemplate.setup.name }}
+				</h4>
 				<div
 					v-if="source"
 					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
@@ -219,7 +227,16 @@ export default {
 					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
 				</div>
 				<template v-if="isPinned">
-					<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+					<div
+						v-if="editMode"
+						type="button"
+						role="button"
+						class="pin cursor-pointer col-auto me-2"
+						title="unpin item"
+						aria-label="unpin item"
+						pinned="true"
+						@click="unpin"
+					>
 						<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 					</div>
 					<div v-else class="col-auto me-2">
@@ -227,15 +244,45 @@ export default {
 					</div>
 				</template>
 				<template v-else>
-					<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
+					<div
+						v-if="editMode"
+						type="button"
+						role="button"
+						class="col-auto me-2 pin"
+						title="pin item"
+						aria-label="pin item"
+						@click="pinItem"
+					>
 						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 					</div>
 				</template>
-				<a type="button" v-if="widgetTemplate.setup.cis4link" :href="getWidgetC4Link(widgetTemplate)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto">
+				<a
+					v-if="widgetTemplate.setup.cis4link"
+					:href="getWidgetC4Link(widgetTemplate)"
+					class="col-auto ms-auto"
+					aria-label="widget link"
+					v-tooltip="{ showDelay: 1000, value: 'widget link' }"
+				>
 					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
 				</a>
-				<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
-				<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
+				<a
+					v-if="hasConfig"
+					href="#"
+					class="col-auto px-1"
+					aria-label="configure widget"
+					v-tooltip="{ showDelay: 1000, value: 'configure widget' }"
+					@click.prevent="openConfig"
+				>
+					<i class="fa-solid fa-gear" aria-hidden="true"></i>
+				</a>
+				<a
+					v-if="custom && editMode"
+					href="#"
+					class="col-auto px-1"
+					aria-label="delete widget"
+					v-tooltip="{ showDelay: 1000, value: 'delete widget' }"
+					@click.prevent="$emit('remove')"
+				>
 					<i class="fa-solid fa-trash" aria-hidden="true"></i>
 				</a>
 				<Transition>
@@ -243,22 +290,57 @@ export default {
 						<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
 					</div>
 				</Transition>
-			</div>
+			</header>
 			<div v-if="ready" class="card-body overflow-hidden p-0">
-				<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+				<component
+					:is="component"
+					v-model:shared-data="sharedData"
+					:config="arguments"
+					:width="width"
+					:height="height"
+					@setConfig="setConfig"
+					@change="changeConfigManually"
+				></component>
 			</div>
-			<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
-			<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
+			<div
+				v-else
+				class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"
+			>
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<bs-modal
+				v-if="hasConfig"
+				ref="config"
+				@hideBsModal="handleHideBsModal"
+				@showBsModal="handleShowBsModal"
+			>
 				<template v-slot:title>
 					{{ widgetTemplate ? 'Config for ' + widgetTemplate.setup.name : '' }}
 				</template>
 				<template v-slot:default>
-					<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
-					<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+					<component
+						:is="component"
+						v-if="ready && !isLoading"
+						v-model:shared-data="sharedData"
+						:config="tmpConfig"
+						@change="changeConfig"
+						:configMode="true"
+					></component>
+					<div v-else class="text-center">
+						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+					</div>
 				</template>
 				<template v-if="!widgetTemplate?.setup?.hideFooter" v-slot:footer>
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-					<button type="button" class="btn btn-primary" @click="changeConfig">Save changes</button>
+					<button
+						type="button"
+						class="btn btn-secondary"
+						data-bs-dismiss="modal"
+					>Close</button>
+					<button
+						type="button"
+						class="btn btn-primary"
+						@click="changeConfig"
+					>Save changes</button>
 				</template>
 			</bs-modal>
 			<height-transition>
@@ -310,6 +392,6 @@ export default {
 					</span>
 				</div>
 			</height-transition>
-		</div>
-	</div>`,
+		</template>
+	</article>`,
 };
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index bd99e388a..db91915d5 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -216,10 +216,10 @@ export default {
 		ref="container"
 		:class="{ 'edit-active': editModeIsActive }"
 	>
-		<h4 v-if="adminMode" class="mb-2">
+		<h3 v-if="adminMode" class="h4">
 			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
 			{{ sectionNameTranslation }}:
-		</h4>
+		</h3>
 		<button
 			v-tooltip="$p.t('dashboard','addLine')"
 			v-if="!additionalRow && editModeIsActive"

From bc908b7fe9dd0d52c05659692079eef4a798577b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 09:41:18 +0200
Subject: [PATCH 155/189] use computed classes for the resize button instead of
 if-else in template

---
 public/js/components/Dashboard/Item.js | 51 ++++++++++----------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 8b26e92eb..06900a766 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -96,6 +96,20 @@ export default {
 		isResizeable() {
 			return this.isResizeableVertical || this.isResizeableHorizontal;
 		},
+		resizeClasses() {
+			const classes = {
+				icon: 'fa-up-right-and-down-left-from-center mirror-x',
+				button: 'cursor-nw-resize'
+			};
+			if (!this.isResizeableHorizontal) {
+				classes.icon = 'fa-up-down pe-2';
+				classes.button = 'cursor-ns-resize';
+			} else if (!this.isResizeableVertical) {
+				classes.icon = 'fa-left-right pe-2';
+				classes.button = 'cursor-ew-resize';
+			}
+			return classes;
+		},
 		isPinned() {
 			return this.place?.pinned ? true : false;
 		},
@@ -349,44 +363,17 @@ export default {
 					class="card-footer d-flex justify-content-end p-0"
 				>
 					<span
-						v-if="!isResizeableHorizontal"
 						type="button"
 						drag-action="resize"
-						class="col-auto px-1 cursor-ns-resize"
+						class="col-auto px-1"
+						:class="resizeClasses.button"
 						draggable="true"
 						aria-label="resize widget"
-						v-tooltip="{showDelay:1000, value:'resize widget'}"
+						v-tooltip="{ showDelay: 1000, value: 'resize widget' }"
 					>
 						<i
-							class="fa-solid fa-up-down pe-2"
-							aria-hidden="true"
-						></i>
-					</span>
-					<span
-						v-else-if="!isResizeableVertical"
-						type="button"
-						drag-action="resize"
-						class="col-auto px-1 cursor-ew-resize"
-						draggable="true"
-						aria-label="resize widget"
-						v-tooltip="{showDelay:1000, value:'resize widget'}"
-					>
-						<i
-							class="fa-solid fa-left-right pe-2"
-							aria-hidden="true"
-						></i>
-					</span>
-					<span
-						v-else
-						type="button"
-						drag-action="resize"
-						class="col-auto px-1 cursor-nw-resize"
-						draggable="true"
-						aria-label="resize widget"
-						v-tooltip="{showDelay:1000, value:'resize widget'}"
-					>
-						<i
-							class="fa-solid fa-up-right-and-down-left-from-center mirror-x"
+							class="fa-solid"
+							:class="resizeClasses.icon"
 							aria-hidden="true"
 						></i>
 					</span>

From 6c26fde210e9e9b19eccdb51dd1f54cd5cbd6120 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 09:47:49 +0200
Subject: [PATCH 156/189] comments & code quality

---
 public/js/components/Dashboard/Item.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 06900a766..75667d864 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -217,6 +217,7 @@ export default {
 				v-if="widgetTemplate"
 				class="card-header d-flex ps-0 pe-2 align-items-center"
 			>
+				<!-- move handle -->
 				<Transition>
 					<span
 						v-if="editMode && !isPinned"
@@ -230,9 +231,11 @@ export default {
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
 				</Transition>
+				<!-- TITLE -->
 				<h4 class="col mb-0 fs-6 lh-base">
 					{{ widgetTemplate.setup.name }}
 				</h4>
+				<!-- source info -->
 				<div
 					v-if="source"
 					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
@@ -240,6 +243,7 @@ export default {
 				>
 					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
 				</div>
+				<!-- pin button -->
 				<template v-if="isPinned">
 					<div
 						v-if="editMode"
@@ -251,10 +255,10 @@ export default {
 						pinned="true"
 						@click="unpin"
 					>
-						<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
+						<i class="fa-solid fa-thumbtack" aria-hidden="true"></i>
 					</div>
 					<div v-else class="col-auto me-2">
-						<i class="fa-solid fa-thumbtack "></i>
+						<i class="fa-solid fa-thumbtack"></i>
 					</div>
 				</template>
 				<template v-else>
@@ -270,6 +274,7 @@ export default {
 						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 					</div>
 				</template>
+				<!-- widget link -->
 				<a
 					v-if="widgetTemplate.setup.cis4link"
 					:href="getWidgetC4Link(widgetTemplate)"
@@ -279,6 +284,7 @@ export default {
 				>
 					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
 				</a>
+				<!-- config button -->
 				<a
 					v-if="hasConfig"
 					href="#"
@@ -289,6 +295,7 @@ export default {
 				>
 					<i class="fa-solid fa-gear" aria-hidden="true"></i>
 				</a>
+				<!-- delete button -->
 				<a
 					v-if="custom && editMode"
 					href="#"
@@ -299,9 +306,18 @@ export default {
 				>
 					<i class="fa-solid fa-trash" aria-hidden="true"></i>
 				</a>
+				<!-- hide button -->
 				<Transition>
 					<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-						<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
+						<input
+							type="checkbox"
+							role="switch"
+							v-model="visible"
+							class="form-check-input ms-0"
+							:value="true"
+							aria-label="toggle widget"
+							id="flexSwitchCheckChecked"
+						>
 					</div>
 				</Transition>
 			</header>

From 2cadee15994f79631998171acd27a1a84a8dcb28 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 09:48:04 +0200
Subject: [PATCH 157/189] remove id => bad practice

---
 public/js/components/Dashboard/Item.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 75667d864..d63a19ac1 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -316,7 +316,6 @@ export default {
 							class="form-check-input ms-0"
 							:value="true"
 							aria-label="toggle widget"
-							id="flexSwitchCheckChecked"
 						>
 					</div>
 				</Transition>

From d9a80e5ef775b97386842b63baf7fbd492a9420f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 09:50:08 +0200
Subject: [PATCH 158/189] use footer like header inside article

---
 public/js/components/Dashboard/Item.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index d63a19ac1..450a66da0 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -373,7 +373,7 @@ export default {
 				</template>
 			</bs-modal>
 			<height-transition>
-				<div
+				<footer
 					v-if="editMode && isResizeable && !isPinned"
 					class="card-footer d-flex justify-content-end p-0"
 				>
@@ -392,7 +392,7 @@ export default {
 							aria-hidden="true"
 						></i>
 					</span>
-				</div>
+				</footer>
 			</height-transition>
 		</template>
 	</article>`,

From 2a21bbf062c962e61fb90a5ab0d6e54374e03cc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 10:41:08 +0200
Subject: [PATCH 159/189] add list semantics to drop grid for accessibility

---
 public/js/components/Drop/Grid.js      | 6 +++---
 public/js/components/Drop/Grid/Item.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index f6bfb39f5..1cecf0031 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -578,9 +578,9 @@ export default {
 		}
 	},
 	template: /* html */`
-	<div
+	<ul
 		ref="container"
-		class="drop-grid position-relative h-0"
+		class="drop-grid position-relative h-0 list-unstyled"
 		:style="gridStyle"
 		@dragover="dragOver"
 		@drop="dragEnd"
@@ -614,5 +614,5 @@ export default {
 				</template>
 			</grid-item>
 		</TransitionGroup>
-	</div>`
+	</ul>`
 }
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index b6c8cf870..d0f2b8774 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -20,7 +20,7 @@ export default {
 		
 	},
 	template: /* html */`
-	<div class="drop-grid-item" @dragstart="tryDragStart">
+	<li class="drop-grid-item" @dragstart="tryDragStart">
 		<slot v-bind="item"></slot>
-	</div>`
+	</li>`
 }

From ff3a25a5ec0fec8d70e14dfc9391ee7d6cd674bd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 10:43:12 +0200
Subject: [PATCH 160/189] missing CSS styles for dashboard item header

---
 public/js/components/Dashboard/Item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 450a66da0..da7a15dd9 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -232,7 +232,7 @@ export default {
 					</span>
 				</Transition>
 				<!-- TITLE -->
-				<h4 class="col mb-0 fs-6 lh-base">
+				<h4 class="col mb-0 mx-2 px-2 fs-6 lh-base">
 					{{ widgetTemplate.setup.name }}
 				</h4>
 				<!-- source info -->

From fbc5f953404616ab549e3c542bad68750d21110c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 10:54:57 +0200
Subject: [PATCH 161/189] hide drag and drop features from screenreaders
 because they is no implementation for using them with screenreaders yet

---
 public/js/components/Dashboard/Item.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index da7a15dd9..f7558dfcd 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -225,6 +225,7 @@ export default {
 						drag-action="move"
 						class="col-auto mx-2 px-2 cursor-move"
 						draggable="true"
+						aria-hidden="true"
 						aria-label="move widget"
 						v-tooltip="{showDelay:1000, value:'move widget'}"
 					>
@@ -251,13 +252,14 @@ export default {
 						role="button"
 						class="pin cursor-pointer col-auto me-2"
 						title="unpin item"
+						aria-hidden="true"
 						aria-label="unpin item"
 						pinned="true"
 						@click="unpin"
 					>
 						<i class="fa-solid fa-thumbtack" aria-hidden="true"></i>
 					</div>
-					<div v-else class="col-auto me-2">
+					<div v-else class="col-auto me-2" aria-hidden="true">
 						<i class="fa-solid fa-thumbtack"></i>
 					</div>
 				</template>
@@ -268,6 +270,7 @@ export default {
 						role="button"
 						class="col-auto me-2 pin"
 						title="pin item"
+						aria-hidden="true"
 						aria-label="pin item"
 						@click="pinItem"
 					>
@@ -383,6 +386,7 @@ export default {
 						class="col-auto px-1"
 						:class="resizeClasses.button"
 						draggable="true"
+						aria-hidden="true"
 						aria-label="resize widget"
 						v-tooltip="{ showDelay: 1000, value: 'resize widget' }"
 					>

From 2eb58e334669f1b150ae1edbe3639150873c5aed Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 11:43:25 +0200
Subject: [PATCH 162/189] reworked how 'compactible event types' are defined

---
 .../controllers/api/frontend/v1/LvPlan.php    |  11 ++
 public/js/api/factory/lvPlan.js               |   8 +-
 .../js/components/Calendar/Base/Grid/Line.js  |  12 +-
 public/js/components/Calendar/LvPlan.js       | 135 ++++++++++--------
 4 files changed, 99 insertions(+), 67 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 99dc8bf59..dc87732b9 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -48,6 +48,7 @@ class LvPlan extends FHCAPI_Controller
 			'getStudiengaenge' => self::PERM_LOGGED,
 			'getLehrverband' => self::PERM_LOGGED,
 			'permissionOtherLvPlan' => self::PERM_LOGGED,
+			'compactibleEventTypes' => self::PERM_LOGGED,
 		]);
 
 		$this->load->library('LogLib');
@@ -393,6 +394,16 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
 	}
 
+	/**
+	 * get event types which can be compacted in lv plan display
+	 *
+	 * @return void
+	 */
+	public function compactibleEventTypes()
+	{
+		$this->terminateWithSuccess(["lehreinheit", "reservierung"]);
+	}
+
 	/**
 	 * fetch moodle events
 	 *
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 41aa29299..0b652025f 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -123,5 +123,11 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/lvPlan/permissionOtherLvPlan',
 		}
-	}
+	},
+	getCompactibleEventTypes(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/compactibleEventTypes',
+		}
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index e5241de1d..6519e63d9 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -12,7 +12,7 @@ export default {
 		LineEvent,
 		LineBackground,
 	},
-	inject: ["axisRow", "shouldCompactEvents"],
+	inject: ["axisRow", "shouldCompactEvents", "compactibleEventTypes"],
 	props: {
 		date: {
 			type: luxon.DateTime,
@@ -50,27 +50,27 @@ export default {
 				return event;
 			});
 
-			if (this.shouldCompactEvents) {
+			if (this.shouldCompactEvents && this.compactibleEventTypes?.length) {
 				formattedEvents =
-					this.compactEventsForMobileView(formattedEvents);
+					this.compactEventsForMobileView(formattedEvents, this.compactibleEventTypes);
 			}
 
 			return formattedEvents;
 		},
 	},
 	methods: {
-		compactEventsForMobileView(events) {
+		compactEventsForMobileView(events, compactibleEventTypes) {
 			let formattedEvents = events
 				.filter(
 					(event) =>
-						!["lehreinheit", "reservierung"].includes(event.type),
+						!compactibleEventTypes.includes(event.type),
 				)
 				.map((event) => {
 					event.display = "default";
 					return event;
 				});
 			let eventsToBeCompacted = events.filter((event) =>
-				["lehreinheit", "reservierung"].includes(event.type),
+				compactibleEventTypes.includes(event.type),
 			);
 			let compactedEvents = [];
 
diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index 7f96b3d2f..e448741fa 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -1,92 +1,98 @@
 import FhcCalendar from "./Base.js";
 
-import ApiLvPlan from '../../api/factory/lvPlan.js';
+import ApiLvPlan from "../../api/factory/lvPlan.js";
 
-import { useEventLoader } from '../../composables/EventLoader.js';
+import { useEventLoader } from "../../composables/EventLoader.js";
 
-import ModeDay from './Mode/Day.js';
-import ModeWeek from './Mode/Week.js';
-import ModeMonth from './Mode/Month.js';
-import ModeList from './Mode/List.js';
+import ModeDay from "./Mode/Day.js";
+import ModeWeek from "./Mode/Week.js";
+import ModeMonth from "./Mode/Month.js";
+import ModeList from "./Mode/List.js";
 
 export default {
 	name: "CalendarLvPlan",
 	components: {
-		FhcCalendar
+		FhcCalendar,
 	},
-	inject: [
-		"renderers",
-		"isMobile",
-	],
+	inject: ["renderers", "isMobile"],
 	props: {
 		timezone: {
 			type: String,
-			required: true
+			required: true,
 		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
-			default: luxon.DateTime.local()
+			default: luxon.DateTime.local(),
 		},
 		mode: {
 			type: String,
-			default: 'Day'
+			default: "Day",
 		},
 		getPromiseFunc: {
 			type: Function,
-			required: true
-		}
+			required: true,
+		},
 	},
 	provide() {
 		return {
-			shouldCompactEvents: Vue.computed(() => this.$props.mode === "Month" && this.isMobile)
-		}
+			shouldCompactEvents: Vue.computed(
+				() => this.$props.mode === "Month" && this.isMobile,
+			),
+			compactibleEventTypes: Vue.computed(
+				() => this.compactibleEventTypes,
+			),
+		};
 	},
-	emits: [
-		"update:date",
-		"update:mode",
-		"update:range"
-	],
+	emits: ["update:date", "update:mode", "update:range"],
 	data() {
 		return {
 			modeOptions: {
 				day: {
-					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
+					emptyMessage: Vue.computed(() =>
+						this.$p.t("lehre/noLvFound"),
+					),
+					emptyMessageDetails: Vue.computed(() =>
+						this.$p.t("lehre/noLvFound"),
+					),
 				},
 				week: {
-					collapseEmptyDays: false
+					collapseEmptyDays: false,
 				},
 				list: {
-					length: 7
-				}
+					length: 7,
+				},
 			},
-			teachingunits: null
+			teachingunits: null,
+			compactibleEventTypes: [],
 		};
 	},
 	computed: {
 		backgrounds() {
 			let now = luxon.DateTime.now().setZone(this.timezone);
 
-			if (this.mode == 'Month')
+			if (this.mode == "Month")
 				return [
 					{
-						class: 'background-past',
-						end: now.startOf('day')
-					}
+						class: "background-past",
+						end: now.startOf("day"),
+					},
 				];
 
 			return [
 				{
-					class: 'background-past',
+					class: "background-past",
 					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
+					label: now.startOf("minute").toISOTime({
+						suppressSeconds: true,
+						includeOffset: false,
+					}),
+				},
 			];
 		},
 		modes() {
 			let modes = {
 				day: Vue.markRaw(ModeDay),
-				month: Vue.markRaw(ModeMonth)
+				month: Vue.markRaw(ModeMonth),
 			};
 			if (this.isMobile) {
 				modes.list = Vue.markRaw(ModeList);
@@ -99,46 +105,55 @@ export default {
 	},
 	methods: {
 		eventStyle(event) {
-			if (!event.farbe)
-				return undefined;
-			return '--event-bg:#' + event.farbe;
+			if (!event.farbe) return undefined;
+			return "--event-bg:#" + event.farbe;
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
-			this.$emit('update:range', rangeInterval);
+			this.$emit("update:range", rangeInterval);
 		},
 		resetEventLoader() {
 			this.reset();
-		}
+		},
+		async getStunden() {
+			let stundenResponse = await this.$api.call(ApiLvPlan.getStunden());
+			this.teachingunits = stundenResponse.data.map((el) => ({
+				id: el.stunde,
+				start: el.beginn,
+				end: el.ende,
+			}));
+		},
+		async getCompactibleEventTypes() {
+			let compactibleEventTypesResponse = await this.$api.call(
+				ApiLvPlan.getCompactibleEventTypes(),
+			);
+			this.compactibleEventTypes = compactibleEventTypesResponse.data;
+		},
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
-		
-		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
 
-		Vue.watch(lv, newValue => {
-			context.emit('update:lv', newValue);
+		const { events, lv, reset } = useEventLoader(
+			rangeInterval,
+			props.getPromiseFunc,
+		);
+
+		Vue.watch(lv, (newValue) => {
+			context.emit("update:lv", newValue);
 		});
 
 		return {
 			rangeInterval,
 			events,
 			lv,
-			reset
+			reset,
 		};
 	},
-	created() {
-		this.$api
-			.call(ApiLvPlan.getStunden())
-			.then(res => {
-				return this.teachingunits = res.data.map(el => ({
-					id: el.stunde,
-					start: el.beginn,
-					end: el.ende
-				}));
-			});
+	async created() {
+		await this.getStunden();
+		await this.getCompactibleEventTypes();
 	},
-	template: /* html */`
+	template: /* html */ `
 	<fhc-calendar
 		ref="calendar"
 		class="fhc-calendar-lvplan"
@@ -189,5 +204,5 @@ export default {
 		<template #actions>
 			<slot />
 		</template>
-	</fhc-calendar>`
-}
+	</fhc-calendar>`,
+};

From e89ab9b92f7e8a728e05fa422287facec00c5c89 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 13:57:27 +0200
Subject: [PATCH 163/189] minor naming change

---
 public/js/components/Calendar/Base/Grid/Line.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index 6519e63d9..64a71c5f0 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -52,14 +52,14 @@ export default {
 
 			if (this.shouldCompactEvents && this.compactibleEventTypes?.length) {
 				formattedEvents =
-					this.compactEventsForMobileView(formattedEvents, this.compactibleEventTypes);
+					this.compactEvents(formattedEvents, this.compactibleEventTypes);
 			}
 
 			return formattedEvents;
 		},
 	},
 	methods: {
-		compactEventsForMobileView(events, compactibleEventTypes) {
+		compactEvents(events, compactibleEventTypes) {
 			let formattedEvents = events
 				.filter(
 					(event) =>

From dd13c73415f09ff6e85b8fc135b9d9dea9d10281 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 14:04:49 +0200
Subject: [PATCH 164/189] code quality

---
 public/js/components/Dashboard/Item.js        |  5 +++--
 public/js/components/Dashboard/Section.js     |  2 +-
 .../js/components/Dashboard/Widget/Picker.js  | 22 ++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index f7558dfcd..1837757a0 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -227,7 +227,7 @@ export default {
 						draggable="true"
 						aria-hidden="true"
 						aria-label="move widget"
-						v-tooltip="{showDelay:1000, value:'move widget'}"
+						v-tooltip="{ showDelay: 1000, value: 'move widget' }"
 					>
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
@@ -239,8 +239,9 @@ export default {
 				<!-- source info -->
 				<div
 					v-if="source"
-					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
 					class="col-auto me-2"
+					:aria-label="sourceInfoTooltip"
+					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
 				>
 					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
 				</div>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index db91915d5..04e8fe9f7 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -221,7 +221,7 @@ export default {
 			{{ sectionNameTranslation }}:
 		</h3>
 		<button
-			v-tooltip="$p.t('dashboard','addLine')"
+			v-tooltip="$p.t('dashboard/addLine')"
 			v-if="!additionalRow && editModeIsActive"
 			class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center"
 			@click="additionalRow=true"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 46b7c50e7..131ef1204 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -32,19 +32,31 @@ export default {
 		},
 		
 	},
-	template: `<div class="dashboard-widget-picker">
-		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
+	template: /* html */`
+	<div class="dashboard-widget-picker">
+		<bs-modal
+			ref="modal"
+			class="fade"
+			:dialog-class="{ 'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0 }"
+			@hiddenBsModal="close"
+		>
 			<template v-slot:title>Create new widget</template>
 			<template v-slot:default>
 				<div v-if="widgets" class="row g-2">
 					<div v-if="!widgets.length">
 						No Widgets available
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
-						<widget-icon @select="pick" :widget="widget" ></widget-icon>
+					<div
+						v-for="widget in widgets"
+						:key="widget.widget_id"
+						class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2"
+					>
+						<widget-icon @select="pick" :widget="widget"></widget-icon>
 					</div>
 				</div>
-				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
+				<div v-else class="text-center">
+					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+				</div>
 			</template>
 		</bs-modal>
 	</div>`

From 011e93720e745e2b53037ed2ce2ba9dda78983cb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 15:08:42 +0200
Subject: [PATCH 165/189] phrasen dashboard

---
 public/js/components/Dashboard/Admin/Edit.js  |   4 +-
 public/js/components/Dashboard/Dashboard.js   |   2 +-
 public/js/components/Dashboard/Item.js        |  36 +--
 .../js/components/Dashboard/Widget/Picker.js  |   4 +-
 system/phrasesupdate.php                      | 260 ++++++++++++++++++
 5 files changed, 283 insertions(+), 23 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
index 426dea7b0..e4c383142 100644
--- a/public/js/components/Dashboard/Admin/Edit.js
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -27,7 +27,7 @@ export default {
 	template: /* html */`
 	<div class="dashboard-admin-edit px-3">
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-kurzbz">Kurz Bezeichnung</label>
+			<label for="dashboard-admin-edit-kurzbz">{{ $p.t('dashboard/kurzbz') }}</label>
 			<input
 				id="dashboard-admin-edit-kurzbz"
 				v-model="kurzbz"
@@ -36,7 +36,7 @@ export default {
 			>
 		</div>
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-beschreibung">Beschreibung</label>
+			<label for="dashboard-admin-edit-beschreibung">{{ $p.t('global/beschreibung') }}</label>
 			<textarea
 				id="dashboard-admin-edit-beschreibung"
 				v-model="desc"
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 64d4de71d..0bcae80f4 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -165,7 +165,7 @@ export default {
 			<button
 				class="btn ms-2"
 				aria-label="edit dashboard"
-				v-tooltip="{ showDelay: 1000, value: 'edit dashboard' }"
+				v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/edit') }"
 				@click="editMode = !editMode"
 			><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 1837757a0..af53eb86c 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -226,8 +226,8 @@ export default {
 						class="col-auto mx-2 px-2 cursor-move"
 						draggable="true"
 						aria-hidden="true"
-						aria-label="move widget"
-						v-tooltip="{ showDelay: 1000, value: 'move widget' }"
+						:aria-label="$p.t('dashboard/widget_move')"
+						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_move') }"
 					>
 						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
 					</span>
@@ -252,9 +252,9 @@ export default {
 						type="button"
 						role="button"
 						class="pin cursor-pointer col-auto me-2"
-						title="unpin item"
+						:title="$p.t('dashboard/widget_unpin')"
 						aria-hidden="true"
-						aria-label="unpin item"
+						:aria-label="$p.t('dashboard/widget_unpin')"
 						pinned="true"
 						@click="unpin"
 					>
@@ -270,9 +270,9 @@ export default {
 						type="button"
 						role="button"
 						class="col-auto me-2 pin"
-						title="pin item"
+						:title="$p.t('dashboard/widget_pin')"
 						aria-hidden="true"
-						aria-label="pin item"
+						:aria-label="$p.t('dashboard/widget_pin')"
 						@click="pinItem"
 					>
 						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
@@ -283,8 +283,8 @@ export default {
 					v-if="widgetTemplate.setup.cis4link"
 					:href="getWidgetC4Link(widgetTemplate)"
 					class="col-auto ms-auto"
-					aria-label="widget link"
-					v-tooltip="{ showDelay: 1000, value: 'widget link' }"
+					:aria-label="$p.t('dashboard/widget_link')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_link') }"
 				>
 					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
 				</a>
@@ -293,8 +293,8 @@ export default {
 					v-if="hasConfig"
 					href="#"
 					class="col-auto px-1"
-					aria-label="configure widget"
-					v-tooltip="{ showDelay: 1000, value: 'configure widget' }"
+					:aria-label="$p.t('dashboard/widget_configure')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_configure') }"
 					@click.prevent="openConfig"
 				>
 					<i class="fa-solid fa-gear" aria-hidden="true"></i>
@@ -304,8 +304,8 @@ export default {
 					v-if="custom && editMode"
 					href="#"
 					class="col-auto px-1"
-					aria-label="delete widget"
-					v-tooltip="{ showDelay: 1000, value: 'delete widget' }"
+					:aria-label="$p.t('dashboard/widget_delete')"
+					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_delete') }"
 					@click.prevent="$emit('remove')"
 				>
 					<i class="fa-solid fa-trash" aria-hidden="true"></i>
@@ -319,7 +319,7 @@ export default {
 							v-model="visible"
 							class="form-check-input ms-0"
 							:value="true"
-							aria-label="toggle widget"
+							:aria-label="$p.t('dashboard/widget_toggle_visibility')"
 						>
 					</div>
 				</Transition>
@@ -348,7 +348,7 @@ export default {
 				@showBsModal="handleShowBsModal"
 			>
 				<template v-slot:title>
-					{{ widgetTemplate ? 'Config for ' + widgetTemplate.setup.name : '' }}
+					{{ widgetTemplate ? $p.t('dashboard/widget_config_title', widgetTemplate.setup) : '' }}
 				</template>
 				<template v-slot:default>
 					<component
@@ -368,12 +368,12 @@ export default {
 						type="button"
 						class="btn btn-secondary"
 						data-bs-dismiss="modal"
-					>Close</button>
+					>{{ $p.t('ui/schliessen') }}</button>
 					<button
 						type="button"
 						class="btn btn-primary"
 						@click="changeConfig"
-					>Save changes</button>
+					>{{ $p.t('ui/speichern') }}</button>
 				</template>
 			</bs-modal>
 			<height-transition>
@@ -388,8 +388,8 @@ export default {
 						:class="resizeClasses.button"
 						draggable="true"
 						aria-hidden="true"
-						aria-label="resize widget"
-						v-tooltip="{ showDelay: 1000, value: 'resize widget' }"
+						:aria-label="$p.t('dashboard/widget_resize')"
+						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_resize') }"
 					>
 						<i
 							class="fa-solid"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 131ef1204..260b95874 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -40,11 +40,11 @@ export default {
 			:dialog-class="{ 'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0 }"
 			@hiddenBsModal="close"
 		>
-			<template v-slot:title>Create new widget</template>
+			<template v-slot:title>{{ $p.t('dashboard/createWidget') }}</template>
 			<template v-slot:default>
 				<div v-if="widgets" class="row g-2">
 					<div v-if="!widgets.length">
-						No Widgets available
+						{{ $p.t('dashboard/noWidgetsAvailable') }}
 					</div>
 					<div
 						v-for="widget in widgets"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e0b2b2671..af0691db7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -47126,6 +47126,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dashboard bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit dashboard',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',
@@ -47146,6 +47166,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'createWidget',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neues Widget hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create new widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'noWidgetsAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Widgets verfügbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Widgets available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',
@@ -47286,6 +47346,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_pin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Pin Widget',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Pin widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_unpin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unpin Widget',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unpin widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_toggle_visiblity',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sichtbarkeit des Widgets umschalten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Toggle widget visibility',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_move',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widget verschieben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Move widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_resize',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widgetgröße anpassen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Resize widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widget löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_configure',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widget konfigurieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configure widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_config_title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '"{name}" konfigurieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Configure "{name}"',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'widget_link',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widget link',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Widget link',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Name',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Identifier',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 // CIS4 phrases from legacy code end
 // FHC4 Phrases Abschlusspruefung
 	array(

From 16f57a1bceb57d3160559e2b292e2cbfed36d751 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Apr 2026 16:37:51 +0200
Subject: [PATCH 166/189] bugfixes

---
 public/js/components/Cis/Studium/Studium.js | 2 +-
 public/js/components/Dashboard/Item.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 47148fc48..c70646608 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,6 +1,6 @@
 import LvUebersicht from "../Mylv/LvUebersicht.js";
 
-import ApiCisStudium from '../../../api/factory/cis/studium';
+import ApiCisStudium from '../../../api/factory/cis/studium.js';
 
 export default {
 	data(){
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 776f3ba7e..20c195178 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -332,7 +332,7 @@ export default {
 					:config="arguments"
 					:width="width"
 					:height="height"
-					:widget-id="widgetID" 
+					:widget-id="item_data.id" 
 					:item_data="item_data"
 					@setConfig="setConfig"
 					@change="changeConfigManually"

From 4a26d7a89addd69f0c44867d3a3930e56ff017c7 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 16:58:54 +0200
Subject: [PATCH 167/189] minor fix

---
 public/js/components/Calendar/LvPlan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index 14e2b4382..f9c604365 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -23,7 +23,7 @@ export default {
 		},
 		mode: {
 			type: String,
-			default: 'Day'
+			default: 'Week'
 		},
 		getPromiseFunc: {
 			type: Function,

From dfc8fdf44fbf1f137e662d7401c6a5ce18b6b740 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 17:33:55 +0200
Subject: [PATCH 168/189] added missing action buttons to search results

---
 public/js/apps/Cis/Menu.js | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/public/js/apps/Cis/Menu.js b/public/js/apps/Cis/Menu.js
index a8779e32f..b05e68ee5 100644
--- a/public/js/apps/Cis/Menu.js
+++ b/public/js/apps/Cis/Menu.js
@@ -1,8 +1,9 @@
 import FhcSearchbar from "../../components/searchbar/searchbar.js";
 import CisMenu from "../../components/Cis/Menu.js";
 import PluginsPhrasen from '../../plugins/Phrasen.js';
-import ApiSearchbar from '../../api/factory/searchbar.js';
 import Theme from "../../plugins/Theme.js";
+import ApiSearchbar from '../../api/factory/searchbar.js';
+import ApiLvPlan from "../../api/factory/lvPlan.js";
 
 const app = Vue.createApp({
     name: 'CisMenuApp',
@@ -152,7 +153,37 @@ const app = Vue.createApp({
         searchfunction: function(searchsettings) {
         	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
         }
-    }
+    },
+	async mounted() {
+		const openOtherLvPlanAction = {
+			label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
+			icon: "fas fa-calendar-days",
+			type: "link",
+			action: function (data) {
+				const uid = JSON.parse(data.data).uid;
+				const link =
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+					"/Cis/OtherLvPlan/" +
+					uid;
+				return link;
+			},
+		};
+		let checkPermissionOtherLvPlanResult = await this.$api.call(
+			ApiLvPlan.checkPermissionOtherLvPlan(),
+		);
+		if (
+			checkPermissionOtherLvPlanResult.meta.status === "success" &&
+			checkPermissionOtherLvPlanResult.data
+		) {
+			this.searchbaroptions.actions.employee.childactions.push(
+				openOtherLvPlanAction,
+			);
+			this.searchbaroptions.actions.student.childactions.push(
+				openOtherLvPlanAction,
+			);
+		}
+	},
 });
 
 FhcApps.makeExtendable(app);

From 20c68d675c6efb325e06118af9ee0e97cd8acf2f Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 17:45:09 +0200
Subject: [PATCH 169/189] added missing roomsearch input spacing

---
 public/js/components/Cis/Raumsuche/Raumsuche.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 5cdc164c0..3b0ebf538 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -8,6 +8,7 @@ export const Raumsuche =  {
 		CoreFilterCmpt,
 		InputNumber: primevue.inputnumber,
 	},
+	inject: ["isMobile"],
 	data() {
 		return {
 			phrasenPromise: null,
@@ -191,8 +192,9 @@ export const Raumsuche =  {
 	<h1 class="h3">{{$p.t('rauminfo/roomSearch')}}</h1>
 	<hr>
 	<div class="row">
-		<div class="col-12 col-lg-2">
+		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-2">
 			<VueDatePicker
+				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
 				:dark="isDarkMode"
 				v-model="datum"
 				:clearable="false"
@@ -204,8 +206,9 @@ export const Raumsuche =  {
 				auto-apply>
 			</VueDatePicker>
 		</div>
-		<div class="col-12 col-lg-1">
+		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-1">
 			<VueDatePicker
+				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
 				:dark="isDarkMode"
 				v-model="von"
 				:clearable="false"
@@ -217,8 +220,9 @@ export const Raumsuche =  {
 				>
 			</VueDatePicker>
 		</div>
-		<div class="col-12 col-lg-1">
+		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-1">
 			<VueDatePicker
+				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
 				:dark="isDarkMode"
 				v-model="bis"
 				:clearable="false"
@@ -230,7 +234,7 @@ export const Raumsuche =  {
 			</VueDatePicker>
 		</div>
 		
-		<div class="col-12 col-lg-3">
+		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-3">
 			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
 			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
 				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
@@ -239,7 +243,7 @@ export const Raumsuche =  {
 		</div>
 		
 
-		<div class="col-12 col-lg-3">
+		<div :class="{'pb-2': isMobile}" class="col-12 col-lg-3">
 			<InputNumber v-model="anzahl" 
 			:prefix="$p.t('rauminfo/minCapacity') + ': '" 
 			inputId="anzahlInput" :min="1" :max="1000" 

From 53bce69c6fb2f15ddd68ca81dd27d2f034c6c426 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Thu, 23 Apr 2026 17:53:40 +0200
Subject: [PATCH 170/189] added missing template fallback to lv plan if no
 event

---
 public/js/components/Calendar/LvPlan.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index f9c604365..99c7ba8ef 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -169,6 +169,13 @@ export default {
 	>
 		<template v-slot="{ event, mode }">
 			<div
+				v-if="!event"
+				class="h-100 d-flex justify-content-center align-items-center"
+			>
+				{{ $p.t('lehre/noLvFound') }}
+			</div>
+			<div
+				v-else
 				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
 				:type="mode == 'day' ? 'button' : undefined"
  				:style="eventStyle(event)"

From 6ce0cf6209f3bb2df4db87733330835d4c6d1253 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 24 Apr 2026 10:56:00 +0200
Subject: [PATCH 171/189] remove unused function

---
 public/js/components/DashboardWidget/Url.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 6e7ffeeb3..0937c71a7 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -235,15 +235,6 @@ export default {
 			}
 			this.changeOrder(current.bookmark_id, next.bookmark_id);
 		},
-		addNewTag(){
-			if(this.newTag != null && this.newTag.length) {
-				this.tagsArrayMS.push({tag: this.newTag, code: this.newTag});
-				this.selectedTags.push({tag: this.newTag, code: this.newTag});
-				this.newTag = null;
-			}
-			else
-				this.$fhcAlert.alertError(this.$p.t("bookmark", "errorInputNecessary"));
-		},
 		changeOrder(bookmark_id_1, bookmark_id_2){
 			this.$api
 				.call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2))

From 132edce7019008ad4de53230b8c7a9d862cb611b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 24 Apr 2026 11:24:25 +0200
Subject: [PATCH 172/189] code quality

---
 public/js/components/DashboardWidget/Url.js | 268 +++++++++++++-------
 1 file changed, 172 insertions(+), 96 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 0937c71a7..c55c0f01f 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -346,7 +346,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		getTagFilter(widget_id){
+		getTagFilter(widget_id) {
 			this.$api
 				.call(ApiBookmark.getTagFilter(widget_id, this.sectionName))
 				.then((res) => res.data)
@@ -388,94 +388,153 @@ export default {
 
 
 	template: /*html*/ `
-    <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
+	<div class="widgets-url w-100 h-100 overflow-auto p-3">
 
 		<div class="d-flex mt-2">
-		  <button class="btn btn-outline-secondary btn-sm flex-grow-1 me-2" @click="openCreateModal">
-			{{$p.t('bookmark','newLink')}}
-		  </button>
-		  <button v-if="selectedFilters.length" class="btn btn-secondary btn-sm" :title="this.$p.t('bookmark/editFilter')" @click="openFilterModal">
-			<i class="fa-solid fa-filter-circle-xmark"></i>
-		  </button>  
-		  <button v-else class="btn btn-outline-secondary btn-sm" :title="this.$p.t('bookmark/filterByTags')" @click="openFilterModal">
-			<i class="fa-solid fa-filter"></i>
-		  </button>
+			<button
+				class="btn btn-outline-secondary btn-sm flex-grow-1 me-2"
+				@click="openCreateModal"
+			>
+				{{ $p.t('bookmark', 'newLink') }}
+			</button>
+			<button
+				v-if="selectedFilters.length"
+				class="btn btn-secondary btn-sm"
+				:title="$p.t('bookmark/editFilter')"
+				@click="openFilterModal"
+			>
+				<i class="fa-solid fa-filter-circle-xmark"></i>
+			</button>  
+			<button
+				v-else
+				class="btn btn-outline-secondary btn-sm"
+				:title="$p.t('bookmark/filterByTags')"
+				@click="openFilterModal"
+			>
+				<i class="fa-solid fa-filter"></i>
+			</button>
 		</div>
 
-            <template v-if="sharedFiltered">
+		<template v-if="sharedFiltered">
 
-                <template v-if="!emptyBookmarks">
-					<div v-for="link in sharedFiltered" :key="link.id" class="d-flex mt-2">
-						<a target="_blank" :href="link.url" class="me-1">
-							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}
+			<template v-if="!emptyBookmarks">
+				<div
+					v-for="link in sharedFiltered"
+					:key="link.id"
+					class="d-flex mt-2"
+				>
+					<a target="_blank" :href="link.url" class="me-1">
+						<i
+							class="fa fa-solid fa-arrow-up-right-from-square me-1"
+							aria-hidden="true"
+						></i>
+						{{ link.title }}
+					</a>
+					<span
+						v-if="hasTags(link)"
+						:title="hasTags(link)"
+						style="color: silver;"
+					>
+						<i
+							class="fa fa-solid fa-tag text-gray-500"
+							aria-hidden="true"
+						></i>
+					</span>
+
+					<div class="ms-auto">
+						<!--EDIT BOOKMARK-->
+						<a
+							type="button"
+							href="#"
+							@click.prevent="openEditModal(link)"
+							aria-label="edit bookmark"
+							:title="$p.t('bookmark/editBookmark')"
+						>
+							<i class="fa fa-edit me-1" aria-hidden="true"></i>
+						</a>
+						<!--DELETE BOOKMARK-->
+						<a
+							type="button"
+							id="deleteBookmark"
+							href="#"
+							aria-label="delete bookmark"
+							:title="$p.t('bookmark/deleteBookmark')"
+							@click.prevent="removeLink(link.bookmark_id)"
+						>
+							<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
+						</a>
+						<!--SORT BOOKMARKS-->
+						<a
+							v-if="sharedFiltered.length > 1"
+							type="button"
+							id="downsortBookmark"
+							href="#"
+							aria-label="sortdown bookmark"
+							:title="$p.t('bookmark/sortDownwards')"
+							@click.prevent="sortDown(link.bookmark_id)"
+						>
+							<i
+								class="fa fa-arrow-down me-1"
+								:class="{ 'text-light pointer-events-none': link.sort === maxSort }"
+							></i>
+						</a>
+						<a
+							v-if="sharedFiltered.length > 1"
+							type="button"
+							id="upsortBookmark"
+							href="#"
+							aria-label="sortup bookmark"
+							:title="$p.t('bookmark/sortToTop')"
+							@click.prevent="sortUp(link.bookmark_id)"
+						>
+							<i
+								class="fa fa-arrow-up me-1"
+								:class="{ 'text-light pointer-events-none': link.sort === minSort }"
+							></i>
 						</a>
-						<span
-							v-if="hasTags(link)"
-							 :title="hasTags(link)"
-							 style="color: silver;"
-							>
-								<i class="fa fa-solid fa-tag text-gray-500" aria-hidden="true"></i>
-							</span>
-
-						<div class="ms-auto">
-							<!--EDIT BOOKMARK-->
-							<a type="button" href="#" @click.prevent="openEditModal(link)" aria-label="edit bookmark" :title="this.$p.t('bookmark/editBookmark')">
-								<i class="fa fa-edit me-1" aria-hidden="true"></i>
-							</a>
-							<!--DELETE BOOKMARK-->
-							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" :title="this.$p.t('bookmark/deleteBookmark')" @click.prevent="removeLink(link.bookmark_id)">
-								<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
-							</a>
-							<!--SORT BOOKMARKS-->
-							<a
-								v-if="sharedFiltered.length > 1"
-								type="button"
-								id="downsortBookmark"
-								href="#"
-								aria-label="sortdown bookmark"
-								:title="this.$p.t('bookmark/sortDownwards')"
-								@click.prevent="sortDown(link.bookmark_id)"
-								>
-								<i :class="[ 'fa', 'fa-arrow-down', 'me-1', link.sort === maxSort ? 'text-light pointer-events-none' : '' ]"></i>
-							</a>
-							<a
-								v-if="sharedFiltered.length > 1"
-								type="button"
-								id="upsortBookmark"
-								href="#"
-								aria-label="sortup bookmark"
-								:title="this.$p.t('bookmark/sortToTop')"
-								@click.prevent="sortUp(link.bookmark_id)"
-								>
-								<i :class="[ 'fa', 'fa-arrow-up', 'me-1', link.sort === minSort ? 'text-light pointer-events-none' : '' ]"></i>
-							</a>
-						</div>
 					</div>
-                </template>
+				</div>
+			</template>
 
-                <div v-else class="d-flex mt-2">
-                    <span>{{$p.t('bookmark','emptyBookmarks')}}</span>
-                </div>
+			<div v-else class="d-flex mt-2">
+				<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
+			</div>
 
 
-            <template v-else>
-                <p v-for="i in 4" class="placeholder-glow">
-                    <span class="placeholder" :class="{'col-9' : true}"></span>
-                </p>
-            </template>
-            
-         </template>
+			<template v-else>
+				<p v-for="i in 4" class="placeholder-glow">
+					<span class="placeholder col-9"></span>
+				</p>
+			</template>
+
+		</template>
 	</div>
 	<!--EDIT MODAL-->
 	<teleport to="body">
-		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
+		<bs-modal
+			ref="editModal"
+			@hide-bs-modal="bookmark_id=null; clearInputs();"
+		>
 			<template #title>
-				<h2>{{$p.t('bookmark','editLink')}}</h2>
+				<h2>{{ $p.t('bookmark', 'editLink') }}</h2>
 			</template>
 			<template #default>
 
-				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
+				<form-input
+					:label="$p.t('profil', 'Titel')"
+					:title="$p.t('profil','Titel')"
+					id="editTitle"
+					v-model="title_input"
+					name="title"
+					class="mb-2"
+				></form-input>
+				<form-input
+					label="Url"
+					title="Url"
+					id="editUrl"
+					v-model="url_input"
+					name="url"
+				></form-input>
 
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
@@ -485,24 +544,39 @@ export default {
 						dropdown
 						:suggestions="filteredArray"
 						@complete="search" 
-						/>
+					/>
 				</div>				
 			</template>
 			<template #footer>
-				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
+				<button @click="editBookmark" class="btn btn-primary">
+					{{ $p.t('bookmark', 'saveLink') }}
+				</button>
 			</template>
 		</bs-modal>
 	</teleport>
 	<!--CREATE MODAL-->
 	<teleport to="body">
-		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
+		<bs-modal ref="createModal" @hide-bs-modal="clearInputs();">
 			<template #title>
-				<h2>{{$p.t('bookmark','newLink')}}</h2>
+				<h2>{{ $p.t('bookmark', 'newLink') }}</h2>
 			</template>
 			<template #default>
 
-				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<form-input label="Url" title="Url" id="insertUrl" v-model="url_input" name="url"></form-input>
+				<form-input
+					:label="$p.t('profil', 'Titel')"
+					:title="$p.t('profil', 'Titel')"
+					id="insertTitle"
+					v-model="title_input"
+					name="title"
+					class="mb-2"
+				></form-input>
+				<form-input
+					label="Url"
+					title="Url"
+					id="insertUrl"
+					v-model="url_input"
+					name="url"
+				></form-input>
 
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
@@ -517,40 +591,42 @@ export default {
 
 			</template>
 			<template #footer>
-				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
+				<button @click="insertBookmark" class="btn btn-primary">
+					{{ $p.t('bookmark', 'saveLink') }}
+				</button>
 			</template>
 		</bs-modal>
 	</teleport>
 	<!--FILTER MODAL-->
 	<teleport to="body">
-		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="filterModal">
+		<bs-modal ref="filterModal" @hide-bs-modal="clearInputs();">
 			<template #title>
-				<h2>{{$p.t('bookmark','headerFilterBookmark')}}</h2>
+				<h2>{{ $p.t('bookmark', 'headerFilterBookmark') }}</h2>
 			</template>
 			<template #default>
 
-			<div class="mt-2 row">
-				<div class="col-10">
-					<PvMultiSelect
-						v-model="selectedFilters"
-						id="tagFilterUrl"
-						:options="tagsArrayMS"
-						optionLabel="tag"
-						display="chip"
-						:placeholder="$p.t('bookmark','noFilter')"
-						:maxSelectedLabels="3"
-						class="p-inputtext-sm w-100 me-2"
+				<div class="mt-2 row">
+					<div class="col-10">
+						<PvMultiSelect
+							v-model="selectedFilters"
+							id="tagFilterUrl"
+							:options="tagsArrayMS"
+							optionLabel="tag"
+							display="chip"
+							:placeholder="$p.t('bookmark', 'noFilter')"
+							:maxSelectedLabels="3"
+							class="p-inputtext-sm w-100 me-2"
 						/>
-				</div>
-			</div>				
+					</div>
+				</div>				
 
 			</template>
 			<template #footer>
 				<button
 					class="btn btn-secondary"
 					@click="handleAddingTagFilter(widgetId)"
-					:title="$p.t('bookmark','filterByTags')"
-					>
+					:title="$p.t('bookmark', 'filterByTags')"
+				>
 					OK
 				</button>
 			</template>

From 332a47475e0473437436dff7b67bbeae6bf95bf4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 24 Apr 2026 11:25:36 +0200
Subject: [PATCH 173/189] fix template

---
 public/js/components/DashboardWidget/Url.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index c55c0f01f..70b16d1e5 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -500,13 +500,12 @@ export default {
 				<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
 			</div>
 
+		</template>
 
-			<template v-else>
-				<p v-for="i in 4" class="placeholder-glow">
-					<span class="placeholder col-9"></span>
-				</p>
-			</template>
-
+		<template v-else>
+			<p v-for="i in 4" class="placeholder-glow">
+				<span class="placeholder col-9"></span>
+			</p>
 		</template>
 	</div>
 	<!--EDIT MODAL-->

From 804716edb2b7be5edfd35ab1b941e70db7488280 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 24 Apr 2026 11:27:46 +0200
Subject: [PATCH 174/189] remove unused inject

---
 public/js/components/DashboardWidget/Url.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 70b16d1e5..3ecc8c1b6 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -9,10 +9,6 @@ export default {
 	name: "WidgetsUrl",
 	mixins: [AbstractWidget],
 	inject: {
-		editModeIsActive: {
-			type: Boolean,
-			default: false
-		},
 		sectionName: {
 			type: String,
 			default: false

From 98730ce6120f878d5efed849032a2c6c2f149aa9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 09:02:58 +0200
Subject: [PATCH 175/189] Overwrite config in update because otherwise deleted
 fields would be overwritten by the previous state

---
 public/js/components/Dashboard/Admin/Presets.js | 5 ++++-
 public/js/components/Dashboard/Dashboard.js     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 63e8b99e0..117b5d8ba 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -78,7 +78,10 @@ export default {
 				const section = this.sections.find(section => section.name == section_name);
 				for (var wid in section.widgets) {
 					if (section.widgets[wid].id == k) {
-						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
+						const copy = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
+						if (payload[k].config)
+							copy.config = payload[k].config;
+						payload[k] = copy;
 						// NOTE(chris): remove internal props
 						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'custom'])
 							if (payload[k][prop])
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 2fcd743b4..428c2ebdc 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -63,7 +63,10 @@ export default {
 			for (var k in payload) {
 				for (var wid in this.widgets) {
 					if (this.widgets[wid].id == k) {
-						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
+						const copy = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
+						if (payload[k].config)
+							copy.config = payload[k].config;
+						payload[k] = copy;
 						// NOTE(chris): remove internal props
 						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'preset'])
 							if (payload[k][prop])

From 5798e960a2d0d1952c55ba52e73ad65b8d1f3558 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 09:37:17 +0200
Subject: [PATCH 176/189] Use config update for widgets as intended instead of
 a proprietary solution

---
 .../controllers/api/frontend/v1/Bookmark.php  | 139 ------------------
 .../models/dashboard/Bookmark_model.php       |  63 --------
 public/js/api/factory/widget/bookmark.js      |  25 ----
 public/js/components/DashboardWidget/Url.js   | 100 +++----------
 4 files changed, 17 insertions(+), 310 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index 4482159db..e152907b3 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -33,10 +33,6 @@ class Bookmark extends FHCAPI_Controller
 			'update' => self::PERM_LOGGED,
 			'changeOrder' => self::PERM_LOGGED,
 			'getAllBookmarkTags' => self::PERM_LOGGED,
-			'getTagFilter' => self::PERM_LOGGED,
-			'addAndUpdateTagFilter' => self::PERM_LOGGED,
-			'isInOverride' => self::PERM_LOGGED,
-			'addWidgetToOverride' => self::PERM_LOGGED,
 		]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
@@ -188,140 +184,5 @@ class Bookmark extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(current($bookmarks));
 	}
-
-	/**
-	 * get all tagFilter of a certain bookmark widget
-	 * @access public
-	 * @return void
-	 */
-	public function getTagFilter($widgetId, $sectionName)
-	{
-		$result = $this->BookmarkModel->getTagFilter($widgetId, $this->uid, $sectionName);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-	/**
-	 * get all tagFilter of a certain bookmark widget
-	 * @access public
-	 * @return void
-	 */
-	public function addAndUpdateTagFilter($widgetId, $sectionName)
-	{
-		$tags = $this->input->post('tags',true);
-		if (is_array($tags))
-		{
-			$tags = json_encode($tags);
-		}
-		$result = $this->BookmarkModel->addAndUpdateTagFilter($widgetId, $this->uid, $sectionName, $tags);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * checks if a widget has already an entry in the benutzeroverride
-	 * @access public
-	 * @return void
-	 */
-	public function isInOverride($widgetId, $sectionName)
-	{
-		$result = $this->BookmarkModel->checkOrAddToOverride($widgetId, $this->uid, $sectionName);
-
-		$data = getData($result);
-		if(!$data)
-			$this->terminateWithSuccess([false, 0]);
-
-		$id = current($data)->widgetid;
-		$id = trim($id, '"');
-
-		if ($id != $widgetId)
-			$this->terminateWithSuccess([false, 1]);
-		else
-			$this->terminateWithSuccess([true, null]);
-	}
-	/**
-	 * adds widget benutzeroverride
-	 * @access public
-	 * @return void
-	 */
-	public function addWidgetToOverride($widgetId, $sectionName, $mode, $x, $y, $h, $w)
-	{
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$dashboard_kurzbz = "CIS";
-		$structure = [
-			"custom" => [
-				"widgets" => []
-			],
-			"general" => [
-				"widgets" => [
-					$widgetId => [
-						"widget" => 3,
-						"config" => new stdClass(),
-						"place" => [
-							"3" => [
-								"x" => $x,
-								"y" => $y,
-								"w" => $w,
-								"h" => $h
-							]
-						],
-						"widgetid" => $widgetId,
-						"custom" => 1,
-						"id" => "insertByBookmarkwidget"
-					]
-				]
-			]
-		];
-		$jsonOverrideNew = json_encode($structure, JSON_UNESCAPED_UNICODE);
-
-		//no existing benutzeroverride
-		if($mode == 0)
-		{
-			$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $this->uid);
-
-			$override->override = $jsonOverrideNew;
-
-			$result = $this->DashboardLib->insertOrUpdateOverride($override);
-
-			$this->terminateWithSuccess($result);
-
-		}
-		//benutzeroverride existing, but widget not included
-		elseif($mode == 1)
-		{
-			$overrideExisting = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $this->uid);
-			$override = json_decode($overrideExisting->override, true); // decode as Array
-
-			$newWidget = [
-				"widget" => 3,
-				"config" => new stdClass(),
-				"place" => [
-					"3" => [
-						"x" => $x,
-						"y" => $y,
-						"w" => $w,
-						"h" => $h
-					]
-				],
-				"widgetid" => $widgetId,
-				"custom" => 1,
-				"id" => "insertByBookmarkwidget"
-			];
-
-			$override['general']['widgets'][$widgetId] = $newWidget;
-
-			$jsonOverrideUpdated = json_encode($override, JSON_UNESCAPED_UNICODE);
-			$overrideExisting->override = $jsonOverrideUpdated;
-
-			$result = $this->DashboardLib->insertOrUpdateOverride($overrideExisting);
-
-			$this->terminateWithSuccess($result);
-		}
-		else
-			$this->terminateWithError("Error: no known mode");
-	}
-
 }
 
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
index 931fe7064..8c70faf04 100644
--- a/application/models/dashboard/Bookmark_model.php
+++ b/application/models/dashboard/Bookmark_model.php
@@ -28,67 +28,4 @@ class Bookmark_model extends DB_Model
 
 		return $this->execQuery($qry, array('uid' => $uid));
 	}
-
-	/**
-	 * Get Overrides of given uid and funktion_kurzbz and widget_id
-	 * @param integer $widget_id
-	 * @param string $uid
-	 * @param string $funktion_kurzbz
-	 * @return array
-	 */
-	public function getTagFilter($widgetId, $uid, $funktion_kurzbz)
-	{
-		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'config' -> 'tags' AS tags FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
-
-		return $this->execQuery($qry);
-	}
-
-	/*
-	 * updates Tagfilter
-	 * checks and changes type of config
-	 * if config == array -> change to object
-	 */
-	public function addAndUpdateTagFilter($widgetId, $uid, $funktion_kurzbz, $tags)
-	{
-		$params = [
-			$funktion_kurzbz, $widgetId,
-			$funktion_kurzbz, $widgetId,
-			$funktion_kurzbz, $widgetId,
-			$funktion_kurzbz, $widgetId,
-			$tags,
-			$uid
-		];
-
-		$qry = "
-			UPDATE dashboard.tbl_dashboard_benutzer_override
-			SET override = jsonb_set(
-				-- check if config is object
-				jsonb_set(
-					COALESCE(override, '{}'::jsonb),
-					format('{%s,widgets,%s,config}', ?, ?)::text[],
-					CASE
-						WHEN jsonb_typeof(override #> format('{%s,widgets,%s,config}', ?, ?)::text[]) = 'array'
-						THEN '{}'::jsonb
-						ELSE COALESCE((override #> format('{%s,widgets,%s,config}', ?, ?)::text[])::jsonb, '{}'::jsonb)
-					END,
-					true
-				),
-				-- insert tags
-				format('{%s,widgets,%s,config,tags}', ?, ?)::text[],
-				?::jsonb,
-				true
-			)
-			WHERE uid = ?
-		";
-
-		return $this->execQuery($qry, $params);
-	}
-
-	public function checkOrAddToOverride($widgetId, $uid, $funktion_kurzbz)
-	{
-		$params = [$funktion_kurzbz, $widgetId, $uid];
-		$qry = " SELECT override -> '" . $funktion_kurzbz . "'-> 'widgets'-> '" . $widgetId . "'-> 'widgetid' as widgetid FROM dashboard.tbl_dashboard_benutzer_override WHERE uid = '" . $uid . "';";
-
-		return $this->execQuery($qry, $params);
-	}
 }
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index 9379b42b2..3f034fee6 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -54,30 +54,5 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/Bookmark/getAllBookmarkTags'
 		};
-	},
-	getTagFilter(widgetId, sectionName){
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/Bookmark/getTagFilter/${widgetId}/${sectionName}`
-		};
-	},
-	addTagFilter(widgetId, sectionName, tags){
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/Bookmark/addAndUpdateTagFilter/${widgetId}/${sectionName}`,
-			params: { tags }
-		};
-	},
-	isInOverride(widgetId, sectionName){
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/Bookmark/isInOverride/${widgetId}/${sectionName}`
-		};
-	},
-	addWidgetToOverride(widgetId, sectionName, mode, x, y, h, w){
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/Bookmark/addWidgetToOverride/${widgetId}/${sectionName}/${mode}/${x}/${y}/${h}/${w}`,
-		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 3ecc8c1b6..d3b275cff 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -197,12 +197,11 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		filterBookmarksByTags(bookmarks) {
-			const filter = this.filter;
-			if (!filter || filter.length === 0 || filter == "[]") return bookmarks;
-
-			return bookmarks.filter(b => {
-				const tags = JSON.parse(b.tag || "[]");
-				return tags.some(tag => filter.includes(tag));
+			if (!this.config.tags || !this.config.tags.length)
+				return bookmarks;
+			return bookmarks.filter(bookmark => {
+				const tags = JSON.parse(bookmark.tag || "[]");
+				return tags.some(tag => this.config.tags.includes(tag));
 			});
 		},
 		sortDown(bookmark_id){
@@ -281,81 +280,19 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		openFilterModal(){
+		openFilterModal() {
+			if (this.config.tags && this.config.tags.length)
+				this.selectedFilters = this.prepareTag(this.config.tags);
+			else
+				this.selectedFilters = [];
 			this.$refs.filterModal.show();
 		},
-		async handleAddingTagFilter(widgetId){
-
-			const result = await this.isInOverride(widgetId);
-
-			if (!result) {
-				return;
-			}
-			const [status, reason] = result;
-
-			if (status) {
-				this.addTagFilter(widgetId);
-			} else {
-				this.addWidgetToOverride(widgetId, reason);
-			}
-		},
-		addTagFilter(widgetId){
-			this.$api
-				.call(ApiBookmark.addTagFilter(widgetId, this.sectionName, this.filterInput))
-				.then((res) => res.data)
-				.then((result) => {
-					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
-					this.$refs.filterModal.hide();
-					this.getTagFilter(this.widgetId);
-
-					this.$nextTick(() => {
-						this.getAllBookmarkTags();
-					});
-					this.fetchBookmarks();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		async isInOverride(widgetId) {
-			try {
-				const res = await this.$api.call(ApiBookmark.isInOverride(widgetId, this.sectionName));
-				const result = res.data;
-				return result;
-			} catch (err) {
-				this.$fhcAlert.handleSystemError(err);
-				return null;
-			}
-		},
-		addWidgetToOverride(widgetId, reason){
-			this.$api
-				.call(ApiBookmark.addWidgetToOverride(
-					widgetId,
-					this.sectionName,
-					reason,
-					this.item_data.x,
-					this.item_data.y,
-					this.item_data.h,
-					this.item_data.w
-				))
-				.then((res) => res.data)
-				.then((result) => {
-					this.addTagFilter(widgetId);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		getTagFilter(widget_id) {
-			this.$api
-				.call(ApiBookmark.getTagFilter(widget_id, this.sectionName))
-				.then((res) => res.data)
-				.then((result) => {
-					const rawTags = result.tags; // string
-					this.filter = rawTags;
-					if(rawTags != null) {
-						this.rawTagsParsed = JSON.parse(rawTags);
-						this.selectedFilters = this.prepareTag(this.rawTagsParsed);
-					}
-					this.fetchBookmarks();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+		async handleAddingTagFilter(widgetId) {
+			this.config.tags = [ ...this.filterInput ];
+			this.$emit('change');
+			this.sharedFiltered = this.filterBookmarksByTags(this.shared);
+			this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
+			this.$refs.filterModal.hide();
 		},
 		search(event) {
 			const query = event.query ?? "";
@@ -372,9 +309,6 @@ export default {
 		},
 	},
 	async mounted() {
-		if(this.widgetId) {
-			this.getTagFilter(this.widgetId);
-		}
 		await this.fetchBookmarks();
 		this.getAllBookmarkTags();
 	},
@@ -394,7 +328,7 @@ export default {
 				{{ $p.t('bookmark', 'newLink') }}
 			</button>
 			<button
-				v-if="selectedFilters.length"
+				v-if="config.tags && config.tags.length"
 				class="btn btn-secondary btn-sm"
 				:title="$p.t('bookmark/editFilter')"
 				@click="openFilterModal"

From 9c03b89ab59966ce45de80d8c4ee8382abc83f50 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 09:37:33 +0200
Subject: [PATCH 177/189] get rid of tagsArrayMS and filterInput because they
 are unnecessary

---
 public/js/components/DashboardWidget/Url.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index d3b275cff..631f75022 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -31,7 +31,6 @@ export default {
 			invalidURL: false,
 			invalidTitel: false,
 		},
-		tagsArrayMS: [],
 		tagsArrayAC: [],
 		selectedTags: [],
 		newTag: null,
@@ -70,10 +69,7 @@ export default {
 				return 0;
 			else
 				return Math.min(...this.sharedFiltered.map(b => b.sort));
-		},
-		filterInput(){
-			return this.selectedFilters.map(item => item.tag);
-		},
+		}
 	},
 	methods: {
 		stopDrag(event){
@@ -272,9 +268,6 @@ export default {
 				.call(ApiBookmark.getAllBookmarkTags())
 				.then((res) => res.data)
 				.then((result) => {
-					//Version Chips
-					this.tagsArrayMS = this.prepareTag(result.data);
-
 					//Version Autocomplete
 					this.tagsArrayAC = result.data;
 				})
@@ -282,13 +275,13 @@ export default {
 		},
 		openFilterModal() {
 			if (this.config.tags && this.config.tags.length)
-				this.selectedFilters = this.prepareTag(this.config.tags);
+				this.selectedFilters = [ ...this.config.tags ];
 			else
 				this.selectedFilters = [];
 			this.$refs.filterModal.show();
 		},
 		async handleAddingTagFilter(widgetId) {
-			this.config.tags = [ ...this.filterInput ];
+			this.config.tags = this.selectedFilters;
 			this.$emit('change');
 			this.sharedFiltered = this.filterBookmarksByTags(this.shared);
 			this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
@@ -539,8 +532,7 @@ export default {
 						<PvMultiSelect
 							v-model="selectedFilters"
 							id="tagFilterUrl"
-							:options="tagsArrayMS"
-							optionLabel="tag"
+							:options="tagsArrayAC"
 							display="chip"
 							:placeholder="$p.t('bookmark', 'noFilter')"
 							:maxSelectedLabels="3"

From 746f8bc736546406a2a46e9ac9b2823c8cbd5a02 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 09:37:59 +0200
Subject: [PATCH 178/189] bugfix: overwriting const

---
 public/js/components/Drop/Grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1cecf0031..6d9777c28 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -258,7 +258,7 @@ export default {
 			if (this.mode != MODE_IDLE)
 				this.dragCancel();
 
-			const updated = this.createNewGrid(this.indexedItems);
+			let updated = this.createNewGrid(this.indexedItems);
 
 			this.correctedPositionUpdates = updated;
 			if (updated.length)

From 9109ead81c051b2c518819a42da4d58cb482b59d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 09:44:11 +0200
Subject: [PATCH 179/189] bogfix: missing primevue config in dashboard admin
 app

---
 public/js/apps/Dashboard/Admin.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 685e1bc9c..c361c2fb4 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -18,6 +18,12 @@ const app = Vue.createApp({
 		};
 	}
 });
+app.use(primevue.config.default, {
+	zIndex: {
+		overlay: 9000,
+		tooltip: 8000
+	}
+})
 app.use(PluginsPhrasen);
 app.directive('tooltip', primevue.tooltip);
 app.mount('#main');
\ No newline at end of file

From dfe05cbfa8ec814e3638209a917d0ed74a65d4c6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 10:03:36 +0200
Subject: [PATCH 180/189] make tagsArrayAC a computed and rename it to
 availableTags

---
 .../controllers/api/frontend/v1/Bookmark.php  | 18 +------------
 .../models/dashboard/Bookmark_model.php       | 17 -------------
 public/js/api/factory/widget/bookmark.js      |  6 -----
 public/js/components/DashboardWidget/Url.js   | 25 ++++++-------------
 4 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index e152907b3..84c5406a9 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -31,8 +31,7 @@ class Bookmark extends FHCAPI_Controller
             'delete' => self::PERM_LOGGED,
 			'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
-			'changeOrder' => self::PERM_LOGGED,
-			'getAllBookmarkTags' => self::PERM_LOGGED,
+			'changeOrder' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
@@ -169,20 +168,5 @@ class Bookmark extends FHCAPI_Controller
 
         $this->terminateWithSuccess($update_result);
     }
-
-	/**
-	 * get all the bookmark tags associated to a user
-	 * @access public
-	 * @return void
-	 */
-	public function getAllBookmarkTags()
-	{
-		$this->BookmarkModel->addOrder("sort");
-		$result = $this->BookmarkModel->getAllBookmarkTags($this->uid);
-
-		$bookmarks = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($bookmarks));
-	}
 }
 
diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php
index 8c70faf04..d9756294e 100644
--- a/application/models/dashboard/Bookmark_model.php
+++ b/application/models/dashboard/Bookmark_model.php
@@ -11,21 +11,4 @@ class Bookmark_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_bookmark';
 		$this->pk = 'bookmark_id';
 	}
-
-	/**
-	 * returns all bookmark tags of a user
-	 */
-	public function getAllBookmarkTags($uid)
-	{
-		$qry = "
-			SELECT array_agg(DISTINCT tag) AS data
-			FROM (
-			  SELECT jsonb_array_elements_text(tag) AS tag
-			  FROM dashboard.tbl_bookmark
-			  WHERE uid = ?
-			) t;
-		";
-
-		return $this->execQuery($qry, array('uid' => $uid));
-	}
 }
diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js
index 3f034fee6..2035a9f8f 100644
--- a/public/js/api/factory/widget/bookmark.js
+++ b/public/js/api/factory/widget/bookmark.js
@@ -48,11 +48,5 @@ export default {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/changeOrder/${bookmark_id1}/${bookmark_id2}`,
 		};
-	},
-	getAllBookmarkTags() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Bookmark/getAllBookmarkTags'
-		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 631f75022..38dad5ce7 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -31,7 +31,6 @@ export default {
 			invalidURL: false,
 			invalidTitel: false,
 		},
-		tagsArrayAC: [],
 		selectedTags: [],
 		newTag: null,
 		selectedFilters: [],
@@ -40,6 +39,12 @@ export default {
 		sharedFiltered: {},
 	}),
 	computed: {
+		availableTags() {
+			return (this.shared || [])
+				.map(bookmark => JSON.parse(bookmark.tag))
+				.flat()
+				.filter((v, i, a) => v && a.indexOf(v) === i);
+		},
 		tagName() {
 			return this.config.tag !== undefined && this.config.tag.length > 0
 				? this.config.tag
@@ -106,7 +111,6 @@ export default {
 				.then((result) => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated"));
 					// refetch the bookmarks to see the updates
-					this.getAllBookmarkTags();
 					this.fetchBookmarks();
 					// reset the values for the title and url inputs
 					this.clearInputs();
@@ -141,7 +145,6 @@ export default {
 				.then((result) => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
 					// refetch the bookmarks to see the updates
-					this.getAllBookmarkTags();
 					this.fetchBookmarks();
 					this.$refs.createModal.hide();
 					// reset the values for the title and url inputs
@@ -188,7 +191,6 @@ export default {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
 					// refetch the bookmarks to see the updates
 					this.fetchBookmarks();
-					this.getAllBookmarkTags();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -263,16 +265,6 @@ export default {
 
 			return result;
 		},
-		getAllBookmarkTags(){
-			this.$api
-				.call(ApiBookmark.getAllBookmarkTags())
-				.then((res) => res.data)
-				.then((result) => {
-					//Version Autocomplete
-					this.tagsArrayAC = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		openFilterModal() {
 			if (this.config.tags && this.config.tags.length)
 				this.selectedFilters = [ ...this.config.tags ];
@@ -291,7 +283,7 @@ export default {
 			const query = event.query ?? "";
 
 			// Filter for text
-			this.filteredArray = this.tagsArrayAC.filter(item =>
+			this.filteredArray = this.availableTags.filter(item =>
 				item.toLowerCase().includes(query.toLowerCase())
 			);
 
@@ -303,7 +295,6 @@ export default {
 	},
 	async mounted() {
 		await this.fetchBookmarks();
-		this.getAllBookmarkTags();
 	},
 	created() {
 		// this.$emit('setConfig', true); // -> use this to enable widget config mode if needed
@@ -532,7 +523,7 @@ export default {
 						<PvMultiSelect
 							v-model="selectedFilters"
 							id="tagFilterUrl"
-							:options="tagsArrayAC"
+							:options="availableTags"
 							display="chip"
 							:placeholder="$p.t('bookmark', 'noFilter')"
 							:maxSelectedLabels="3"

From ca79b0c4d802562580eef9c7c85c4974ec4c2252 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 10:15:44 +0200
Subject: [PATCH 181/189] make sharedFiltered a computed and rename it to
 filteredBookmarks & get rid of unnecessary functions

---
 public/js/components/DashboardWidget/Url.js | 201 +++++++++-----------
 1 file changed, 90 insertions(+), 111 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 38dad5ce7..b6a780dc1 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -35,8 +35,7 @@ export default {
 		newTag: null,
 		selectedFilters: [],
 		filter: [],
-		filteredArray: [],
-		sharedFiltered: {},
+		filteredArray: []
 	}),
 	computed: {
 		availableTags() {
@@ -45,17 +44,17 @@ export default {
 				.flat()
 				.filter((v, i, a) => v && a.indexOf(v) === i);
 		},
-		tagName() {
-			return this.config.tag !== undefined && this.config.tag.length > 0
-				? this.config.tag
-				: this.$p.t("bookmark", "myBookmarks");
-		},
-		emptyBookmarks() {
-			if (this.shared instanceof Array && this.shared.length == 0) return true;
+		filteredBookmarks() {
+			if (!this.shared)
+				return [];
 
-			if (!this.shared) return true;
+			if (!this.config.tags || !this.config.tags.length)
+				return this.shared;
 
-			return false;
+			return this.shared.filter(bookmark => {
+				const tags = JSON.parse(bookmark.tag || "[]");
+				return tags.some(tag => this.config.tags.includes(tag));
+			});
 		},
 		newSort(){
 			if(this.shared.length == 0)
@@ -67,19 +66,16 @@ export default {
 			if(this.shared.length == 0)
 				return 0;
 			else
-				return Math.max(...this.sharedFiltered.map(b => b.sort));
+				return Math.max(...this.filteredBookmarks.map(b => b.sort));
 		},
 		minSort(){
 			if(this.shared.length == 0)
 				return 0;
 			else
-				return Math.min(...this.sharedFiltered.map(b => b.sort));
+				return Math.min(...this.filteredBookmarks.map(b => b.sort));
 		}
 	},
 	methods: {
-		stopDrag(event){
-			event.preventDefault();
-		},
 		clearInputs(){
 			this.title_input = "";
 			this.url_input = "";
@@ -171,10 +167,6 @@ export default {
 				.then((res) => res.data)
 				.then((result) => {
 					this.shared = result;
-
-					this.$nextTick(() => {
-						this.sharedFiltered = this.filterBookmarksByTags(this.shared);
-					});
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -194,18 +186,10 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		filterBookmarksByTags(bookmarks) {
-			if (!this.config.tags || !this.config.tags.length)
-				return bookmarks;
-			return bookmarks.filter(bookmark => {
-				const tags = JSON.parse(bookmark.tag || "[]");
-				return tags.some(tag => this.config.tags.includes(tag));
-			});
-		},
 		sortDown(bookmark_id){
-			const current = this.sharedFiltered.find(b => b.bookmark_id === bookmark_id);
+			const current = this.filteredBookmarks.find(b => b.bookmark_id === bookmark_id);
 
-			const next = this.sharedFiltered
+			const next = this.filteredBookmarks
 				.filter(b => b.sort > current.sort)
 				.sort((a, b) => a.sort - b.sort)[0];
 
@@ -216,9 +200,9 @@ export default {
 			this.changeOrder(current.bookmark_id, next.bookmark_id);
 		},
 		sortUp(bookmark_id){
-			const current = this.sharedFiltered.find(b => b.bookmark_id === bookmark_id);
+			const current = this.filteredBookmarks.find(b => b.bookmark_id === bookmark_id);
 
-			const next = this.sharedFiltered
+			const next = this.filteredBookmarks
 				.filter(b => b.sort < current.sort)
 				.sort((a, b) => a.sort + b.sort)[0];
 
@@ -275,7 +259,6 @@ export default {
 		async handleAddingTagFilter(widgetId) {
 			this.config.tags = this.selectedFilters;
 			this.$emit('change');
-			this.sharedFiltered = this.filterBookmarksByTags(this.shared);
 			this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
 			this.$refs.filterModal.hide();
 		},
@@ -329,93 +312,89 @@ export default {
 			</button>
 		</div>
 
-		<template v-if="sharedFiltered">
-
-			<template v-if="!emptyBookmarks">
-				<div
-					v-for="link in sharedFiltered"
-					:key="link.id"
-					class="d-flex mt-2"
+		<template v-if="filteredBookmarks.length">
+			<div
+				v-for="link in filteredBookmarks"
+				:key="link.id"
+				class="d-flex mt-2"
+			>
+				<a target="_blank" :href="link.url" class="me-1">
+					<i
+						class="fa fa-solid fa-arrow-up-right-from-square me-1"
+						aria-hidden="true"
+					></i>
+					{{ link.title }}
+				</a>
+				<span
+					v-if="hasTags(link)"
+					:title="hasTags(link)"
+					style="color: silver;"
 				>
-					<a target="_blank" :href="link.url" class="me-1">
-						<i
-							class="fa fa-solid fa-arrow-up-right-from-square me-1"
-							aria-hidden="true"
-						></i>
-						{{ link.title }}
+					<i
+						class="fa fa-solid fa-tag text-gray-500"
+						aria-hidden="true"
+					></i>
+				</span>
+
+				<div class="ms-auto">
+					<!--EDIT BOOKMARK-->
+					<a
+						type="button"
+						href="#"
+						@click.prevent="openEditModal(link)"
+						aria-label="edit bookmark"
+						:title="$p.t('bookmark/editBookmark')"
+					>
+						<i class="fa fa-edit me-1" aria-hidden="true"></i>
 					</a>
-					<span
-						v-if="hasTags(link)"
-						:title="hasTags(link)"
-						style="color: silver;"
+					<!--DELETE BOOKMARK-->
+					<a
+						type="button"
+						id="deleteBookmark"
+						href="#"
+						aria-label="delete bookmark"
+						:title="$p.t('bookmark/deleteBookmark')"
+						@click.prevent="removeLink(link.bookmark_id)"
+					>
+						<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
+					</a>
+					<!--SORT BOOKMARKS-->
+					<a
+						v-if="filteredBookmarks.length > 1"
+						type="button"
+						id="downsortBookmark"
+						href="#"
+						aria-label="sortdown bookmark"
+						:title="$p.t('bookmark/sortDownwards')"
+						@click.prevent="sortDown(link.bookmark_id)"
 					>
 						<i
-							class="fa fa-solid fa-tag text-gray-500"
-							aria-hidden="true"
+							class="fa fa-arrow-down me-1"
+							:class="{ 'text-light pointer-events-none': link.sort === maxSort }"
 						></i>
-					</span>
-
-					<div class="ms-auto">
-						<!--EDIT BOOKMARK-->
-						<a
-							type="button"
-							href="#"
-							@click.prevent="openEditModal(link)"
-							aria-label="edit bookmark"
-							:title="$p.t('bookmark/editBookmark')"
-						>
-							<i class="fa fa-edit me-1" aria-hidden="true"></i>
-						</a>
-						<!--DELETE BOOKMARK-->
-						<a
-							type="button"
-							id="deleteBookmark"
-							href="#"
-							aria-label="delete bookmark"
-							:title="$p.t('bookmark/deleteBookmark')"
-							@click.prevent="removeLink(link.bookmark_id)"
-						>
-							<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
-						</a>
-						<!--SORT BOOKMARKS-->
-						<a
-							v-if="sharedFiltered.length > 1"
-							type="button"
-							id="downsortBookmark"
-							href="#"
-							aria-label="sortdown bookmark"
-							:title="$p.t('bookmark/sortDownwards')"
-							@click.prevent="sortDown(link.bookmark_id)"
-						>
-							<i
-								class="fa fa-arrow-down me-1"
-								:class="{ 'text-light pointer-events-none': link.sort === maxSort }"
-							></i>
-						</a>
-						<a
-							v-if="sharedFiltered.length > 1"
-							type="button"
-							id="upsortBookmark"
-							href="#"
-							aria-label="sortup bookmark"
-							:title="$p.t('bookmark/sortToTop')"
-							@click.prevent="sortUp(link.bookmark_id)"
-						>
-							<i
-								class="fa fa-arrow-up me-1"
-								:class="{ 'text-light pointer-events-none': link.sort === minSort }"
-							></i>
-						</a>
-					</div>
+					</a>
+					<a
+						v-if="filteredBookmarks.length > 1"
+						type="button"
+						id="upsortBookmark"
+						href="#"
+						aria-label="sortup bookmark"
+						:title="$p.t('bookmark/sortToTop')"
+						@click.prevent="sortUp(link.bookmark_id)"
+					>
+						<i
+							class="fa fa-arrow-up me-1"
+							:class="{ 'text-light pointer-events-none': link.sort === minSort }"
+						></i>
+					</a>
 				</div>
-			</template>
-
-			<div v-else class="d-flex mt-2">
-				<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
 			</div>
-
 		</template>
 
+		<div v-else class="d-flex mt-2">
+			<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
+		</div>
+
 		<template v-else>
 			<p v-for="i in 4" class="placeholder-glow">
 				<span class="placeholder col-9"></span>

From 51be318edc87480329c5f8b32c68b278a9ef3b7f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 10:26:48 +0200
Subject: [PATCH 182/189] replace Api calls with UrlStore

---
 public/js/components/DashboardWidget/Url.js   | 104 +++++++-----------
 .../Pseudostore/DashboardWidget/UrlStore.js   |  78 +++++++++++++
 2 files changed, 119 insertions(+), 63 deletions(-)
 create mode 100644 public/js/composables/Pseudostore/DashboardWidget/UrlStore.js

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b6a780dc1..869c75b4d 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -3,7 +3,7 @@ import FormInput from "../Form/Input.js";
 import BsModal from "../Bootstrap/Modal.js";
 import AbstractWidget from './Abstract.js';
 
-import ApiBookmark from '../../api/factory/widget/bookmark.js';
+import { useUrlStore } from '../../composables/Pseudostore/DashboardWidget/UrlStore.js';
 
 export default {
 	name: "WidgetsUrl",
@@ -26,7 +26,6 @@ export default {
 		bookmark_id: null,
 		title_input: "",
 		url_input: "",
-		sort: null,
 		validation: {
 			invalidURL: false,
 			invalidTitel: false,
@@ -39,37 +38,37 @@ export default {
 	}),
 	computed: {
 		availableTags() {
-			return (this.shared || [])
+			return (this.bookmarks || [])
 				.map(bookmark => JSON.parse(bookmark.tag))
 				.flat()
 				.filter((v, i, a) => v && a.indexOf(v) === i);
 		},
 		filteredBookmarks() {
-			if (!this.shared)
+			if (!this.bookmarks)
 				return [];
 
 			if (!this.config.tags || !this.config.tags.length)
-				return this.shared;
+				return this.bookmarks;
 
-			return this.shared.filter(bookmark => {
+			return this.bookmarks.filter(bookmark => {
 				const tags = JSON.parse(bookmark.tag || "[]");
 				return tags.some(tag => this.config.tags.includes(tag));
 			});
 		},
 		newSort(){
-			if(this.shared.length == 0)
+			if(this.bookmarks.length == 0)
 				return 1;
 			else
-				return Math.max(...this.shared.map(b => b.sort)) + 1;
+				return Math.max(...this.bookmarks.map(b => b.sort)) + 1;
 		},
 		maxSort(){
-			if(this.shared.length == 0)
+			if(this.bookmarks.length == 0)
 				return 0;
 			else
 				return Math.max(...this.filteredBookmarks.map(b => b.sort));
 		},
 		minSort(){
-			if(this.shared.length == 0)
+			if(this.bookmarks.length == 0)
 				return 0;
 			else
 				return Math.min(...this.filteredBookmarks.map(b => b.sort));
@@ -96,18 +95,15 @@ export default {
 			event.preventDefault();
 			if(!this.bookmark_id || !this.url_input || !this.title_input) return;
 
-			this.$api
-				.call(ApiBookmark.update({
-					bookmark_id: this.bookmark_id,
-					title: this.title_input,
-					url: this.url_input,
-					tag: this.selectedTags,
-				}))
-				.then((res) => res.data)
-				.then((result) => {
+			this.actions
+				.update(
+					this.bookmark_id,
+					this.title_input,
+					this.url_input,
+					this.selectedTags
+				)
+				.then(() => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated"));
-					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
 					// reset the values for the title and url inputs
 					this.clearInputs();
 					this.$refs.editModal.hide();
@@ -128,20 +124,17 @@ export default {
 			if (!this.isValidationSuccessfull()) return;
 
 			// get highest Sort
-			this.sort = this.newSort;
+			const sort = this.newSort;
 
-			this.$api
-				.call(ApiBookmark.insert({
-					tag: this.selectedTags,
-					title: this.title_input,
-					url: this.url_input,
-					sort: this.sort
-				}))
-				.then((res) => res.data)
-				.then((result) => {
+			this.actions
+				.insert(
+					this.title_input,
+					this.url_input,
+					this.selectedTags,
+					sort
+				)
+				.then(() => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded"));
-					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
 					this.$refs.createModal.hide();
 					// reset the values for the title and url inputs
 					this.clearInputs();
@@ -161,28 +154,16 @@ export default {
 
 			return !Object.values(this.validation).some(value => value === true);
 		},
-		async fetchBookmarks() {
-			await this.$api
-				.call(ApiBookmark.getBookmarks())
-				.then((res) => res.data)
-				.then((result) => {
-					this.shared = result;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		async removeLink(bookmark_id) {
 			let isConfirmed = await this.$fhcAlert.confirmDelete();
 
 			// early return if the confirm dialog was not confirmed
 			if (!isConfirmed) return;
 
-			this.$api
-				.call(ApiBookmark.delete(bookmark_id))
-				.then((res) => res.data)
-				.then((result) => {
+			this.actions
+				.remove(bookmark_id)
+				.then(() => {
 					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
-					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -212,15 +193,8 @@ export default {
 			}
 			this.changeOrder(current.bookmark_id, next.bookmark_id);
 		},
-		changeOrder(bookmark_id_1, bookmark_id_2){
-			this.$api
-				.call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2))
-				.then((res) => res.data)
-				.then((result) => {
-					// refetch the bookmarks to see the updates
-					this.fetchBookmarks();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+		changeOrder(bookmark_id_1, bookmark_id_2) {
+			this.actions.swap(bookmark_id_1, bookmark_id_2);
 		},
 		hasTags(link) {
 			if (!link || !link.tag) return false;
@@ -276,14 +250,18 @@ export default {
 			}
 		},
 	},
+	setup() {
+		const {
+			bookmarks,
+			getters: { tags },
+			actions
+		} = useUrlStore();
+
+		return { bookmarks, tags, actions }
+	},
 	async mounted() {
-		await this.fetchBookmarks();
+		this.actions.fetch();
 	},
-	created() {
-		// this.$emit('setConfig', true); // -> use this to enable widget config mode if needed
-	},
-
-
 	template: /*html*/ `
 	<div class="widgets-url w-100 h-100 overflow-auto p-3">
 
diff --git a/public/js/composables/Pseudostore/DashboardWidget/UrlStore.js b/public/js/composables/Pseudostore/DashboardWidget/UrlStore.js
new file mode 100644
index 000000000..3d2c5a657
--- /dev/null
+++ b/public/js/composables/Pseudostore/DashboardWidget/UrlStore.js
@@ -0,0 +1,78 @@
+import ApiBookmark from '../../../api/factory/widget/bookmark.js';
+
+const bookmarksRef = Vue.ref([]);
+const tags = Vue.computed(() => {
+	return bookmarksRef.value
+		.map(bookmark => JSON.parse(bookmark.tag))
+		.flat()
+		.filter((v, i, a) => v && a.indexOf(v) === i);
+});
+const state = Vue.readonly(bookmarksRef);
+
+export function useUrlStore() {
+	const $api = Vue.inject('$api');
+	const $fhcAlert = Vue.inject('$fhcAlert');
+
+	async function fetch() {
+		try {
+			bookmarksRef.value = (await $api.call(ApiBookmark.getBookmarks())).data;
+		} catch(error) {
+			$fhcAlert.handleSystemError(error);
+			return error;
+		}
+	}
+
+	async function insert(title, url, tag, sort) {
+		try {
+			await $api.call(ApiBookmark.insert({ title, url, tag, sort }));
+			await fetch();
+		} catch(error) {
+			$fhcAlert.handleSystemError(error);
+			return error;
+		}
+	}
+
+	async function update(bookmark_id, title, url, tag) {
+		try {
+			await $api.call(ApiBookmark.update({ bookmark_id, title, url, tag }));
+			await fetch();
+		} catch(error) {
+			$fhcAlert.handleSystemError(error);
+			return error;
+		}
+	}
+
+	async function swap(bookmark_id_1, bookmark_id_2) {
+		try {
+			await $api.call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2));
+			await fetch();
+		} catch(error) {
+			$fhcAlert.handleSystemError(error);
+			return error;
+		}
+	}
+
+	async function remove(bookmark_id) {
+		try {
+			await $api.call(ApiBookmark.delete(bookmark_id));
+			await fetch();
+		} catch(error) {
+			$fhcAlert.handleSystemError(error);
+			return error;
+		}
+	}
+
+	return {
+		bookmarks: state,
+		getters: {
+			tags
+		},
+		actions: {
+			fetch,
+			insert,
+			update,
+			swap,
+			remove
+		}
+	};
+}
\ No newline at end of file

From e9b5438a2495feee3822f130d3fbad42a05b88c0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 11:01:37 +0200
Subject: [PATCH 183/189] code quality & cleanup

---
 .../controllers/api/frontend/v1/Bookmark.php  | 139 +++++----
 public/js/components/DashboardWidget/Url.js   | 276 ++++++++----------
 2 files changed, 204 insertions(+), 211 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php
index 84c5406a9..aa45709d4 100644
--- a/application/controllers/api/frontend/v1/Bookmark.php
+++ b/application/controllers/api/frontend/v1/Bookmark.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 class Bookmark extends FHCAPI_Controller
 {
 
@@ -28,7 +30,7 @@ class Bookmark extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
-            'delete' => self::PERM_LOGGED,
+			'delete' => self::PERM_LOGGED,
 			'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
 			'changeOrder' => self::PERM_LOGGED
@@ -38,96 +40,104 @@ class Bookmark extends FHCAPI_Controller
 
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	
-    /**
-	 * gets the bookmarks associated to a user 
+	/**
+	 * gets the bookmarks associated to a user
 	 * @access public
 	 * @return void
 	 */
 	public function getBookmarks()
 	{
-        $this->BookmarkModel->addOrder("sort");
+		$this->BookmarkModel->addOrder("sort");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
-        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+		$bookmarks = $this->getDataOrTerminateWithError($bookmarks);
 
-        $this->terminateWithSuccess($bookmarks);
-    }
+		$this->terminateWithSuccess($bookmarks);
+	}
 
-    /**
-	 * deletes bookmark from associated user 
+	/**
+	 * deletes bookmark from associated user
 	 * @access public
 	 * @return void
 	 */
-    public function delete($bookmark_id)
+	public function delete($bookmark_id)
 	{
-        $bookmark = $this->BookmarkModel->load($bookmark_id);
+		$bookmark = $this->BookmarkModel->load($bookmark_id);
 
-        $bookmark = current($this->getDataOrTerminateWithError($bookmark));
+		$bookmark = current($this->getDataOrTerminateWithError($bookmark));
 
-        // only delete bookmark if the user is the owner of the bookmark
-        if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){
+		// only delete bookmark if the user is the owner of the bookmark
+		if ($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')) {
+			$delete_result = $this->BookmarkModel->delete($bookmark_id);
 
-            $delete_result = $this->BookmarkModel->delete($bookmark_id);
+			$delete_result = $this->getDataOrTerminateWithError($delete_result);
 
-            $delete_result = $this->getDataOrTerminateWithError($delete_result);
+			$this->terminateWithSuccess($delete_result);
+		} else {
+			$this->_outputAuthError(['delete' => ['admin:rw']]);
+		}
+	}
 
-            $this->terminateWithSuccess($delete_result);
-        }else{
-            $this->_outputAuthError(['delete' => ['admin:rw']]);
-        }
-    }
-
-    /**
-	 * inserts new bookmark into the bookmark table 
+	/**
+	 * inserts new bookmark into the bookmark table
 	 * @access public
 	 * @return void
 	 */
-    public function insert()
+	public function insert()
 	{
-        // form validation
-        $this->load->library('form_validation');
-        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-        $url = $this->input->post('url',true);
-        $title = $this->input->post('title',true);
-        $tag = $this->input->post('tag', true);
+		$url = $this->input->post('url', true);
+		$title = $this->input->post('title', true);
+		$tag = $this->input->post('tag', true);
 		if (is_array($tag)) {
 			$tag = json_encode($tag); // convert PHP array to JSON string
 		}
 		$sort = $this->input->post('sort', true);
 
-        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL, 'sort'=>$sort,]);
+		$insert_into_result = $this->BookmarkModel->insert([
+			'uid' => $this->uid,
+			'url' => $url,
+			'title' => $title,
+			'tag' => $tag,
+			'insertvon' => $this->uid,
+			'updateamum' => null,
+			'updatevon' => null,
+			'sort' => $sort
+		]);
 
-        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+		$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
-        $this->terminateWithSuccess($insert_into_result);
-
-    }
+		$this->terminateWithSuccess($insert_into_result);
+	}
 
 	/**
-	 * updates bookmark in the bookmark table 
+	 * updates bookmark in the bookmark table
 	 * @access public
 	 * @return void
 	 */
-    public function update($bookmark_id)
+	public function update($bookmark_id)
 	{
-        // form validation
-        $this->load->library('form_validation');
-        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-        $url = $this->input->post('url',true);
-        $title = $this->input->post('title',true);
+		$url = $this->input->post('url', true);
+		$title = $this->input->post('title', true);
 		$tag = $this->input->post('tag', true);
 		if (is_array($tag)) {
 			$tag = json_encode($tag);
@@ -136,21 +146,26 @@ class Bookmark extends FHCAPI_Controller
 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');
 
-        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title, 'tag'=>$tag, 'updateamum'=>$now]);
+		$update_result = $this->BookmarkModel->update($bookmark_id, [
+			'url' => $url,
+			'title' => $title,
+			'tag' => $tag,
+			'updateamum' => $now
+		]);
 
-        $update_result = $this->getDataOrTerminateWithError($update_result);
+		$update_result = $this->getDataOrTerminateWithError($update_result);
 
-        $this->terminateWithSuccess($update_result);
-
-    }
+		$this->terminateWithSuccess($update_result);
+	}
 
 	/**
 	 * changes sort of two bookmarks in the bookmark table
 	 * @access public
 	 * @return void
 	 */
-    public function changeOrder($bookmark_id1, $bookmark_id2)
+	public function changeOrder($bookmark_id1, $bookmark_id2)
 	{
+		$update_result = [];
 
 		$result1 = $this->BookmarkModel->load($bookmark_id1);
 		$data1 = $this->getDataOrTerminateWithError($result1);
@@ -160,13 +175,17 @@ class Bookmark extends FHCAPI_Controller
 		$data2 = $this->getDataOrTerminateWithError($result2);
 		$sort2 = current($data2)->sort;
 
-        $update_result1 = $this->BookmarkModel->update($bookmark_id1,['sort'=>$sort2,]);
-        $update_result[] = $this->getDataOrTerminateWithError($update_result1);
+		$update_result1 = $this->BookmarkModel->update($bookmark_id1, [
+			'sort' => $sort2
+		]);
+		$update_result[] = $this->getDataOrTerminateWithError($update_result1);
 
-		$update_result2 = $this->BookmarkModel->update($bookmark_id2,['sort'=>$sort1,]);
-        $update_result[] = $this->getDataOrTerminateWithError($update_result2);
+		$update_result2 = $this->BookmarkModel->update($bookmark_id2, [
+			'sort' => $sort1
+		]);
+		$update_result[] = $this->getDataOrTerminateWithError($update_result2);
 
-        $this->terminateWithSuccess($update_result);
-    }
+		$this->terminateWithSuccess($update_result);
+	}
 }
 
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 869c75b4d..5493a267f 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -7,13 +7,6 @@ import { useUrlStore } from '../../composables/Pseudostore/DashboardWidget/UrlSt
 
 export default {
 	name: "WidgetsUrl",
-	mixins: [AbstractWidget],
-	inject: {
-		sectionName: {
-			type: String,
-			default: false
-		}
-	},
 	components:{
 		CoreForm,
 		FormInput,
@@ -22,7 +15,9 @@ export default {
 		PvMultiSelect: primevue.multiselect,
 		PvAutoComplete: primevue.autocomplete,
 	},
+	mixins: [AbstractWidget],
 	data: () => ({
+		ready: false,
 		bookmark_id: null,
 		title_input: "",
 		url_input: "",
@@ -31,9 +26,7 @@ export default {
 			invalidTitel: false,
 		},
 		selectedTags: [],
-		newTag: null,
 		selectedFilters: [],
-		filter: [],
 		filteredArray: []
 	}),
 	computed: {
@@ -55,27 +48,27 @@ export default {
 				return tags.some(tag => this.config.tags.includes(tag));
 			});
 		},
-		newSort(){
-			if(this.bookmarks.length == 0)
+		newSort() {
+			if (this.bookmarks.length == 0)
 				return 1;
 			else
 				return Math.max(...this.bookmarks.map(b => b.sort)) + 1;
 		},
-		maxSort(){
-			if(this.bookmarks.length == 0)
+		maxSort() {
+			if (this.bookmarks.length == 0)
 				return 0;
 			else
 				return Math.max(...this.filteredBookmarks.map(b => b.sort));
 		},
-		minSort(){
-			if(this.bookmarks.length == 0)
+		minSort() {
+			if (this.bookmarks.length == 0)
 				return 0;
 			else
 				return Math.min(...this.filteredBookmarks.map(b => b.sort));
 		}
 	},
 	methods: {
-		clearInputs(){
+		clearInputs() {
 			this.title_input = "";
 			this.url_input = "";
 			this.selectedTags = [];
@@ -91,9 +84,9 @@ export default {
 
 			this.$refs.editModal.show();
 		},
-		editBookmark(event){
-			event.preventDefault();
-			if(!this.bookmark_id || !this.url_input || !this.title_input) return;
+		editBookmark() {
+			if (!this.bookmark_id || !this.url_input || !this.title_input)
+				return;
 
 			this.actions
 				.update(
@@ -111,10 +104,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-
-		insertBookmark(event) {
-			event.preventDefault();
-
+		insertBookmark() {
 			// reset is-invalid css on url input field
 			for (let key of Object.keys(this.validation)) {
 				this.validation[key] = false;
@@ -158,16 +148,16 @@ export default {
 			let isConfirmed = await this.$fhcAlert.confirmDelete();
 
 			// early return if the confirm dialog was not confirmed
-			if (!isConfirmed) return;
+			if (!isConfirmed)
+				return;
 
-			this.actions
-				.remove(bookmark_id)
-				.then(() => {
-					this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			const errors = await this.actions.remove(bookmark_id);
+			
+			if (!errors) {
+				this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkDeleted"));
+			}
 		},
-		sortDown(bookmark_id){
+		sortDown(bookmark_id) {
 			const current = this.filteredBookmarks.find(b => b.bookmark_id === bookmark_id);
 
 			const next = this.filteredBookmarks
@@ -178,9 +168,9 @@ export default {
 				console.log("lowest sort item, no change");
 				return;
 			}
-			this.changeOrder(current.bookmark_id, next.bookmark_id);
+			this.actions.swap(current.bookmark_id, next.bookmark_id);
 		},
-		sortUp(bookmark_id){
+		sortUp(bookmark_id) {
 			const current = this.filteredBookmarks.find(b => b.bookmark_id === bookmark_id);
 
 			const next = this.filteredBookmarks
@@ -191,10 +181,7 @@ export default {
 				console.log("highest sort item, no change");
 				return;
 			}
-			this.changeOrder(current.bookmark_id, next.bookmark_id);
-		},
-		changeOrder(bookmark_id_1, bookmark_id_2) {
-			this.actions.swap(bookmark_id_1, bookmark_id_2);
+			this.actions.swap(current.bookmark_id, next.bookmark_id);
 		},
 		hasTags(link) {
 			if (!link || !link.tag) return false;
@@ -211,18 +198,6 @@ export default {
 				return tags.join(' ');
 			}
 		},
-		prepareTag(bookmarkArr){
-			const parsedArr = Array.isArray(bookmarkArr)
-				? bookmarkArr
-				: JSON.parse(bookmarkArr);
-
-			const result = parsedArr.map(tag => ({
-				tag,
-				code: tag
-			}));
-
-			return result;
-		},
 		openFilterModal() {
 			if (this.config.tags && this.config.tags.length)
 				this.selectedFilters = [ ...this.config.tags ];
@@ -230,7 +205,7 @@ export default {
 				this.selectedFilters = [];
 			this.$refs.filterModal.show();
 		},
-		async handleAddingTagFilter(widgetId) {
+		async handleAddingTagFilter() {
 			this.config.tags = this.selectedFilters;
 			this.$emit('change');
 			this.$fhcAlert.alertInfo(this.$p.t("bookmark", "filterUpdated"));
@@ -248,7 +223,7 @@ export default {
 			if (this.filteredArray.length === 0 && query) {
 				this.filteredArray = [query];
 			}
-		},
+		}
 	},
 	setup() {
 		const {
@@ -260,7 +235,8 @@ export default {
 		return { bookmarks, tags, actions }
 	},
 	async mounted() {
-		this.actions.fetch();
+		await this.actions.fetch();
+		this.ready = true;
 	},
 	template: /*html*/ `
 	<div class="widgets-url w-100 h-100 overflow-auto p-3">
@@ -290,89 +266,87 @@ export default {
 			</button>
 		</div>
 
-		<template v-if="filteredBookmarks.length">
-			<div
-				v-for="link in filteredBookmarks"
-				:key="link.id"
-				class="d-flex mt-2"
-			>
-				<a target="_blank" :href="link.url" class="me-1">
-					<i
-						class="fa fa-solid fa-arrow-up-right-from-square me-1"
-						aria-hidden="true"
-					></i>
-					{{ link.title }}
-				</a>
-				<span
-					v-if="hasTags(link)"
-					:title="hasTags(link)"
-					style="color: silver;"
+		<template v-if="ready">
+			<template v-if="filteredBookmarks.length">
+				<div
+					v-for="link in filteredBookmarks"
+					:key="link.id"
+					class="d-flex mt-2"
 				>
-					<i
-						class="fa fa-solid fa-tag text-gray-500"
-						aria-hidden="true"
-					></i>
-				</span>
+					<a target="_blank" :href="link.url" class="me-1">
+						<i
+							class="fa fa-solid fa-arrow-up-right-from-square me-1"
+							aria-hidden="true"
+						></i>
+						{{ link.title }}
+					</a>
+					<span
+						v-if="hasTags(link)"
+						:title="hasTags(link)"
+						style="color: silver;"
+					>
+						<i
+							class="fa fa-solid fa-tag text-gray-500"
+							aria-hidden="true"
+						></i>
+					</span>
 
-				<div class="ms-auto">
-					<!--EDIT BOOKMARK-->
-					<a
-						type="button"
-						href="#"
-						@click.prevent="openEditModal(link)"
-						aria-label="edit bookmark"
-						:title="$p.t('bookmark/editBookmark')"
-					>
-						<i class="fa fa-edit me-1" aria-hidden="true"></i>
-					</a>
-					<!--DELETE BOOKMARK-->
-					<a
-						type="button"
-						id="deleteBookmark"
-						href="#"
-						aria-label="delete bookmark"
-						:title="$p.t('bookmark/deleteBookmark')"
-						@click.prevent="removeLink(link.bookmark_id)"
-					>
-						<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
-					</a>
-					<!--SORT BOOKMARKS-->
-					<a
-						v-if="filteredBookmarks.length > 1"
-						type="button"
-						id="downsortBookmark"
-						href="#"
-						aria-label="sortdown bookmark"
-						:title="$p.t('bookmark/sortDownwards')"
-						@click.prevent="sortDown(link.bookmark_id)"
-					>
-						<i
-							class="fa fa-arrow-down me-1"
-							:class="{ 'text-light pointer-events-none': link.sort === maxSort }"
-						></i>
-					</a>
-					<a
-						v-if="filteredBookmarks.length > 1"
-						type="button"
-						id="upsortBookmark"
-						href="#"
-						aria-label="sortup bookmark"
-						:title="$p.t('bookmark/sortToTop')"
-						@click.prevent="sortUp(link.bookmark_id)"
-					>
-						<i
-							class="fa fa-arrow-up me-1"
-							:class="{ 'text-light pointer-events-none': link.sort === minSort }"
-						></i>
-					</a>
+					<div class="ms-auto">
+						<!--EDIT BOOKMARK-->
+						<a
+							type="button"
+							href="#"
+							:title="$p.t('bookmark/editBookmark')"
+							aria-label="edit bookmark"
+							@click.prevent="openEditModal(link)"
+						>
+							<i class="fa fa-edit me-1" aria-hidden="true"></i>
+						</a>
+						<!--DELETE BOOKMARK-->
+						<a
+							type="button"
+							href="#"
+							:title="$p.t('bookmark/deleteBookmark')"
+							aria-label="delete bookmark"
+							@click.prevent="removeLink(link.bookmark_id)"
+						>
+							<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
+						</a>
+						<!--SORT BOOKMARKS-->
+						<a
+							v-if="filteredBookmarks.length > 1"
+							type="button"
+							href="#"
+							:title="$p.t('bookmark/sortDownwards')"
+							aria-label="sortdown bookmark"
+							@click.prevent="sortDown(link.bookmark_id)"
+						>
+							<i
+								class="fa fa-arrow-down me-1"
+								:class="{ 'text-light pointer-events-none': link.sort === maxSort }"
+							></i>
+						</a>
+						<a
+							v-if="filteredBookmarks.length > 1"
+							type="button"
+							href="#"
+							:title="$p.t('bookmark/sortToTop')"
+							aria-label="sortup bookmark"
+							@click.prevent="sortUp(link.bookmark_id)"
+						>
+							<i
+								class="fa fa-arrow-up me-1"
+								:class="{ 'text-light pointer-events-none': link.sort === minSort }"
+							></i>
+						</a>
+					</div>
 				</div>
+			</template>
+
+			<div v-else class="d-flex mt-2">
+				<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
 			</div>
 		</template>
-
-		<div v-else class="d-flex mt-2">
-			<span>{{ $p.t('bookmark', 'emptyBookmarks') }}</span>
-		</div>
-
 		<template v-else>
 			<p v-for="i in 4" class="placeholder-glow">
 				<span class="placeholder col-9"></span>
@@ -391,34 +365,34 @@ export default {
 			<template #default>
 
 				<form-input
-					:label="$p.t('profil', 'Titel')"
-					:title="$p.t('profil','Titel')"
 					id="editTitle"
-					v-model="title_input"
 					name="title"
+					v-model="title_input"
+					:label="$p.t('profil', 'Titel')"
+					:title="$p.t('profil', 'Titel')"
 					class="mb-2"
 				></form-input>
 				<form-input
+					id="editUrl"
+					name="url"
+					v-model="url_input"
 					label="Url"
 					title="Url"
-					id="editUrl"
-					v-model="url_input"
-					name="url"
 				></form-input>
 
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
-					<PvAutoComplete
+					<pv-auto-complete
 						v-model="selectedTags"
 						multiple
 						dropdown
 						:suggestions="filteredArray"
 						@complete="search" 
 					/>
-				</div>				
+				</div>
 			</template>
 			<template #footer>
-				<button @click="editBookmark" class="btn btn-primary">
+				<button class="btn btn-primary" @click.prevent="editBookmark">
 					{{ $p.t('bookmark', 'saveLink') }}
 				</button>
 			</template>
@@ -433,24 +407,24 @@ export default {
 			<template #default>
 
 				<form-input
+					id="insertTitle"
+					name="title"
+					v-model="title_input"
 					:label="$p.t('profil', 'Titel')"
 					:title="$p.t('profil', 'Titel')"
-					id="insertTitle"
-					v-model="title_input"
-					name="title"
 					class="mb-2"
 				></form-input>
 				<form-input
+					id="insertUrl"
+					name="url"
+					v-model="url_input"
 					label="Url"
 					title="Url"
-					id="insertUrl"
-					v-model="url_input"
-					name="url"
 				></form-input>
 
 				<label class="mt-2">Tags</label>
 				<div class="mt-2">
-					<PvAutoComplete
+					<pv-auto-complete
 						v-model="selectedTags"
 						multiple
 						dropdown
@@ -461,7 +435,7 @@ export default {
 
 			</template>
 			<template #footer>
-				<button @click="insertBookmark" class="btn btn-primary">
+				<button class="btn btn-primary" @click.prevent="insertBookmark">
 					{{ $p.t('bookmark', 'saveLink') }}
 				</button>
 			</template>
@@ -477,9 +451,9 @@ export default {
 
 				<div class="mt-2 row">
 					<div class="col-10">
-						<PvMultiSelect
-							v-model="selectedFilters"
+						<pv-multi-select
 							id="tagFilterUrl"
+							v-model="selectedFilters"
 							:options="availableTags"
 							display="chip"
 							:placeholder="$p.t('bookmark', 'noFilter')"
@@ -493,10 +467,10 @@ export default {
 			<template #footer>
 				<button
 					class="btn btn-secondary"
-					@click="handleAddingTagFilter(widgetId)"
 					:title="$p.t('bookmark', 'filterByTags')"
+					@click="handleAddingTagFilter()"
 				>
-					OK
+					{{ $p.t('ui/ok') }}
 				</button>
 			</template>
 		</bs-modal>

From 7ae34e06400f52b68e6f059bc324282567bac8fa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 11:04:46 +0200
Subject: [PATCH 184/189] hide everything in adminMode

---
 public/js/components/DashboardWidget/Url.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 5493a267f..5817f57aa 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -16,6 +16,9 @@ export default {
 		PvAutoComplete: primevue.autocomplete,
 	},
 	mixins: [AbstractWidget],
+	inject: [
+		"adminMode"
+	],
 	data: () => ({
 		ready: false,
 		bookmark_id: null,
@@ -235,13 +238,15 @@ export default {
 		return { bookmarks, tags, actions }
 	},
 	async mounted() {
-		await this.actions.fetch();
-		this.ready = true;
+		if (!this.adminMode) {
+			await this.actions.fetch();
+			this.ready = true;
+		}
 	},
 	template: /*html*/ `
 	<div class="widgets-url w-100 h-100 overflow-auto p-3">
 
-		<div class="d-flex mt-2">
+		<div v-if="!adminMode" class="d-flex mt-2">
 			<button
 				class="btn btn-outline-secondary btn-sm flex-grow-1 me-2"
 				@click="openCreateModal"

From 6d0ab0d4aaa61cbdca522bffb77ca5528ae7dfbd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 15:20:24 +0200
Subject: [PATCH 185/189] bugfix: empty data fields cause error in gridlogic
 (this happens when items are rearranged but not processed in index order)

---
 public/js/composables/GridLogic.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 9f5b96ba6..46159dffb 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -58,6 +58,8 @@ class GridLogic {
 			item.frame.forEach(f => intermGrid.grid[f] = -1);
 
 			intermGrid.data.forEach(currItem => {
+				if (!currItem)
+					return;
 				if (currItem.pinned) {
 					if (!currItem.frame)
 						currItem.frame = intermGrid.getItemFrame(currItem);

From 9bc564dbf92284c2b0073b7df9ae3cae0535332b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 15:35:29 +0200
Subject: [PATCH 186/189] min size & delete loading id when adding widgets

---
 .../js/components/Dashboard/Admin/Presets.js  | 34 ++++++++++++++++++
 public/js/components/Dashboard/Dashboard.js   | 36 +++++++++++++++++++
 public/js/components/Dashboard/Section.js     |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 117b5d8ba..042286ab7 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -23,6 +23,32 @@ export default {
 	computed: {
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
+		},
+		sizeLimits() {
+			return Object.fromEntries(this.widgets.map(({ setup, widget_id: type }) => {
+				const result = {}; // work on a copy
+				if (setup.height === undefined)
+					result.height = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.height))
+					result.height = { min: setup.height, max: setup.height };
+				else
+					result.height = {
+						min: setup.height.min ?? 1,
+						max: setup.height.max
+					};
+
+				if (setup.width === undefined)
+					result.width = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.width))
+					result.width = { min: setup.width, max: setup.width };
+				else
+					result.width = {
+						min: setup.width.min ?? 1,
+						max: setup.width.max
+					};
+
+				return [type, result];
+			}));
 		}
 	},
 	watch: {
@@ -35,6 +61,12 @@ export default {
 		widgetAdd(widget, section_name) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
+				// NOTE(chris): min size
+				widget.place = Object.fromEntries(Object.entries(widget.place).map(([key, value]) => {
+					value.w = this.sizeLimits[widget_id].width.min;
+					value.h = this.sizeLimits[widget_id].height.min;
+					return [key, value];
+				}));
 				widget.id = 'loading_' + String((new Date()).valueOf());
 				delete widget.custom;
 				widget.preset = 1;
@@ -45,6 +77,8 @@ export default {
 						section.widgets.push(loading);
 				});
 
+				delete widget.id;
+
 				const params = {
 					dashboard: this.dashboard,
 					funktion_kurzbz: section_name,
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 428c2ebdc..bf45ad227 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -36,16 +36,52 @@ export default {
 			timezone: this.timezone
 		}
 	},
+	computed: {
+		sizeLimits() {
+			return Object.fromEntries(this.widgetsSetup.map(({ setup, widget_id: type }) => {
+				const result = {}; // work on a copy
+				if (setup.height === undefined)
+					result.height = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.height))
+					result.height = { min: setup.height, max: setup.height };
+				else
+					result.height = {
+						min: setup.height.min ?? 1,
+						max: setup.height.max
+					};
+
+				if (setup.width === undefined)
+					result.width = { min: 1, max: undefined };
+				else if (Number.isInteger(setup.width))
+					result.width = { min: setup.width, max: setup.width };
+				else
+					result.width = {
+						min: setup.width.min ?? 1,
+						max: setup.width.max
+					};
+
+				return [type, result];
+			}));
+		}
+	},
 	methods: {
 		widgetAdd(widget) {
 			this.$refs.widgetpicker
 				.getWidget()
 				.then(widget_id => {
 					widget.widget = widget_id;
+					// NOTE(chris): min size
+					widget.place = Object.fromEntries(Object.entries(widget.place).map(([key, value]) => {
+						value.w = this.sizeLimits[widget_id].width.min;
+						value.h = this.sizeLimits[widget_id].height.min;
+						return [key, value];
+					}));
 					widget.id = 'loading_' + String((new Date()).valueOf());
 					let loading = { ...widget };
 					loading.loading = true;
 					this.widgets.push(loading);
+
+					delete widget.id;
 					
 					this.$api
 						.call(ApiDashboardUser.addWidget(this.dashboard, widget))
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 04e8fe9f7..e8c56fd4e 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -240,7 +240,7 @@ export default {
 				<div
 					v-if="item.placeholder"
 					class="empty-tile-hover"
-					@click="$emit('widgetAdd', { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 }, name)"
+					@click="$emit('widgetAdd', { config: [], place: {[gridWidth]: { x: item.x, y: item.y, w: 1, h: 1 } }, custom: 1 }, name)"
 				></div>
 				<dashboard-item 
 					v-else

From 736e91224eab368731efe345ee03536942ea725c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 15:43:58 +0200
Subject: [PATCH 187/189] show phrase instead of content for bookmark widget in
 admin mode

---
 public/js/components/DashboardWidget/Url.js |  8 +++++++-
 system/phrasesupdate.php                    | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 5817f57aa..76eb4a5d3 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -271,7 +271,13 @@ export default {
 			</button>
 		</div>
 
-		<template v-if="ready">
+		<div
+			v-if="adminMode"
+			class="h-100 d-flex align-items-center text-center"
+		>
+			{{ $p.t('bookmark/adminMode') }}
+		</div>
+		<template v-else-if="ready">
 			<template v-if="filteredBookmarks.length">
 				<div
 					v-for="link in filteredBookmarks"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index efd232201..55882b909 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -35942,6 +35942,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'adminMode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Inhalt kann nicht im Administrator Modus angezeigt werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Content can not be displayed in administrator mode.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// BOOKMARK PHRASEN END ----------------------------------------------------------------------
 	array(
 		'app' => 'core',

From 293352ac3c84870b4fcd22dc7ae6dbb9fcb531d7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 16:26:32 +0200
Subject: [PATCH 188/189] move apps/Cis.js -> apps/Cis/Cis.js

---
 .../views/CisRouterView/CisRouterView.php     |  2 +-
 public/js/apps/{ => Cis}/Cis.js               | 46 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename public/js/apps/{ => Cis}/Cis.js (83%)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 73756ff1e..c51ca40c3 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -41,7 +41,7 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Cis.js',
+		'public/js/apps/Cis/Cis.js',
 	),
 
 );
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis/Cis.js
similarity index 83%
rename from public/js/apps/Cis.js
rename to public/js/apps/Cis/Cis.js
index 1c3e8b14c..77c34a88b 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis/Cis.js
@@ -1,27 +1,27 @@
-import FhcDashboard from '../components/Dashboard/Dashboard.js';
-import PluginsPhrasen from '../plugins/Phrasen.js';
-import Theme from '../plugins/Theme.js';
-import contrast from '../directives/contrast.js';
-import {setScrollbarWidth} from "../helpers/CssVarCalcHelpers.js";
-import LvPlan from "../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../components/Cis/LvPlan/MyLvPlan.js";
-import MylvStudent from "../components/Cis/Mylv/Student.js";
-import Profil from "../components/Cis/Profil/Profil.js";
-import Raumsuche from "../components/Cis/Raumsuche/Raumsuche.js";
-import CmsNews from "../components/Cis/Cms/News.js";
-import CmsContent from "../components/Cis/Cms/Content.js";
-import Info from "../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO_DESKTOP, DEFAULT_MODE_RAUMINFO_MOBILE} from "../components/Cis/Mylv/RoomInformation.js";
-import AbgabetoolStudent from "../components/Cis/Abgabetool/AbgabetoolStudent.js";
-import AbgabetoolMitarbeiter from "../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
-import AbgabetoolAssistenz from "../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
-import DeadlineOverview from "../components/Cis/Abgabetool/DeadlineOverview.js";
-import Studium from "../components/Cis/Studium/Studium.js";
-import StgOrgLvPlan from "../components/Cis/LvPlan/StgOrg.js";
-import OtherLvPlan from "../components/Cis/LvPlan/OtherLvPlan.js";
+import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+import Theme from '../../plugins/Theme.js';
+import contrast from '../../directives/contrast.js';
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
+import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../../components/Cis/LvPlan/MyLvPlan.js";
+import MylvStudent from "../../components/Cis/Mylv/Student.js";
+import Profil from "../../components/Cis/Profil/Profil.js";
+import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
+import CmsNews from "../../components/Cis/Cms/News.js";
+import CmsContent from "../../components/Cis/Cms/Content.js";
+import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO_DESKTOP, DEFAULT_MODE_RAUMINFO_MOBILE} from "../../components/Cis/Mylv/RoomInformation.js";
+import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
+import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
+import Studium from "../../components/Cis/Studium/Studium.js";
+import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
+import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
 
-import ApiRouteInfo from '../api/factory/routeinfo.js';
-import {capitalize} from "../helpers/StringHelpers.js";
+import ApiRouteInfo from '../../api/factory/routeinfo.js';
+import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 const isMobile = window.matchMedia("(max-width: 767px)").matches;

From 863aaf62ec5173a6ea2366170d0f41b19f975bc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 27 Apr 2026 16:26:51 +0200
Subject: [PATCH 189/189] provide default value for inject

---
 public/js/components/DashboardWidget/Url.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 76eb4a5d3..e732f5b0e 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -16,9 +16,12 @@ export default {
 		PvAutoComplete: primevue.autocomplete,
 	},
 	mixins: [AbstractWidget],
-	inject: [
-		"adminMode"
-	],
+	inject: {
+		adminMode: {
+			from: 'adminMode',
+			default: false
+		}
+	},
 	data: () => ({
 		ready: false,
 		bookmark_id: null,