+
+
Lehrveranstaltung:
{{event?.orig.topic}}
@@ -140,6 +145,17 @@ const app = Vue.createApp({
+
+ {{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+
+
+
+ Lehrveranstaltungs Menu
+
+
+
+ Keine Lehrveranstaltungen
+
`
});
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index ca0f95b58..1a398470d 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -66,6 +66,12 @@ export default {
}
},
watch:{
+ selectedEvent:{
+ handler(newSelectedEvent) {
+ this.$emit('selectedEvent', newSelectedEvent);
+ },
+ immediate: true,
+ },
// scroll to the first event if the html element was found
scrollTime({focusDate,scrollTime}){
// return early if the scrollTime is not set
@@ -89,7 +95,8 @@ export default {
'select:day',
'select:event',
'change:range',
- 'update:minimized'
+ 'update:minimized',
+ 'selectedEvent'
],
data() {
return {
@@ -223,8 +230,14 @@ export default {
-
-
+
+
+
+
+
+
+
+
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index 3fdcfdb4e..af6a3d44d 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -43,8 +43,14 @@ export default {
-
-
+
+
+
+
+
+
+
+
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 6477c41ad..de5ab2b5a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -1,6 +1,4 @@
import CalendarDate from '../../../composables/CalendarDate.js';
-import LvMenu from "../../../components/Cis/Mylv/LvMenu.js"
-import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
import LvModal from "../../../components/Cis/Mylv/LvModal.js";
function ggt(m, n) { return n == 0 ? m : ggt(n, m % n); }
@@ -8,8 +6,6 @@ function kgv(m, n) { return (m * n) / ggt(m, n); }
export default {
components:{
- LvMenu,
- LvInfo,
LvModal,
},
data() {
@@ -211,13 +207,6 @@ export default {
'--test': this.dateToMinutesOfDay(event.end),
}
},
- showModal: function (evt) {
- let event = evt.orig;
- this.setSelectedEvent(event);
- Vue.nextTick(() => {
- this.$refs.lvmodal.show();
- });
- },
eventClick(evt) {
let event = evt.orig;
this.setSelectedEvent(event);
@@ -282,8 +271,6 @@ export default {
},
template: /*html*/`
-
-
@@ -307,16 +294,16 @@ export default {
-
+
-
- this is a placeholder which means that no template was passed to the Calendar Page slot
+
+ this is a slot placeholder
-
-
-
- this is a placeholder which means that no template was passed to the Calendar Page slot
+
+
+
+ this is a slot placeholder
@@ -328,18 +315,17 @@ export default {
-
+
- {{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-
-
-
- Lehrveranstaltungs Menu
-
+
+ this is a slot placeholder
+
- Keine Lehrveranstaltungen
+
+ This is an slot placeholder
+
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 718231968..e873dd5f8 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -17,6 +17,10 @@ export default {
type:String,
default:"title"
},
+ showMenu:{
+ type:Boolean,
+ default:true,
+ },
/*
* NOTE(chris):
* Hack to expose in "emits" declared events to $props which we use
@@ -39,6 +43,9 @@ export default {
methods:{
onModalShow: function()
{
+ // do not load the menu if the menu is not getting rendered
+ if(!this.showMenu) return;
+
if (this.event.type == 'lehreinheit') {
this.$fhcApi.factory.stundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]).then(
res=>res.data
@@ -69,8 +76,10 @@ export default {
{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
- Lehrveranstaltungs Menu
-
+
+ Lehrveranstaltungs Menu
+
+
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 7a199c6cf..299743926 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,6 +1,7 @@
import FhcCalendar from "../../Calendar/Calendar.js";
import CalendarDate from "../../../composables/CalendarDate.js";
-
+import LvModal from "../../../components/Cis/Mylv/LvModal.js";
+import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
export default{
props:{
@@ -10,7 +11,9 @@ export default{
}
},
components: {
- FhcCalendar
+ FhcCalendar,
+ LvModal,
+ LvInfo,
},
data() {
return {
@@ -40,6 +43,9 @@ export default{
},
},
methods:{
+ setSelectedEvent: function(event){
+ this.currentlySelectedEvent = event;
+ },
getLvID: function () {
this.lv_id = window.location.pathname
},
@@ -51,6 +57,7 @@ export default{
Vue.nextTick(() => {
this.$refs.lvmodal.show();
});
+
},
updateRange: function ({ start, end }) {
@@ -112,7 +119,8 @@ export default{
this.loadEvents();
},
template: /*html*/`
-
+
+
{{event.topic}}
@@ -125,8 +133,8 @@ export default{
{{event?.orig.ort_kurzbz}}
-
-
+
+
Lehrveranstaltung:
{{event?.orig.topic}}
@@ -141,6 +149,15 @@ export default{
+
+ {{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+
+
+
+
+
+ Keine Raum Reservierung
+
`,
};
\ No newline at end of file