From 7fed1d231ca3c0dd2444f61ad307ac86ca269aed Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 14 Feb 2025 14:49:28 +0100
Subject: [PATCH 01/16] p.t( -> $p.t( in stundenplan & mylv components, added
 missing phrasen; WIP adding phrasen keys for noten, maybe for lva titles

---
 public/js/components/Calendar/Day/Page.js     |  2 +-
 public/js/components/Cis/Mylv/LvMenu.js       |  4 +-
 public/js/components/Cis/Mylv/LvModal.js      |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  7 ++--
 public/js/components/Cis/Mylv/Student.js      |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js | 10 ++---
 .../components/DashboardWidget/Stundenplan.js |  4 +-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 8 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 3d5cc5f02..70bccc49d 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -368,7 +368,7 @@ export default {
 								</div>
 							</Transition>
 							<div>
-								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
+								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
 								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
 
 									<div class="hours">
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index e64dbd667..1183c6ff0 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -56,11 +56,11 @@ export default {
 		},
 	},
 	template:/*html*/`
-	<div v-if="!menu">No Menu available</div>
+	<div v-if="!menu">{{$p.t('lehre','lehrveranstaltungsUnavailable')}}</div>
 	<div v-else>
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
-							<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
+				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
 					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }"  role="button" :href="c4_link(menuItem)"
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
 					class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index e873dd5f8..ee843ecb6 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -77,7 +77,7 @@ export default {
 			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<lv-info :event="event"></lv-info>
 			<template v-if="showMenu">
-				<h3 >Lehrveranstaltungs Menu</h3>
+				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 				<lv-menu :menu="menu"></lv-menu>
 			</template>
 		</template>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 36d67f454..59ede800e 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -66,6 +66,7 @@ export default {
 			return bodyStyle;
 		},
 		grade() {
+			// TODO: noten phrasen
 			return this.benotung ? this.znote || this.lvnote || null : null;
 		},
 		LvHasPruefungenInformation(){
@@ -159,7 +160,7 @@ export default {
 
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
-			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >Organisatorische Einheit:</h6>
+			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
 			<h6 class="mb-0">{{bezeichnung}}</h6>
 		</div>
 		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
@@ -197,14 +198,14 @@ export default {
 				<template v-if="LvHasPruefungenInformation">
 					<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
 						<i class="fa fa-check text-success" v-if="positiv"></i>
-						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || p.t('lehre/noGrades') }}</span>
+						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || $p.t('lehre/noGrades') }}</span>
 					</a>
 				</template>
 				<!-- template for the LV with no pruefungen -->
 				<template v-else>
 					<span  class="col-auto text-start text-decoration-none" >
 						<i class="fa fa-check text-success" v-if="positiv"></i>
-						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || p.t('lehre/noGrades') }}</span>
+						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || $p.t('lehre/noGrades') }}</span>
 					</span>
 				</template>
 			</div>
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 8b6164192..5aab9b28a 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -103,7 +103,7 @@ export default {
 					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
 						<i class="fa fa-caret-left" aria-hidden="true"></i>
 					</button>
-					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 						<option v-for="semester in studiensemester" :key="semester.studiensemester_kurzbz">{{semester.studiensemester_kurzbz}}</option>
 					</select>
 					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsLast" @click="nextSem">
@@ -113,7 +113,7 @@ export default {
 			</div>
 		</div>
 		<div class="alert alert-danger" role="alert" v-else>
-			{{p.t('lehre/noLvFound')}}
+			{{$p.t('lehre/noLvFound')}}
 		</div>
 		<mylv-semester v-bind="current"/>
 	</div>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index d35c9c536..8fc9b77d4 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -206,15 +206,15 @@ export const Stundenplan = {
 					</div>
 				</div>
 				<div class="col ">
-					<p>Lehrveranstaltung:</p>
+					<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
 					<p class="m-0">{{event?.orig.topic}}</p>
 				</div>
 				<div class="col ">
-					<p>Lektor:</p>
+					<p>{{ $p.t('lehre/lektor') }}:</p>
 					<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
 				</div>
 				<div class="col ">
-					<p>Ort: </p>
+					<p>{{ $p.t('profil/Ort') }}: </p>
 					<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
 				</div>
 			</div>
@@ -224,11 +224,11 @@ export const Stundenplan = {
 			<div class="w-100">
 				<lv-info  :event="currentlySelectedEvent" />
 			</div>
-			<h3 >Lehrveranstaltungs Menu</h3>
+			<h3 >{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 			<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
 		</template>
 		<template #pageMobilContentEmpty >
-			<h3>Keine Lehrveranstaltungen</h3>
+			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
 		</template>
 	</fhc-calendar>
 	`
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index bf4324f4a..7bb972590 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -192,11 +192,11 @@ export default {
 							</small>
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">
-							{{ p.t('lehre/noLvFound') }}
+							{{ $p.t('lehre/noLvFound') }}
 						</div>
 					</template>
 					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
-						{{ p.t('lehre/noLvFound') }}
+						{{ $p.t('lehre/noLvFound') }}
 					</div>
 				</div>
 			</template>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d841acc85..f34f32b9f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37237,6 +37237,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrveranstaltungsmenue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungsmenü',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrveranstaltungsmenueUnavailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Lehrveranstaltungsmenü verfügbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Course Menu available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 92ba4aea9a222ce16ba11bbe710764ce610b29a7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Feb 2025 14:53:19 +0100
Subject: [PATCH 02/16] return year as number not as string

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

diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index f2f8c93f0..e85cbeeac 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -71,9 +71,9 @@ class CalendarDate {
 	}
 	get wYear() {
 		if( this.w === 1 ) {
-			return this.cdLastDayOfWeek.format({ year: 'numeric' });
+			return this.cdLastDayOfWeek.y;
 		}
-		return this.cdFirstDayOfWeek.format({ year: 'numeric' });
+		return this.cdFirstDayOfWeek.y;
 	}
 	get wd() {
 		if (this._wd === null) {
@@ -271,4 +271,4 @@ CalendarDate.getWeekStart = function(locale) {
 	}
 }
 
-export default CalendarDate
\ No newline at end of file
+export default CalendarDate

From b01400d21c91ee98b9963f83a65c6c1f6fd37844 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Feb 2025 14:55:57 +0100
Subject: [PATCH 03/16] remove unused data declaration

---
 public/js/components/Calendar/Weeks.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 530cfe90e..844101b88 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -8,8 +8,6 @@ export default {
 		'size',
 		'focusDate'
 	],
-	data() {
-	},
 	computed: {
 		weeks(){
 			return [...Array(this.focusDate.numWeeks).keys()].map(i => i + 1);

From f6f06c4d5e7ea05dfa5fe4b36aebfeeb319713f1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 14 Feb 2025 14:58:12 +0100
Subject: [PATCH 04/16] use attribute binding since value should be boolean

---
 public/js/components/Cis/Mylv/LvModal.js                  | 4 ++--
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js | 2 +-
 public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index ee843ecb6..9c42e312f 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -68,7 +68,7 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
 			<template v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
@@ -87,4 +87,4 @@ export default {
 		</template>
 		<!-- end of optional footer --> 
 	</bs-modal>`,
-};
\ No newline at end of file
+};
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index ba5702bc9..cbfde34be 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -181,7 +181,7 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false">
+<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 	<template v-if="title" v-slot:title>{{title}}</template>
 	<template v-slot:default>
 		<div>
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index 300cfe51c..f3746af63 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -108,7 +108,7 @@ export default {
   },
   template: /*html*/ `
 
-  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
+  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false" >
     
     <template v-slot:title>
       {{title}}  

From d45a41b949fa5e8605630ed71063dc46fa4a1767 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Feb 2025 10:18:39 +0100
Subject: [PATCH 05/16] defined new CI routes to differentiate between 5 cases
 CI doesnt handle anymore but vue router does; define Stundenplan/:lv_id?
 route for old links to redirect to new route
 Stundenplan/:mode/:focus_date/lv_id; new route with props route param
 handling to put them into viewData to always check for the same object;
 define day as allowed init mode; WIP same thing for raum calendar page;

---
 application/config/routes.php                 | 12 +++-
 application/controllers/Cis/Stundenplan.php   | 11 ++-
 public/js/apps/Dashboard/Fhc.js               | 65 ++++++++++++++++-
 public/js/components/Calendar/Calendar.js     |  6 +-
 public/js/components/Calendar/Week/Page.js    |  1 +
 .../components/Cis/Stundenplan/Stundenplan.js | 70 +++++++++++++++----
 6 files changed, 143 insertions(+), 22 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 8acf9b5ea..ede5cc9bd 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,17 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['Cis/Stundenplan/(:any)?'] = 'Cis/Stundenplan/index/$1';
+$route['Cis/Stundenplan'] = 'Cis/Stundenplan/index/null/null/null';
+$route['Cis/Stundenplan/(:num)'] = 'Cis/Stundenplan/index/null/null/$1';
+$route['Cis/Stundenplan/(:num)/(:any)'] = 'Cis/Stundenplan/index/null/$2/$1';
+
+// Specific route (for mode: month|week|day, focusdate, lv_id optional)
+$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)'] = 'Cis/Stundenplan/index/$1';
+$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)(/(:any))?'] = 'Cis/Stundenplan/index/$1/$3';
+$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)(/(:any))?(/(:num))?'] = 'Cis/Stundenplan/index/$1/$3/$5';
+
+
+
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
index f6fb0bd67..c9c486a47 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/Stundenplan.php
@@ -23,9 +23,18 @@ class Stundenplan extends Auth_Controller
 	/**
 	 * @return void
 	 */
-	public function index($lv_id = null)
+	public function index($mode = 'Week', $focus_date = null, $lv_id = null)
 	{
+		// Convert string "null" to actual null values -> ci3 reroute fix
+		$mode = ($mode === 'null') ? 'Week' : ucfirst(strtolower($mode));
+		$focus_date = ($focus_date === 'null') ? date('Y-m-d') : $focus_date;
+		$lv_id = ($lv_id === 'null') ? null : $lv_id;
+		
+		if($mode) $mode = ucfirst(strtolower($mode));
+		
 		$viewData = array(
+			'mode' => $mode,
+			'focus_date' => $focus_date,
 			'lv_id' => $lv_id,
 			'uid'=>getAuthUID(),
 		);
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 9f77d4b9b..aba5d2f40 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -58,10 +58,71 @@ const router = VueRouter.createRouter({
 			component: Info,
 			props: true
 		},
+		// Redirect old links to new format
 		{
-			path: `/Cis/Stundenplan/:lv_id?`,
+			path: "/Cis/Stundenplan/:lv_id(\\d+)", // define lv_id as numeric so this matches
+			name: "StundenplanNumeric",
+			component: Stundenplan,
+			redirect: (to) => {
+				debugger
+				return { // redirect to longer Stundenplan url and map params
+					name: "Stundenplan",
+					params: {
+						mode: "Week",
+						focus_date: new Date().toISOString().split("T")[0],
+						lv_id: to.params.lv_id || null
+						
+					},
+				};
+			},
+		},
+		{ 
+			// actual routes after Stundenplan -> config/routes.php
+			// actual param handling -> controllers/Cis/Stundenplan.php
+			path: `/Cis/Stundenplan/:mode?/:focus_date?/:lv_id?`,
 			name: 'Stundenplan',
-			component: Stundenplan
+			component: Stundenplan,
+			props: (route) => { // validate and set mode/focus date if for some reason missing
+				const validModes = ["Month", "Week", "Day"];
+
+				// default to mode week if not provided
+				let 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()
+						: "Week";
+
+				// default focus_date: today date if not provided
+				let focusDate = route.params.focus_date || new Date().toISOString().split("T")[0];
+				
+				// for consistency reasons format the props into the viewData object so we have consistency in the form 
+				// we access route specific data whether it is codigniter served or just another vue component that has been
+				// mounted
+				return {
+					viewData: {
+						mode,
+						focusDate,
+						lv_id: route.params.lv_id || null
+					}
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				console.log('beforeEnter')
+				// If missing mode or focus_date, redirect with defaults
+				if (!to.params.mode || !to.params.focus_date) {
+					next({
+						name: "Stundenplan",
+						params: {
+							
+							mode: to.params.mode || "Week",
+							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
+							lv_id: to.params.lv_id || null
+							
+						},
+					});
+				} else {
+					next();
+				}
+			}
 		},
 		{
 			path: `/`,
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 8d4c56cfe..f9d836bd1 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -192,12 +192,13 @@ export default {
 		},
 	},
 	created() {
-		const allowedInitialModes = ['years'];
+		const initMode = this.initialMode.toLowerCase()
+		const allowedInitialModes = ['years', 'day'];
 		if (!this.noWeekView)
 			allowedInitialModes.push('week');
 		if (!this.noMonthView)
 			allowedInitialModes.push('month');
-		this.mode = allowedInitialModes[allowedInitialModes.indexOf(this.initialMode)] || allowedInitialModes.pop();
+		this.mode = allowedInitialModes[allowedInitialModes.indexOf(initMode)] || allowedInitialModes.pop();
 		this.date.set(new Date(this.initialDate));
 		this.focusDate.set(this.date);
 	},
@@ -227,7 +228,6 @@ export default {
 				}
 			}).observe(this.$refs.container);
 		}
-
 	},
 	unmounted(){
 		CalendarDates.cleanup();
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 10ff6c495..d6e5c6df0 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -273,6 +273,7 @@ export default {
 			}
 		},
 		dateToMinutesOfDay(day) {
+			// subtract 7 from the total hours because the hours range from 7 to 24
 			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
 		},
 		weekPageClick(event, day) {
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 8fc9b77d4..5a6ad9c09 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -4,24 +4,26 @@ import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
 
+// TODO: define in one place that week is the default mode, it is hardcoded in 27 places currently
 export const Stundenplan = {
 	name: 'Stundenplan',
 	data() {
 		return {
 			events: null,
+			calendarMode: "Week",
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
-			currentDay: new Date(),
+			currentDay: this.viewData?.focus_date ? new Date(this.viewData.focus_date) : new Date(),
 			minimized: false,
-			studiensemester_kurzbz:null,
-			studiensemester_start:null,
-			studiensemester_ende:null,
-			uid:null,
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null,
 		}
 	},
 	props: [
-		"viewData",
+		"viewData"
 	],
 	watch: {
 		weekFirstDay: {
@@ -33,6 +35,12 @@ export const Stundenplan = {
 				this.studiensemester_ende = ende;
 			},
 			immediate: true,
+		},
+		'viewData.lv_id'(newVal) {
+			// console.log('viewData.lv_id', newVal)
+		},
+		'viewData.focus_date'(newVal) {
+			// console.log('viewData.focus_date', newVal)
 		}
 	},
 	components: {
@@ -49,11 +57,6 @@ export const Stundenplan = {
 			let download_link = (format, version = "", target = "") => `${FHC_JS_DATA_STORAGE_OBJECT.app_root}cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=${this.uid}&begin=${start}&ende=${ende}&format=${format}${version ? '&version=' + version : ''}${target ? '&target=' + target : ''}`;
 			return [{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link('excel') }, { title: "csv", icon: 'fa-solid fa-file-csv', link: download_link('csv') }, { title: "ical1", icon: 'fa-regular fa-calendar', link: download_link('ical', '1', 'ical') }, { title: "ical2", icon: 'fa-regular fa-calendar', link: download_link('ical', '2', 'ical') }];
 		},
-		lv_id() { // computed so we can theoretically change path/lva selection and reload without page refresh
-			const pathParts = window.location.pathname.split('/').filter(Boolean);
-			const id = pathParts[pathParts.length - 1];
-			return id && !isNaN(Number(id)) ? id : null; // only return id if it is a number string since the path might contain invalid elements
-		},
 		weekFirstDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
 		},
@@ -66,7 +69,6 @@ export const Stundenplan = {
 		monthLastDay: function () {
 			return this.calendarDateToString(this.eventCalendarDate.cdLastDayOfCalendarMonth);
 		},
-
 	},
 	methods:{
 		fetchStudiensemesterDetails: async function (date) {
@@ -84,8 +86,37 @@ export const Stundenplan = {
 			this.currentlySelectedEvent = event;
 		},
 		selectDay: function(day){
+			const date = day.getFullYear() + "-" +
+				String(day.getMonth() + 1).padStart(2, "0") + "-" +
+				String(day.getDate()).padStart(2, "0");
+			
+			this.$router.replace({
+				name: "Stundenplan",
+				params: {
+					mode: this.calendarMode,
+					focus_date: date,
+					lv_id: this.viewData?.lv_id || null
+				}
+			})
+			
 			this.currentDay = day;
 		},
+		handleChangeMode(mode) {
+			console.log('handleChangeMode', mode)
+			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+			
+			// TODO: clashes with initial mode and needs to be differentiated
+			// this.$router.replace({
+			// 	name: "Stundenplan",
+			// 	params: {
+			// 		mode: modeCapitalized,
+			// 		focus_date: this.currentDay.toISOString().split("T")[0],
+			// 		lv_id: this.viewData?.lv_id || null
+			// 	}
+			// })
+			
+			this.calendarMode = mode
+		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
@@ -163,7 +194,17 @@ export const Stundenplan = {
 	<h2>{{$p.t('lehre/stundenplan')}}</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
-	<fhc-calendar @selectedEvent="setSelectedEvent" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+	<fhc-calendar 
+		@selectedEvent="setSelectedEvent"
+		:initial-date="currentDay"
+		@change:range="updateRange"
+		:events="events"
+		:initial-mode="viewData.mode"
+		show-weeks
+		@select:day="selectDay"
+		@change:mode="handleChangeMode"
+		v-model:minimized="minimized"
+	>     
 		<template #calendarDownloads>
 			<div v-for="{title,icon,link} in downloadLinks">
 				<a :href="link" :title="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
@@ -230,8 +271,7 @@ export const Stundenplan = {
 		<template #pageMobilContentEmpty >
 			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
 		</template>
-	</fhc-calendar>
-	`
+	</fhc-calendar>`
 }
 
 export default Stundenplan
\ No newline at end of file

From e2e537b09c8c328b4ed0ace6c358a0a0c61d706f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Feb 2025 10:55:46 +0100
Subject: [PATCH 06/16] fix calendar mode watch/emit handling; WIP roomInfo
 routes

---
 public/js/apps/Dashboard/Fhc.js               |  2 --
 public/js/components/Calendar/Calendar.js     |  4 +++
 .../js/components/Cis/Mylv/RoomInformation.js | 12 ++++---
 .../components/Cis/Stundenplan/Stundenplan.js | 33 ++++++++++---------
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index aba5d2f40..610abba0c 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -64,7 +64,6 @@ const router = VueRouter.createRouter({
 			name: "StundenplanNumeric",
 			component: Stundenplan,
 			redirect: (to) => {
-				debugger
 				return { // redirect to longer Stundenplan url and map params
 					name: "Stundenplan",
 					params: {
@@ -106,7 +105,6 @@ const router = VueRouter.createRouter({
 				};
 			},
 			beforeEnter: (to, from, next) => {
-				console.log('beforeEnter')
 				// If missing mode or focus_date, redirect with defaults
 				if (!to.params.mode || !to.params.focus_date) {
 					next({
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index f9d836bd1..9ea37c19e 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -62,6 +62,9 @@ export default {
 		noMonthView: Boolean
 	},
 	watch:{
+		mode(newVal) {
+			console.log('mode watcher', newVal)
+		},
 		selectedEvent:{
 			handler(newSelectedEvent) {
 				this.$emit('selectedEvent', newSelectedEvent);
@@ -122,6 +125,7 @@ export default {
 					this.prevMode = this.currMode;
 					this.currMode = v;
 				}
+				this.$emit('change:mode', this.currMode)
 			}
 		},
 		eventsPerDay() {
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 10308673c..889651261 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -3,7 +3,9 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
-export default{
+export const DEFAULT_MODE = 'Week'
+
+const RoomInformation = {
 	name: "RoomInformation",
     props:{
         ort_kurzbz: {
@@ -123,7 +125,7 @@ export default{
 		<h2>Room Information {{ ort_kurzbz }}</h2>
 		<hr>
 		<lv-modal v-if="currentlySelectedEvent" :showMenu="false" :event="currentlySelectedEvent" ref="lvmodal" />
-		<fhc-calendar @selectedEvent="setSelectedEvent" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="week" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+		<fhc-calendar @selectedEvent="setSelectedEvent" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="DEFAULT_MODE" show-weeks @select:day="selectDay" v-model:minimized="minimized">
             <template #monthPage="{event,day}">
 				<span >
 					{{event.topic}}
@@ -155,7 +157,7 @@ export default{
 			<template #pageMobilContent>
 				<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 				<div class="w-100">
-					<lv-info  :event="currentlySelectedEvent" />
+					<lv-info :event="currentlySelectedEvent" />
 				</div>
 			</template>
 			<template #pageMobilContentEmpty >
@@ -163,4 +165,6 @@ export default{
 			</template>
         </fhc-calendar>
     `,
-};
\ No newline at end of file
+};
+
+export default RoomInformation
\ No newline at end of file
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 5a6ad9c09..afd121b2c 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -4,13 +4,14 @@ import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
 
-// TODO: define in one place that week is the default mode, it is hardcoded in 27 places currently
-export const Stundenplan = {
+export const DEFAULT_MODE = 'Week'
+
+const Stundenplan = {
 	name: 'Stundenplan',
 	data() {
 		return {
 			events: null,
-			calendarMode: "Week",
+			calendarMode: DEFAULT_MODE,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -102,20 +103,20 @@ export const Stundenplan = {
 			this.currentDay = day;
 		},
 		handleChangeMode(mode) {
-			console.log('handleChangeMode', mode)
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
-			
-			// TODO: clashes with initial mode and needs to be differentiated
-			// this.$router.replace({
-			// 	name: "Stundenplan",
-			// 	params: {
-			// 		mode: modeCapitalized,
-			// 		focus_date: this.currentDay.toISOString().split("T")[0],
-			// 		lv_id: this.viewData?.lv_id || null
-			// 	}
-			// })
-			
-			this.calendarMode = mode
+			const calendarModeCapitalized = this.calendarMode.charAt(0).toUpperCase() + this.calendarMode.slice(1)
+			if(modeCapitalized !== calendarModeCapitalized) { // avoid the first $emit event where mode is initialized 
+				this.$router.replace({
+					name: "Stundenplan",
+					params: {
+						mode: modeCapitalized,
+						focus_date: this.currentDay.toISOString().split("T")[0],
+						lv_id: this.viewData?.lv_id || null
+					}
+				})
+
+				this.calendarMode = mode
+			}
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;

From 8e76d93a5ad104d5c500eb3447d8e43e70fb6111 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Feb 2025 14:48:14 +0100
Subject: [PATCH 07/16] consistent naming of calendar modes in english; fixed
 routerguard to work with router.push on mode or date changes inside stpl
 component;

---
 application/controllers/Cis/Stundenplan.php   |  2 +-
 public/js/apps/Dashboard/Fhc.js               | 41 +++++++--------
 public/js/components/Calendar/Calendar.js     | 12 +++--
 public/js/components/Calendar/Header.js       |  8 +--
 .../components/Cis/Stundenplan/Stundenplan.js | 50 +++++++++----------
 5 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
index c9c486a47..5b7c25b21 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/Stundenplan.php
@@ -25,7 +25,7 @@ class Stundenplan extends Auth_Controller
 	 */
 	public function index($mode = 'Week', $focus_date = null, $lv_id = null)
 	{
-		// Convert string "null" to actual null values -> ci3 reroute fix
+		// convert string "null" to actual null values -> ci3 reroute fix
 		$mode = ($mode === 'null') ? 'Week' : ucfirst(strtolower($mode));
 		$focus_date = ($focus_date === 'null') ? date('Y-m-d') : $focus_date;
 		$lv_id = ($lv_id === 'null') ? null : $lv_id;
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 610abba0c..5442a7a86 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,7 +3,7 @@ import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
-import Stundenplan from "../../components/Cis/Stundenplan/Stundenplan";
+import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan";
 import MylvStudent from "../../components/Cis/Mylv/Student";
 import Profil from "../../components/Cis/Profil/Profil";
 import CmsNews from "../../components/Cis/Cms/News";
@@ -60,62 +60,55 @@ const router = VueRouter.createRouter({
 		},
 		// Redirect old links to new format
 		{
-			path: "/Cis/Stundenplan/:lv_id(\\d+)", // define lv_id as numeric so this matches
-			name: "StundenplanNumeric",
+			// only trigger on first param being numeric to avoid paths like "Stundenplan/Month" entering here
+			path: "/Cis/Stundenplan/:lv_id(\\d+)", 
+			name: "StundenplanOld",
 			component: Stundenplan,
 			redirect: (to) => {
 				return { // redirect to longer Stundenplan url and map params
 					name: "Stundenplan",
 					params: {
-						mode: "Week",
-						focus_date: new Date().toISOString().split("T")[0],
-						lv_id: to.params.lv_id || null
-						
+						lv_id: to.params.lv_id
 					},
 				};
 			},
 		},
-		{ 
-			// actual routes after Stundenplan -> config/routes.php
-			// actual param handling -> controllers/Cis/Stundenplan.php
+		{
 			path: `/Cis/Stundenplan/:mode?/:focus_date?/:lv_id?`,
 			name: 'Stundenplan',
 			component: Stundenplan,
 			props: (route) => { // validate and set mode/focus date if for some reason missing
 				const validModes = ["Month", "Week", "Day"];
 
-				// default to mode week if not provided
+				// check mode string
 				let 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()
-						: "Week";
+						: DEFAULT_MODE_STUNDENPLAN;
 
-				// default focus_date: today date if not provided
+				// default to today date if not provided
 				let focusDate = route.params.focus_date || new Date().toISOString().split("T")[0];
 				
-				// for consistency reasons format the props into the viewData object so we have consistency in the form 
-				// we access route specific data whether it is codigniter served or just another vue component that has been
-				// mounted
+				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
+				// existing viewData declaration written from codeigniter 3 into routerview tag
 				return {
-					viewData: {
+					propsViewData: {
 						mode,
 						focusDate,
-						lv_id: route.params.lv_id || null
+						lv_id: route.params.lv_id
 					}
 				};
 			},
 			beforeEnter: (to, from, next) => {
-				// If missing mode or focus_date, redirect with defaults
+				//  missing mode or focus_date -> set defaults
 				if (!to.params.mode || !to.params.focus_date) {
 					next({
 						name: "Stundenplan",
 						params: {
-							
-							mode: to.params.mode || "Week",
+							mode: to.params.mode || DEFAULT_MODE_STUNDENPLAN,
 							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
-							lv_id: to.params.lv_id || null
-							
-						},
+							lv_id: to.params.lv_id
+						}
 					});
 				} else {
 					next();
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 9ea37c19e..8eed731cd 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -63,7 +63,7 @@ export default {
 	},
 	watch:{
 		mode(newVal) {
-			console.log('mode watcher', newVal)
+			this.$emit('change:mode', newVal)
 		},
 		selectedEvent:{
 			handler(newSelectedEvent) {
@@ -125,7 +125,6 @@ export default {
 					this.prevMode = this.currMode;
 					this.currMode = v;
 				}
-				this.$emit('change:mode', this.currMode)
 			}
 		},
 		eventsPerDay() {
@@ -165,12 +164,12 @@ export default {
 			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
 				let filteredEvents = this.events.filter(event => {
 					let eventDate = new CalendarDate(new Date(event.datum));
-					if (this.mode == 'week') 
+					if (this.mode == 'week' || this.mode == 'Week')
 					{
 						// week view filters the elements only for the same week
 						return this.focusDate.w == eventDate.w;
 					}
-					else if (this.mode == 'day') 
+					else if (this.mode == 'day' || this.mode == 'Day')
 					{
 						// day view filters the elements for the same day and the same week
 						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
@@ -191,13 +190,16 @@ export default {
 		},
 	},
 	methods: {
+		setMode(mode) {
+			this.mode = mode
+		},
 		handleInput(day) {
 			this.$emit(day[0], day[1]);
 		},
 	},
 	created() {
 		const initMode = this.initialMode.toLowerCase()
-		const allowedInitialModes = ['years', 'day'];
+		const allowedInitialModes = ['day'];
 		if (!this.noWeekView)
 			allowedInitialModes.push('week');
 		if (!this.noMonthView)
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 5d92304c6..5ee3d51e7 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -3,9 +3,9 @@ export default {
 		return{
 			selected: this.mode,
 			modes:{
-				day: { mode_bezeichnung: "Tag", icon: "fa-calendar-day" , condition:true}, 
-				week: { mode_bezeichnung: "Woche", icon: "fa-calendar-week", condition: !this.noWeekView }, 
-				month: { mode_bezeichnung: "Monat", icon: "fa-calendar-days", condition: !this.noMonthView }, 
+				day: { mode_bezeichnung: "day", icon: "fa-calendar-day" , condition:true}, 
+				week: { mode_bezeichnung: "week", icon: "fa-calendar-week", condition: !this.noWeekView }, 
+				month: { mode_bezeichnung: "month", icon: "fa-calendar-days", condition: !this.noMonthView }, 
 			},
 			headerPadding:null,
 		}
@@ -62,7 +62,7 @@ export default {
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button type="button" :class="{'active':mode_kurzbz === mode}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+						<button type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
 							<i v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index afd121b2c..9d70fa948 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -4,14 +4,14 @@ import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
 
-export const DEFAULT_MODE = 'Week'
+export const DEFAULT_MODE_STUNDENPLAN = 'Week'
 
 const Stundenplan = {
 	name: 'Stundenplan',
 	data() {
 		return {
 			events: null,
-			calendarMode: DEFAULT_MODE,
+			calendarMode: DEFAULT_MODE_STUNDENPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -20,11 +20,11 @@ const Stundenplan = {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null,
+			uid: null
 		}
 	},
 	props: [
-		"viewData"
+		"propsViewData"
 	],
 	watch: {
 		weekFirstDay: {
@@ -37,12 +37,12 @@ const Stundenplan = {
 			},
 			immediate: true,
 		},
-		'viewData.lv_id'(newVal) {
-			// console.log('viewData.lv_id', newVal)
+		// forward/backward on history entries happening in stundenplan
+		'propsViewData.lv_id'(newVal) {
+		},
+		'propsViewData.mode'(newVal) {
+			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
 		},
-		'viewData.focus_date'(newVal) {
-			// console.log('viewData.focus_date', newVal)
-		}
 	},
 	components: {
 		FhcCalendar, LvModal, LvMenu, LvInfo
@@ -91,12 +91,12 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			
-			this.$router.replace({
+			this.$router.push({
 				name: "Stundenplan",
 				params: {
 					mode: this.calendarMode,
 					focus_date: date,
-					lv_id: this.viewData?.lv_id || null
+					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 			
@@ -104,19 +104,18 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
-			const calendarModeCapitalized = this.calendarMode.charAt(0).toUpperCase() + this.calendarMode.slice(1)
-			if(modeCapitalized !== calendarModeCapitalized) { // avoid the first $emit event where mode is initialized 
-				this.$router.replace({
-					name: "Stundenplan",
-					params: {
-						mode: modeCapitalized,
-						focus_date: this.currentDay.toISOString().split("T")[0],
-						lv_id: this.viewData?.lv_id || null
-					}
-				})
 
-				this.calendarMode = mode
-			}
+			this.$router.push({
+				name: "Stundenplan",
+				params: {
+					mode: modeCapitalized,
+					focus_date: this.currentDay.toISOString().split("T")[0],
+					lv_id: this.propsViewData?.lv_id ?? null
+				}
+			})
+		
+			this.calendarMode = mode
+
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
@@ -149,7 +148,7 @@ const Stundenplan = {
 		},
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.viewData.lv_id),
+				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
@@ -196,11 +195,12 @@ const Stundenplan = {
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
 	<fhc-calendar 
+		ref="calendar"
 		@selectedEvent="setSelectedEvent"
 		:initial-date="currentDay"
 		@change:range="updateRange"
 		:events="events"
-		:initial-mode="viewData.mode"
+		:initial-mode="propsViewData.mode"
 		show-weeks
 		@select:day="selectDay"
 		@change:mode="handleChangeMode"

From cb42ba110ea09af3e5d8633a06a043423128e92d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Feb 2025 16:31:05 +0100
Subject: [PATCH 08/16] adapt new calendar url format for rauminfo page;
 readded vue router dashboard fallback since there are possible url
 combinations that can not be resolved properly;

---
 public/js/apps/Dashboard/Fhc.js               | 84 ++++++++++++++++---
 .../js/components/Cis/Mylv/RoomInformation.js | 81 ++++++++++++++----
 .../components/Cis/Stundenplan/Stundenplan.js | 13 +--
 system/phrasesupdate.php                      | 40 +++++++++
 4 files changed, 188 insertions(+), 30 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 5442a7a86..a4cbb421d 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -9,7 +9,7 @@ import Profil from "../../components/Cis/Profil/Profil";
 import CmsNews from "../../components/Cis/Cms/News";
 import CmsContent from "../../components/Cis/Cms/Content";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info";
-import RoomInformation from "../../components/Cis/Mylv/RoomInformation";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -28,11 +28,62 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
+		
+		// Redirect old links to new format
 		{
-			path: `/CisVue/Cms/getRoomInformation/:ort_kurzbz`,
+			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
+			name: "RoomInformationOld",
+			component: RoomInformation,
+			redirect: (to) => {
+				return { // redirect to longer Rauminfo url and map params
+					name: "RoomInformation",
+					params: {
+						ort_kurzbz: to.params.ort_kurzbz
+					},
+				};
+			},
+		},
+		{
+			path: `/CisVue/Cms/getRoomInformation/:mode/:focus_date/:ort_kurzbz`,
 			name: 'RoomInformation',
 			component: RoomInformation,
-			props: true
+			props: (route) => { // validate and set mode/focus date if for some reason missing
+				const validModes = ["Month", "Week", "Day"];
+
+				// check mode string
+				const mode = route.params.mode &&
+				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
+					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
+					: DEFAULT_MODE_RAUMINFO;
+
+				// default to today date if not provided
+				const focus_date = route.params.focus_date || new Date().toISOString().split("T")[0];
+
+				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
+				// existing viewData declaration written from codeigniter 3 into routerview tag
+				return {
+					propsViewData: {
+						mode,
+						focus_date,
+						ort_kurzbz: route.params.ort_kurzbz
+					}
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				//  missing mode or focus_date -> set defaults
+				if (!to.params.mode || !to.params.focus_date) {
+					next({
+						name: "RoomInformation",
+						params: {
+							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
+							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
+							ort_kurzbz: route.params.ort_kurzbz
+						}
+					});
+				} else {
+					next();
+				}
+			}
 		},
 		{
 			path: `/CisVue/Cms/Content/:content_id`,
@@ -81,20 +132,19 @@ const router = VueRouter.createRouter({
 				const validModes = ["Month", "Week", "Day"];
 
 				// check mode string
-				let mode = route.params.mode &&
+				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_STUNDENPLAN;
 
 				// default to today date if not provided
-				let focusDate = route.params.focus_date || new Date().toISOString().split("T")[0];
-				
+				const focus_date = route.params.focus_date || new Date().toISOString().split("T")[0];
 				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
 				// existing viewData declaration written from codeigniter 3 into routerview tag
 				return {
 					propsViewData: {
 						mode,
-						focusDate,
+						focus_date,
 						lv_id: route.params.lv_id
 					}
 				};
@@ -115,6 +165,12 @@ const router = VueRouter.createRouter({
 				}
 			}
 		},
+		{
+			path: `/Cis4`,
+			name: 'Cis4',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+		},
 		{
 			path: `/`,
 			name: 'FhcDashboard',
@@ -122,11 +178,19 @@ const router = VueRouter.createRouter({
 			props: {dashboard: 'CIS'},
 		},
 		{
-			path: `/Cis4`,
-			name: 'Cis4',
+			path: '/:pathMatch(.*)*',
+			name: 'Fallback',
 			component: FhcDashboard,
 			props: {dashboard: 'CIS'},
-		}
+			redirect: () => {
+				return {
+					name: "Cis4",
+					params: {
+						dashboard: 'CIS'
+					},
+				};
+			},
+		},
 	]
 })
 
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 889651261..f143cda35 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -3,15 +3,14 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
-export const DEFAULT_MODE = 'Week'
+export const DEFAULT_MODE_RAUMINFO = 'Week'
 
 const RoomInformation = {
 	name: "RoomInformation",
     props:{
-        ort_kurzbz: {
-            type: String,
-            required: true,
-        }
+		propsViewData: {
+			type: Object
+		}
     },
 	components: {
 		FhcCalendar,
@@ -21,9 +20,10 @@ const RoomInformation = {
 	data() {
 		return {
 			events: null,
+			calendarMode: DEFAULT_MODE_RAUMINFO,
 			calendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
-			currentDay: new Date(),
+			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
 			minimized: false,
             
         }
@@ -45,6 +45,17 @@ const RoomInformation = {
 			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
 		},
     },
+	watch: {
+		'propsViewData.ort_kurzbz'(newVal) {
+			// relevant if ort_kurzbz can be changed from within this component
+		},
+		'propsViewData.mode'(newVal) {
+			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
+		},
+		'propsViewData.focus_date'(newVal) {
+			this.currentDate = new Date(newVal)
+		}	
+	},
     methods:{
 		setSelectedEvent: function(event){
 			this.currentlySelectedEvent = event;
@@ -52,9 +63,38 @@ const RoomInformation = {
 		getLvID: function () {
 			this.lv_id = window.location.pathname
 		},
-		selectDay: function (day) {
+		selectDay: function(day){
+			debugger
+			const date = day.getFullYear() + "-" +
+				String(day.getMonth() + 1).padStart(2, "0") + "-" +
+				String(day.getDate()).padStart(2, "0");
+
+			this.$router.push({
+				name: "RoomInformation",
+				params: {
+					mode: this.calendarMode,
+					focus_date: date,
+					ort_kurzbz: this.propsViewData.ort_kurzbz
+				}
+			})
+
 			this.currentDay = day;
 		},
+		handleChangeMode(mode) {
+			debugger
+			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+
+			this.$router.push({
+				name: "RoomInformation",
+				params: {
+					mode: modeCapitalized,
+					focus_date: this.currentDay.toISOString().split("T")[0],
+					ort_kurzbz: this.propsViewData.ort_kurzbz
+				}
+			})
+
+			this.calendarMode = mode
+		},
 		showModal: function (event) {
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
@@ -88,8 +128,8 @@ const RoomInformation = {
 
 			// bundles the room_events and the reservierungen together into the this.events array
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.monthFirstDay, this.monthLastDay),
-				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.ort_kurzbz, this.monthFirstDay, this.monthLastDay)
+				this.$fhcApi.factory.stundenplan.getRoomInfo(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -122,10 +162,21 @@ const RoomInformation = {
 		this.loadEvents();
 	},
     template: /*html*/`
-		<h2>Room Information {{ ort_kurzbz }}</h2>
+		<h2>{{ $p.t('rauminfo/rauminfo') }} {{ propsViewData.ort_kurzbz }}</h2>
 		<hr>
 		<lv-modal v-if="currentlySelectedEvent" :showMenu="false" :event="currentlySelectedEvent" ref="lvmodal" />
-		<fhc-calendar @selectedEvent="setSelectedEvent" :initial-date="currentDay" @change:range="updateRange" :events="events" initial-mode="DEFAULT_MODE" show-weeks @select:day="selectDay" v-model:minimized="minimized">
+		<fhc-calendar 
+			ref="calendar"
+			@selectedEvent="setSelectedEvent" 
+			:initial-date="currentDay"
+			@change:range="updateRange" 
+			:events="events" 
+			:initial-mode="propsViewData.mode"
+			show-weeks 
+			@select:day="selectDay"
+			@change:mode="handleChangeMode"
+			v-model:minimized="minimized"
+		>
             <template #monthPage="{event,day}">
 				<span >
 					{{event.topic}}
@@ -141,15 +192,15 @@ const RoomInformation = {
 			<template #dayPage="{event,day,mobile}">
 				<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 					<div class="col ">
-						<p>Lehrveranstaltung:</p>
+						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
 						<p class="m-0">{{event?.orig.topic}}</p>
 					</div>
 					<div class="col ">
-						<p>Lektor:</p>
+						<p>{{ $p.t('lehre/lektor') }}:</p>
 						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
 					</div>
 					<div class="col ">
-						<p>Ort: </p>
+						<p>{{ $p.t('profil/Ort') }}: </p>
 						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
 					</div>
 				</div>
@@ -161,7 +212,7 @@ const RoomInformation = {
 				</div>
 			</template>
 			<template #pageMobilContentEmpty >
-				<h3>Keine Raum Reservierung</h3>
+				<h3>{{$p.t('rauminfo','keineRaumReservierung')}}</h3>
 			</template>
         </fhc-calendar>
     `,
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 9d70fa948..43d7e3250 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -15,7 +15,7 @@ const Stundenplan = {
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
-			currentDay: this.viewData?.focus_date ? new Date(this.viewData.focus_date) : new Date(),
+			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
 			minimized: false,
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
@@ -23,9 +23,9 @@ const Stundenplan = {
 			uid: null
 		}
 	},
-	props: [
-		"propsViewData"
-	],
+	props: {
+		propsViewData: Object
+	},
 	watch: {
 		weekFirstDay: {
 			handler: async function (newValue) {
@@ -39,10 +39,14 @@ const Stundenplan = {
 		},
 		// forward/backward on history entries happening in stundenplan
 		'propsViewData.lv_id'(newVal) {
+			// relevant if lv_id can be changed from within this component
 		},
 		'propsViewData.mode'(newVal) {
 			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
 		},
+		'propsViewData.focus_date'(newVal) {
+			this.currentDate = new Date(newVal)
+		}
 	},
 	components: {
 		FhcCalendar, LvModal, LvMenu, LvInfo
@@ -115,7 +119,6 @@ const Stundenplan = {
 			})
 		
 			this.calendarMode = mode
-
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f34f32b9f..dc681e108 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20164,6 +20164,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'rauminfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raum Informationen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Information",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'keineRaumReservierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Raum Reservierungen gefunden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Room Reservations found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From b8174582226c87238fcc8bf1fae0026f7666054f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Feb 2025 17:36:48 +0100
Subject: [PATCH 09/16] lv menu events send phrasenkey to enable responsive
 localization in myLv

---
 include/tw/cis_menu_lv.inc.php                           | 3 +++
 public/js/components/Cis/Mylv/RoomInformation.js         | 2 --
 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index a18af4bde..fa35362bd 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -402,6 +402,7 @@ function checkZeilenUmbruch()
 			'id'=>'core_menu_mailanstudierende',
 			'position'=>'100',
 			'name'=>$p->t('lehre/mail'),
+			'phrase'=>'lehre/mail',
 			'icon'=>'../../../skin/images/button_feedback.png',
 			'link'=>$mailto,
 			'link_onclick'=>$link_onclick
@@ -477,6 +478,7 @@ function checkZeilenUmbruch()
             'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse',
             'position'=>'128',
             'name'=>$p->t('lehre/anrechnung'),
+			'phrase'=>'lehre/anrechnung',
             'icon'=>'../../../skin/images/button_listen.png',
             'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid)
         );
@@ -491,6 +493,7 @@ if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTU
 		'id'=>'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
 		'position'=>'128',
 		'name'=>$p->t('lehre/anrechnungen'),
+		'phrase'=>'lehre/anrechnung',
 		'icon'=>'../../../skin/images/button_listen.png',
 		'link' => APP_ROOT. 'index.ci.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem)
 	);
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index f143cda35..c89756faa 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -64,7 +64,6 @@ const RoomInformation = {
 			this.lv_id = window.location.pathname
 		},
 		selectDay: function(day){
-			debugger
 			const date = day.getFullYear() + "-" +
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
@@ -81,7 +80,6 @@ const RoomInformation = {
 			this.currentDay = day;
 		},
 		handleChangeMode(mode) {
-			debugger
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
 
 			this.$router.push({
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 59ede800e..ea19652c6 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -177,7 +177,7 @@ export default {
 							:class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
-								{{menuItem.name}}
+								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
 							</a>
 							</div>
 							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">

From 714d74d9aacd9c29b7f40609834f6292a1acf670 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 19 Feb 2025 11:25:29 +0100
Subject: [PATCH 10/16] url widget template fix

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

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index eaf42ab2d..90dcb5315 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -159,11 +159,11 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        <!-- todo: widgetTag ?? -->
+        	<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+
             <template v-if="shared">
 
                 <template v-if="!emptyBookmarks">
-					<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
 						<a target="_blank" :href="link.url">
 							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}
@@ -208,7 +208,7 @@ export default {
 				<form-input id="editUrl" v-model="url_input" name="url"></form-input>
 			</template>
 			<template #footer>
-				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','editLink')}}</button>
+				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
 	</core-form>

From 1d9ea5d091bf3fb806537bf978a61ec9677262b8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 20 Feb 2025 11:22:30 +0100
Subject: [PATCH 11/16] router click intercepter does not resolve internally
 when only matched route was the Fallback matchAll route; cleanup routes.php &
 Stundenplan controller from viewData and verbose reroutes; overflow setting
 on years page;

---
 application/config/routes.php               | 12 +-----------
 application/controllers/Cis/Stundenplan.php | 11 +----------
 public/js/apps/Dashboard/Fhc.js             | 16 ++++++++++------
 public/js/components/Calendar/Years/Page.js |  7 +++++++
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index ede5cc9bd..eb4c267ce 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,17 +61,7 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['Cis/Stundenplan'] = 'Cis/Stundenplan/index/null/null/null';
-$route['Cis/Stundenplan/(:num)'] = 'Cis/Stundenplan/index/null/null/$1';
-$route['Cis/Stundenplan/(:num)/(:any)'] = 'Cis/Stundenplan/index/null/$2/$1';
-
-// Specific route (for mode: month|week|day, focusdate, lv_id optional)
-$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)'] = 'Cis/Stundenplan/index/$1';
-$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)(/(:any))?'] = 'Cis/Stundenplan/index/$1/$3';
-$route['Cis/Stundenplan/([M|m]onth|[W|w]eek|[D|d]ay)(/(:any))?(/(:num))?'] = 'Cis/Stundenplan/index/$1/$3/$5';
-
-
-
+$route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/Stundenplan.php
index 5b7c25b21..71e01be8b 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/Stundenplan.php
@@ -23,19 +23,10 @@ class Stundenplan extends Auth_Controller
 	/**
 	 * @return void
 	 */
-	public function index($mode = 'Week', $focus_date = null, $lv_id = null)
+	public function index()
 	{
-		// convert string "null" to actual null values -> ci3 reroute fix
-		$mode = ($mode === 'null') ? 'Week' : ucfirst(strtolower($mode));
-		$focus_date = ($focus_date === 'null') ? date('Y-m-d') : $focus_date;
-		$lv_id = ($lv_id === 'null') ? null : $lv_id;
-		
-		if($mode) $mode = ucfirst(strtolower($mode));
 		
 		$viewData = array(
-			'mode' => $mode,
-			'focus_date' => $focus_date,
-			'lv_id' => $lv_id,
 			'uid'=>getAuthUID(),
 		);
 		
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a4cbb421d..e3ba786f1 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -37,8 +37,10 @@ const router = VueRouter.createRouter({
 			redirect: (to) => {
 				return { // redirect to longer Rauminfo url and map params
 					name: "RoomInformation",
-					params: {
-						ort_kurzbz: to.params.ort_kurzbz
+					params: { // in this case always populate other params since they are not optional
+						ort_kurzbz: to.params.ort_kurzbz,
+						mode: DEFAULT_MODE_RAUMINFO,
+						focus_date: new Date().toISOString().split("T")[0]
 					},
 				};
 			},
@@ -57,7 +59,8 @@ const router = VueRouter.createRouter({
 					: DEFAULT_MODE_RAUMINFO;
 
 				// default to today date if not provided
-				const focus_date = route.params.focus_date || new Date().toISOString().split("T")[0];
+				const d = new Date(route.params.focus_date)
+				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
 
 				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
 				// existing viewData declaration written from codeigniter 3 into routerview tag
@@ -137,8 +140,9 @@ const router = VueRouter.createRouter({
 						? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
 						: DEFAULT_MODE_STUNDENPLAN;
 
-				// default to today date if not provided
-				const focus_date = route.params.focus_date || new Date().toISOString().split("T")[0];
+				// default to today date if not provided or string forms invalid date
+				const d = new Date(route.params.focus_date)
+				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
 				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
 				// existing viewData declaration written from codeigniter 3 into routerview tag
 				return {
@@ -227,7 +231,7 @@ const app = Vue.createApp({
 
 				// let click event propagate normally if we dont route internally
 				const res = this.$router.resolve(route)
-				if(!res?.matched?.length) return
+				if(!res?.matched?.length || res.name === 'Fallback') return
 				
 				event.preventDefault(); // Prevent browser navigation
 				
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
index c6efe0ffc..3d78fc38d 100644
--- a/public/js/components/Calendar/Years/Page.js
+++ b/public/js/components/Calendar/Years/Page.js
@@ -18,6 +18,13 @@ export default {
 			return [...Array(this.end - this.start).keys()].map(i => i + this.start);
 		}
 	},
+	mounted() {
+		const container = document.getElementById("calendarContainer")
+		if(container) {
+			container.style['overflow-y'] = 'scroll'
+			container.style['overflow-x'] = 'auto'
+		}
+	},
 	template: `
 	<div class="fhc-calendar-years-page d-flex flex-wrap">
 		<div v-for="year in years" :key="year" class="d-grid col-4">

From 3d467524e49a35c391c53dc88422f70e59f76d0c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 20 Feb 2025 12:59:28 +0100
Subject: [PATCH 12/16] change Stundenplan/Rauminfo currentDay on prev/next
 event by certain offset and update url/browser history

---
 public/js/components/Calendar/Calendar.js     |  6 +++--
 public/js/components/Calendar/Day.js          |  2 ++
 public/js/components/Calendar/Month.js        |  2 ++
 public/js/components/Calendar/Week.js         |  2 ++
 public/js/components/Calendar/Week/Page.js    |  7 +++++-
 public/js/components/Calendar/Weeks.js        |  2 +-
 public/js/components/Calendar/Years.js        |  2 ++
 .../js/components/Cis/Mylv/RoomInformation.js | 23 ++++++++++++++++++-
 .../components/Cis/Stundenplan/Stundenplan.js | 23 ++++++++++++++++++-
 9 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 8eed731cd..cd935b2ad 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -95,7 +95,8 @@ export default {
 		'select:event',
 		'change:range',
 		'update:minimized',
-		'selectedEvent'
+		'selectedEvent',
+		'change:offset'
 	],
 	data() {
 		return {
@@ -240,7 +241,8 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
+		 @input="handleInput" @change:offset="$emit('change:offset', $event)">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index 2f07efef3..c1d0a6dfb 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -27,9 +27,11 @@ export default {
 		},
 		prev() {
 			this.$refs.pane.prev();
+			this.$emit('change:offset', { y: 0, m: 0, d: -1 });
 		},
 		next() {
 			this.$refs.pane.next();
+			this.$emit('change:offset', { y: 0, m: 0, d: -1 });
 		},
 		selectEvent(event) {
 			this.$emit('input', ['select:event', event]);
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 79fc1bf23..513ed1c8c 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -35,9 +35,11 @@ export default {
 		},
 		prev() {
 			this.$refs.pane.prev();
+			this.$emit('change:offset', { y: 0, m: -1, d: 0 });
 		},
 		next() {
 			this.$refs.pane.next();
+			this.$emit('change:offset', { y: 0, m: 1, d: 0 });
 		},
 		selectDay(day) {
 			let m = day.getMonth();
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 9a42f9659..350f0130d 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -27,9 +27,11 @@ export default {
 		},
 		prev() {
 			this.$refs.pane.prev();
+			this.$emit('change:offset', { y: 0, m: 0, d: -7 });
 		},
 		next() {
 			this.$refs.pane.next();
+			this.$emit('change:offset', { y: 0, m: 0, d: 7 });
 		},
 		selectEvent(event) {
 			this.$emit('input', ['select:event',event]);
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index d6e5c6df0..15ab08071 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -272,6 +272,11 @@ export default {
 				this.$emit('updateMode', 'month');
 			}
 		},
+		changeToDay(day) {
+			this.date.set(day);
+			this.focusDate.set(day);
+			this.$emit('updateMode', 'day');
+		},
 		dateToMinutesOfDay(day) {
 			// subtract 7 from the total hours because the hours range from 7 to 24
 			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
@@ -320,7 +325,7 @@ export default {
 	<div ref="page" class="fhc-calendar-week-page" style="min-width: 700px;">
 		<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
-				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToMonth(day)">
+				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
 					<div class="fw-bold">{{dayText[day]?.tag}}</div>
 					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 844101b88..76243c67b 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -32,7 +32,7 @@ export default {
 		},
 	},
 	template: `
-	<div class="fhc-calendar-weeks">
+	<div class="fhc-calendar-weeks h-100">
 		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
index 6cda6cfe9..baff2eb6c 100644
--- a/public/js/components/Calendar/Years.js
+++ b/public/js/components/Calendar/Years.js
@@ -41,9 +41,11 @@ export default {
 		},
 		prev() {
 			this.$refs.pane.prev();
+			this.$emit('change:offset', { y: -1, m: 0, d: 0 });
 		},
 		next() {
 			this.$refs.pane.next();
+			this.$emit('change:offset', { y: 1, m: 0, d: 0 });
 		}
 	},
 	created() {
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index c89756faa..255e66164 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -79,6 +79,26 @@ const RoomInformation = {
 
 			this.currentDay = day;
 		},
+		handleOffset: function(offset)  {
+			this.currentDay = new Date(
+				this.currentDay.getFullYear() + offset.y,
+				this.currentDay.getMonth() + offset.m,
+				this.currentDay.getDate() + offset.d
+			)
+
+			const date = this.currentDay.getFullYear() + "-" +
+				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
+				String(this.currentDay.getDate()).padStart(2, "0");
+
+			this.$router.push({
+				name: "Stundenplan",
+				params: {
+					mode: this.calendarMode,
+					focus_date: date,
+					lv_id: this.propsViewData?.lv_id || null
+				}
+			})
+		},
 		handleChangeMode(mode) {
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
 
@@ -167,7 +187,8 @@ const RoomInformation = {
 			ref="calendar"
 			@selectedEvent="setSelectedEvent" 
 			:initial-date="currentDay"
-			@change:range="updateRange" 
+			@change:range="updateRange"
+			@change:offset="handleOffset"
 			:events="events" 
 			:initial-mode="propsViewData.mode"
 			show-weeks 
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 43d7e3250..0eb21d5b1 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -106,6 +106,26 @@ const Stundenplan = {
 			
 			this.currentDay = day;
 		},
+		handleOffset: function(offset)  {
+			this.currentDay = new Date(
+				this.currentDay.getFullYear() + offset.y, 
+				this.currentDay.getMonth() + offset.m,
+				this.currentDay.getDate() + offset.d
+			)
+
+			const date = this.currentDay.getFullYear() + "-" +
+				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
+				String(this.currentDay.getDate()).padStart(2, "0");
+
+			this.$router.push({
+				name: "Stundenplan",
+				params: {
+					mode: this.calendarMode,
+					focus_date: date,
+					lv_id: this.propsViewData?.lv_id || null
+				}
+			})
+		},
 		handleChangeMode(mode) {
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
 
@@ -127,7 +147,7 @@ const Stundenplan = {
 			});
 		},
 		updateRange: function ({start,end}) {
-
+			
 			let checkDate = (date) => {
 				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
 			}
@@ -202,6 +222,7 @@ const Stundenplan = {
 		@selectedEvent="setSelectedEvent"
 		:initial-date="currentDay"
 		@change:range="updateRange"
+		@change:offset="handleOffset"
 		:events="events"
 		:initial-mode="propsViewData.mode"
 		show-weeks

From 844c31885ef9b66f9032657db0e1fa44835e39ab Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 20 Feb 2025 16:25:57 +0100
Subject: [PATCH 13/16] defined row min height & event max height props; month
 event click opens lv modal; fixed off by one date state;

---
 public/js/components/Calendar/Day.js          |  2 +-
 public/js/components/Calendar/Day/Page.js     |  6 ++-
 public/js/components/Calendar/Month/Page.js   |  6 +--
 public/js/components/Calendar/Week/Page.js    |  5 ++-
 .../components/Cis/Stundenplan/Stundenplan.js | 45 ++++++++++++++-----
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index c1d0a6dfb..c0f1040f5 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -31,7 +31,7 @@ export default {
 		},
 		next() {
 			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 0, d: -1 });
+			this.$emit('change:offset', { y: 0, m: 0, d: 1 });
 		},
 		selectEvent(event) {
 			this.$emit('input', ['select:event', event]);
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 70bccc49d..a57fb97af 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -36,6 +36,7 @@ export default {
 		'calendarClientHeight',
 		'setSelectedEvent',
 		'selectedEvent',
+		'rowMinHeight'
 	],
 	props: {
 		year: Number,
@@ -372,11 +373,12 @@ export default {
 								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
 
 									<div class="hours">
-										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
 									<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
 										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
-										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast :selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden " >
+										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast 
+											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden" >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
 											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
 												<slot  name="dayPage" :event="event" :day="day" :mobile="false">
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 04e3a8e64..8ec700ce7 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -143,16 +143,16 @@ export default {
 			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25"
 			@click.prevent="changeToWeek(week)">{{week.no}}</a>
 			<a href="#" 
-			@click.prevent="clickEvent(day,week)" 
+			@click="clickEvent(day,week)"
 			@mouseover="highlight(week,day)" 
 			@mouseleave="highlightedWeek = null; highlightedDay = null"
 			v-for="day in week.days" 
 			:key="day"
 			:class="getDayClass(week, day)" 
 			>
-				<span class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
+				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
-					<div @click="setSelectedEvent(event);" v-for="event in events[day.toDateString()]" :key="event.id" 
+					<div v-for="event in events[day.toDateString()]" :key="event.id" 
 					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent" v-contrast >
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 15ab08071..c9f751f66 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -23,7 +23,8 @@ export default {
 		'noMonthView',
 		'isSliding',
 		'selectedEvent',
-		'setSelectedEvent'
+		'setSelectedEvent',
+		'rowMinHeight'
 	],
 	props: {
 		year: Number,
@@ -38,7 +39,7 @@ export default {
 	computed: {
 		getGridStyle() {
 			return {
-				'min-height': '100px',
+				'min-height': this.rowMinHeight,
 				// this.size is the magic number anyway which directs font-size,
 				// which in turn influences a lot of layout
 				width: '42px'
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 0eb21d5b1..1e455a6c9 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -24,7 +24,21 @@ const Stundenplan = {
 		}
 	},
 	props: {
-		propsViewData: Object
+		propsViewData: Object,
+		rowMinHeight: {
+			type: String,
+			default: '100px'
+		},
+		eventMaxHeight: {
+			type: String,
+			default: '125px'
+		}
+	},
+	provide() {
+		return {
+			rowMinHeight: this.rowMinHeight,
+			eventMaxHeight: this.eventMaxHeight
+		}	
 	},
 	watch: {
 		weekFirstDay: {
@@ -94,7 +108,7 @@ const Stundenplan = {
 			const date = day.getFullYear() + "-" +
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
-			
+
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -128,19 +142,23 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+			const date = this.currentDay.getFullYear() + "-" +
+				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
+				String(this.currentDay.getDate()).padStart(2, "0");
 
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
 					mode: modeCapitalized,
-					focus_date: this.currentDay.toISOString().split("T")[0],
+					focus_date: date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			})
 		
 			this.calendarMode = mode
 		},
-		showModal: function(event){
+		showModal: function(e, event){
+			e.stopPropagation()
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
 				this.$refs.lvmodal.show();
@@ -241,12 +259,15 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<span class="fhc-entry" >
-				{{event.topic}}
-			</span>
+			<div @click="showModal($event, event); ">
+				<span class="fhc-entry">
+					{{event.topic}}
+				</span>
+			</div>
+			
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event?.orig); " type="button"
+			<div @click="showModal($event, event?.orig);" type="button"
 			class=" position-relative border border-secondary border d-flex flex-col align-items-center
 			justify-content-evenly h-100" style="overflow: auto;">
 
@@ -264,22 +285,22 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row m-0 h-100 justify-content-center align-items-center text-center">
+			<div @click="mobile? showModal($event, event?.orig):null" type="button" class="fhc-entry border border-secondary border row m-0 h-100 justify-content-center align-items-center text-center">
 				<div class="col-auto" v-if="event?.orig?.beginn && event?.orig?.ende" >
 					<div class="d-flex flex-column p-4 border-end border-secondary">
 						<span class="small">{{convertTime(event.orig.beginn.split(":"))}}</span>
 						<span class="small">{{convertTime(event.orig.ende.split(":"))}}</span>
 					</div>
 				</div>
-				<div class="col ">
+				<div class="col">
 					<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
 					<p class="m-0">{{event?.orig.topic}}</p>
 				</div>
-				<div class="col ">
+				<div class="col" :style="'max-height: ' + eventMaxHeight + '; overflow: auto;'">
 					<p>{{ $p.t('lehre/lektor') }}:</p>
 					<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
 				</div>
-				<div class="col ">
+				<div class="col">
 					<p>{{ $p.t('profil/Ort') }}: </p>
 					<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
 				</div>

From 7a0a2d756d364869bb14bb73ff08613f14ea9433 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 21 Feb 2025 14:16:11 +0100
Subject: [PATCH 14/16] load lv entry as meta info when querying stundenplan by
 lva & show titel in ger/eng; also show currently active Studiensemester;
 roomInfo constant defined aswell;

---
 .../api/frontend/v1/Stundenplan.php           |  5 ++++
 .../js/components/Cis/Mylv/RoomInformation.js | 21 ++++++++++++++--
 .../components/Cis/Stundenplan/Stundenplan.js | 24 +++++++++++++++----
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 0a56dac71..2ec02fea9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -153,6 +153,11 @@ class Stundenplan extends FHCAPI_Controller
 			$stundenplan_data = $this->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
 			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 			$this->expand_object_information($stundenplan_data);
+
+			// query lv itself in case its Stundenplan is being queried and it has no entries
+			$this->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
+			$lv = getData($this->LehrveranstaltungModel->load($lv_id))[0];
+			$this->addMeta('lv', $lv);
 			$this->terminateWithSuccess($stundenplan_data);
 			
 		}
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 255e66164..8a7354305 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -10,6 +10,14 @@ const RoomInformation = {
     props:{
 		propsViewData: {
 			type: Object
+		},
+		rowMinHeight: {
+			type: String,
+			default: '100px'
+		},
+		eventMaxHeight: {
+			type: String,
+			default: '125px'
 		}
     },
 	components: {
@@ -17,6 +25,12 @@ const RoomInformation = {
 		LvModal,
 		LvInfo,
 	},
+	provide() {
+		return {
+			rowMinHeight: this.rowMinHeight,
+			eventMaxHeight: this.eventMaxHeight
+		}
+	},
 	data() {
 		return {
 			events: null,
@@ -101,12 +115,15 @@ const RoomInformation = {
 		},
 		handleChangeMode(mode) {
 			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
-
+			const date = this.currentDay.getFullYear() + "-" +
+				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
+				String(this.currentDay.getDate()).padStart(2, "0");
+			
 			this.$router.push({
 				name: "RoomInformation",
 				params: {
 					mode: modeCapitalized,
-					focus_date: this.currentDay.toISOString().split("T")[0],
+					focus_date: date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 1e455a6c9..3fee43058 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -16,6 +16,7 @@ const Stundenplan = {
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
 			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
+			lv: null,
 			minimized: false,
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
@@ -73,8 +74,17 @@ const Stundenplan = {
 			let ende = new Date(this.studiensemester_ende);
 			ende = Math.floor(ende.getTime() / 1000);
 
-			let download_link = (format, version = "", target = "") => `${FHC_JS_DATA_STORAGE_OBJECT.app_root}cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=${this.uid}&begin=${start}&ende=${ende}&format=${format}${version ? '&version=' + version : ''}${target ? '&target=' + target : ''}`;
-			return [{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link('excel') }, { title: "csv", icon: 'fa-solid fa-file-csv', link: download_link('csv') }, { title: "ical1", icon: 'fa-regular fa-calendar', link: download_link('ical', '1', 'ical') }, { title: "ical2", icon: 'fa-regular fa-calendar', link: download_link('ical', '2', 'ical') }];
+			let download_link = 
+				(format, version = "", target = "") => 
+					`${FHC_JS_DATA_STORAGE_OBJECT.app_root}cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=
+					${this.uid}&begin=${start}&ende=${ende}&format=${format}
+					${version ? '&version=' + version : ''}${target ? '&target=' + target : ''}`;
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link('excel') },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link('csv') },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link('ical', '1', 'ical') },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link('ical', '2', 'ical') }
+			];
 		},
 		weekFirstDay: function () {
 			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
@@ -195,7 +205,9 @@ const Stundenplan = {
 				let promise_events = [];
 				result.forEach((promise_result) => {
 					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-
+						
+						if(promise_result.value.meta?.lv) this.lv = promise_result.value.meta.lv
+						
 						let data = promise_result.value.data;
 						// adding additional information to the events 
 						if (data && data.forEach) {
@@ -232,7 +244,11 @@ const Stundenplan = {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
 	},
 	template:/*html*/`
-	<h2>{{$p.t('lehre/stundenplan')}}</h2>
+	<h2>
+		{{$p.t('lehre/stundenplan')}}
+		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
+		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
+	</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
 	<fhc-calendar 

From 881b7fb7897ec633ae7d848e5d2e46a48b72cc03 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Feb 2025 17:53:56 +0100
Subject: [PATCH 15/16] fix loadEvents race condition; normalize route pushes;
 WIP getting route.replace to work;

---
 .../education/Lehrveranstaltung_model.php     | 22 ++++------
 public/js/components/Calendar/Day.js          |  6 +--
 public/js/components/Calendar/Month.js        | 16 ++++----
 public/js/components/Calendar/Month/Page.js   |  7 +++-
 public/js/components/Calendar/Week.js         |  8 ++--
 public/js/components/Cis/Mylv/Semester.js     |  3 +-
 .../Cis/Mylv/Semester/Studiengang.js          |  5 ++-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  9 +++--
 .../components/Cis/Stundenplan/Stundenplan.js | 40 +++++++++----------
 9 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 8044fa9de..44f9834d8 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -556,16 +556,6 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null, $lvid=null)
 	{
-		if ($sprache) {
-			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
-			$bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
-			$sgbezeichnung = $sprache == 'English' ? 'COALESCE(sg.english, sg.bezeichnung)' : 'sg.bezeichnung';
-			$lvbezeichnung = $sprache == 'English' ? 'COALESCE(v.bezeichnung_english, v.bezeichnung)' : 'v.bezeichnung';
-		} else {
-			$bezeichnung = 'bezeichnung';
-			$sgbezeichnung = 'sg.bezeichnung';
-			$lvbezeichnung = 'v.bezeichnung';
-		}
 
 		$this->addDistinct();
 		// TODO(chris): selects
@@ -605,16 +595,20 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addSelect('znn.positiv');
 
 		#$this->addSelect('splv.module');
-		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
-		$this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
+		$this->addSelect('v.bezeichnung AS bezeichnung');
+		$this->addSelect('v.bezeichnung_english AS bezeichnung_eng');
+		$this->addSelect('sg.bezeichnung AS sg_bezeichnung');
+		$this->addSelect('sg.english AS sg_bezeichnung_eng');
 		$this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
 		
 		//also adds returns the index of the grade
 		//TODO: ist zeugnissnote immer gleich wie die lvgesamtnote
 		$this->addSelect('COALESCE(zn.note::numeric,gn.note::numeric) as note_index');
 		$this->addSelect('COALESCE(znn.positiv,gnn.positiv) as positiv');
-		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
-		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
+		$this->addSelect('gnn.bezeichnung_mehrsprachig AS lvnotebez');
+		$this->addSelect('gnn.note AS lvnote');
+		$this->addSelect('znn.bezeichnung_mehrsprachig AS znotebez');
+		$this->addSelect('znn.note AS znote');
 
 		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index c0f1040f5..9eafe0120 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -22,7 +22,7 @@ export default {
 			this.focusDate.d += dir;
 			this.emitRangeChanged(previousDate);
 		},
-		emitRangeChanged(previousDate) {
+		emitRangeChanged(previousDate, mounted) {
 			this.$emit('change:range', { start: previousDate, end:this.focusDate });
 		},
 		prev() {
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event', event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(new CalendarDate(this.focusDate.y, this.focusDate.m, this.focusDate.d -1), true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-day">
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 513ed1c8c..d427304b8 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -28,9 +28,14 @@ export default {
 			} else {
 				this.focusDate.moveMonthInDirection(dir)
 			}
+			this.emitRangeChanged()
+		},
+		emitRangeChanged(mounted = false) {
+
 			this.$emit('change:range', {
-				start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-				end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
+				start: new Date(this.focusDate.y, this.focusDate.m, 1),
+				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
+				mounted
 			});
 		},
 		prev() {
@@ -55,11 +60,8 @@ export default {
 			this.$emit('input', ['select:day',day])
 		}
 	},
-	created() {
-		this.$emit('change:range', {
-			start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-			end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
-		});
+	mounted() {
+		this.emitRangeChanged(true)
 	},
 	template: `
 	<div class="fhc-calendar-month">
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 8ec700ce7..f5354fc7b 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,6 +63,10 @@ export default {
 		
 	},
 	methods: {
+		handleEventClick(e, day) {
+			this.selectDay(day)
+			e.stopPropagation()
+		},
 		getDayClass(week, day) {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
@@ -153,7 +157,8 @@ export default {
 				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
-					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent" v-contrast >
+					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
+					v-contrast @click="handleEventClick($event, day)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 350f0130d..6e94c6b92 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -20,10 +20,10 @@ export default {
 			this.focusDate.d += dir * 7;
 			this.emitRangeChanged();
 		},
-		emitRangeChanged() {
+		emitRangeChanged(mounted = false) {
 			let start = this.focusDate.firstDayOfWeek;
 			let end = this.focusDate.lastDayOfWeek;
-			this.$emit('change:range', { start, end });
+			this.$emit('change:range', { start, end, mounted });
 		},
 		prev() {
 			this.$refs.pane.prev();
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event',event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-week">
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index b6ac3563a..994a7c9ff 100644
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -22,7 +22,8 @@ export default {
 					lv.studiengang_kz + '#' + lv.semester, 
 					{
 						studiengang_kz: lv.studiengang_kz, 
-						bezeichnung: lv.sg_bezeichnung, 
+						bezeichnung: lv.sg_bezeichnung,
+						sg_bezeichnung_eng: lv.sg_bezeichnung_eng,
 						kuerzel: lv.studiengang_kuerzel, 
 						semester: lv.semester
 					}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 9629ba307..15d210796 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -12,7 +12,8 @@ export default {
 		bezeichnung: String,
 		kuerzel: String,
 		semester: [String,Number],
-		lvs: Array
+		lvs: Array,
+		sg_bezeichnung_eng: String
 	},
 	computed: {
 		lehrveranstaltungen() {
@@ -32,7 +33,7 @@ export default {
 	},
 	template: `<div class="card mb-3">
 		<div class="card-body">
-			<h4 class="card-title mb-3">{{bezeichnung}} - {{kuerzel}}
+			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>
 			</h4>
 			<div class="row">
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index ea19652c6..d0dd99f68 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -29,7 +29,7 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String,
+		note_index: String
 	},
 	data: () => {
 		return {
@@ -66,8 +66,8 @@ export default {
 			return bodyStyle;
 		},
 		grade() {
-			// TODO: noten phrasen
-			return this.benotung ? this.znote || this.lvnote || null : null;
+			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
+			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
@@ -123,6 +123,7 @@ export default {
 				LvInfo.popup({
 					lehrveranstaltung_id: this.lehrveranstaltung_id, 
 					bezeichnung: this.bezeichnung,
+					bezeichnung_eng: this.bezeichnung_eng,
 					studiengang_kuerzel: this.studiengang_kuerzel,
 					semester: this.semester,
 					studien_semester: this.studien_semester,
@@ -161,7 +162,7 @@ export default {
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
-			<h6 class="mb-0">{{bezeichnung}}</h6>
+			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
 		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
 			<template v-if="menu">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 3fee43058..ba26e25db 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -118,16 +118,17 @@ const Stundenplan = {
 			const date = day.getFullYear() + "-" +
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "Stundenplan",
-				params: {
-					mode: this.calendarMode,
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
+			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 			
+			this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+
 			this.currentDay = day;
 		},
 		handleOffset: function(offset)  {
@@ -144,14 +145,14 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: this.calendarMode,
+					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 		},
 		handleChangeMode(mode) {
-			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+			let m = mode[0].toUpperCase() + mode.slice(1)
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
@@ -159,30 +160,29 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: modeCapitalized,
+					mode: m,
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			})
-		
-			this.calendarMode = mode
+			this.calendarMode = m
 		},
 		showModal: function(e, event){
-			e.stopPropagation()
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
 				this.$refs.lvmodal.show();
 			});
 		},
-		updateRange: function ({start,end}) {
-			
+		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
 				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
 			}
 			this.calendarDate = new CalendarDate(end);
 
 			// only load month data if the month or year has changed
-			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))){
+			// or we receive a reload flag from the mounted routine of the components
+			// or this handler is being called from the mounted lifecycle of a component
+			if (mounted || (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end)))){
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
@@ -238,7 +238,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-		this.loadEvents();
+
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +275,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div @click="showModal($event, event); ">
+			<div>
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>

From ecd5e95f2d341b7dc1dcac89bf7f9e0f46914f62 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 11:42:32 +0100
Subject: [PATCH 16/16] access computed grade phrase defensive; avoid pushing
 redundant mode changes; replace current state with new params when a
 different day is selected in the current month -> beforeEnter guard creates
 redundant navigation history entry which is currently being blocked but
 produces the possibility to infinitely "rego forward";

---
 public/js/apps/Dashboard/Fhc.js               | 10 +++++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  8 +++++-
 .../components/Cis/Stundenplan/Stundenplan.js | 27 ++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index e3ba786f1..b4d410344 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -198,6 +198,16 @@ const router = VueRouter.createRouter({
 	]
 })
 
+router.beforeEach((to, from) => {
+	// this avoids redundant routing navigation in place due to router.replace on a route with param function and
+	// beforeEnter navigation guard
+	
+	// TODO: manage the infinite forward navigation issue somehow
+	if (to.fullPath === from.fullPath) {
+		return false
+	}
+})
+
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index d0dd99f68..0543d8fae 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -21,7 +21,9 @@ export default {
 		lvinfo: Boolean,
 		benotung: Boolean,
 		lvnote: String,
+		lvnotebez: Array,
 		znote: String,
+		znotebez: Array,
 		studiengang_kuerzel: String,
 		semester: [String, Number],
 		orgform_kurzbz: String,
@@ -67,7 +69,11 @@ export default {
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
-			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
+			if(this.benotung && this.znotebez?.length) {
+				return this.znotebez[languageIndex]
+			} else if(this.benotung && this.lvnotebez?.length) {
+				return this.lvnotebez[languageIndex]
+			} else return null
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index ba26e25db..b24cb1037 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -11,7 +11,7 @@ const Stundenplan = {
 	data() {
 		return {
 			events: null,
-			calendarMode: DEFAULT_MODE_STUNDENPLAN,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_STUNDENPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -60,6 +60,7 @@ const Stundenplan = {
 			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
 		},
 		'propsViewData.focus_date'(newVal) {
+			// todo: navigate around with date in current mode
 			this.currentDate = new Date(newVal)
 		}
 	},
@@ -119,8 +120,11 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const isMonthMode = capitalizedMode === 'Month'
+			const isInCurrentMonth = day.getMonth() == this.currentDay.getMonth()
 			
-			this.$router.push({
+			if(isMonthMode && isInCurrentMonth) {
+				this.$router.replace({
 					name: "Stundenplan",
 					params: {
 						mode: capitalizedMode,
@@ -128,6 +132,16 @@ const Stundenplan = {
 						lv_id: this.propsViewData?.lv_id || null
 					}
 				})
+			} else {
+				this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+			}
 
 			this.currentDay = day;
 		},
@@ -141,7 +155,7 @@ const Stundenplan = {
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -153,10 +167,11 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
+			if(m === this.calendarMode) return
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -238,7 +253,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-
+		
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +290,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div>
+			<div @click="showModal($event, event)">
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>