From c833b40527fc4f7d62ccf4693e77baa6d395a56d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 15:11:05 +0100
Subject: [PATCH] merge fix

---
 public/js/apps/Dashboard/Fhc.js                     | 1 +
 public/js/components/Calendar/Month/Page.js         | 6 +-----
 public/js/components/Cis/Stundenplan/Stundenplan.js | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index d49195399..9df11e491 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -203,6 +203,7 @@ router.beforeEach((to, from) => {
 	// beforeEnter navigation guard
 	
 	// TODO: manage the infinite forward navigation issue somehow
+	// https://stackoverflow.com/questions/28028297/how-can-i-delete-a-window-history-state?rq=3
 	if (to.fullPath === from.fullPath) {
 		return false
 	}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 27c649f1b..6d6b27d21 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,10 +63,6 @@ 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)
@@ -158,7 +154,7 @@ export default {
 				<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 @click="handleEventClick($event, day)">
+					v-contrast @click.stop="selectDay(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/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index c27a3bc30..e11845e8b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -399,15 +399,15 @@ const Stundenplan = {
 						</div>
 						<div class="col">
 							<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-							<p class="m-0">{{event?.orig.topic}}</p>
+							<p class="m-0">{{event?.topic}}</p>
 						</div>
 						<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>
+							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 						</div>
 						<div class="col">
 							<p>{{ $p.t('profil/Ort') }}: </p>
-							<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+							<p class="m-0">{{event?.ort_kurzbz}}</p>
 						</div>
 					</div>
 				</template>