diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css index cf88e328c..79ca36d00 100644 --- a/public/css/Cis4/CoreCalendarEvents.css +++ b/public/css/Cis4/CoreCalendarEvents.css @@ -63,7 +63,6 @@ .dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader { display:grid; align-content: center; - border-right: 1px solid var(--bs-border-color); } .dayPageContainer .lehreinheitEventContent #lehreinheitEventText { diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css index 603f2046a..bf091eef5 100644 --- a/public/css/components/searchbar/searchbar.css +++ b/public/css/components/searchbar/searchbar.css @@ -6,7 +6,7 @@ @import url(./switches.css); :root{ - --searchbar-shadow: var(--fhc-shadow-40, #ced4da); + --fhc-searchbar-shadow: var(--fhc-shadow-40, #ced4da); } .searchbar_settings { @@ -25,7 +25,7 @@ width: 100%; left: 0; right: 0; - box-shadow: 2px 2px 4px var(--searchbar-shadow); + box-shadow: 2px 2px 4px var(--fhc-searchbar-shadow); } .searchbar_results a{ diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js index 637e08cce..f04d25efc 100644 --- a/public/js/apps/Dashboard/Fhc.js +++ b/public/js/apps/Dashboard/Fhc.js @@ -304,7 +304,6 @@ const app = Vue.createApp({ calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent))); if (data[rendertype].calendarEventStyles){ - console.log(data[rendertype].calendarEventStyles) var head = document.head; var link = document.createElement("link"); link.type = "text/css"; diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js index 91af3e48a..180122e6a 100644 --- a/public/js/components/Calendar/Day/Page.js +++ b/public/js/components/Calendar/Day/Page.js @@ -467,8 +467,7 @@ export default {
-
-
+
-
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js index 49fa88a60..64f67d8cb 100644 --- a/public/js/components/Cis/LvPlan/LvPlan.js +++ b/public/js/components/Cis/LvPlan/LvPlan.js @@ -3,7 +3,6 @@ import CalendarDate from "../../../composables/CalendarDate.js"; import LvModal from "../Mylv/LvModal.js"; import LvMenu from "../Mylv/LvMenu.js" import lehreinheitEvent from "./EventTypes/calendarEvent.js" -import LvInfo from '../Mylv/LvInfo.js'; import ApiLvPlan from '../../../api/factory/lvPlan.js'; import ApiAuthinfo from '../../../api/factory/authinfo.js'; @@ -51,6 +50,17 @@ const LvPlan = { }, inject:["renderers"], watch: { + /* events:{ + handler: function(newValue){ + if(newValue == null) + setTimeout(()=>{ + if(this.events == null){ + this.loadEvents(); + } + },500); + }, + immediate: true, + }, */ modalLoaded:{ handler: function (newValue) { if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) { @@ -84,7 +94,7 @@ const LvPlan = { } }, components: { - FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo + FhcCalendar, LvModal, LvMenu, lehreinheitEvent }, computed:{ modalLoaded: function(){ @@ -134,13 +144,13 @@ const LvPlan = { }, // component renderers fetches from different addons modalTitleComponent(type){ - return this.renderers[type].modalTitle; + return this.renderers[type]?.modalTitle; }, modalContentComponent(type) { - return this.renderers[type].modalContent; + return this.renderers[type]?.modalContent; }, calendarEventComponent(type){ - return this.renderers[type].calendarEvent; + return this.renderers[type]?.calendarEvent; }, @@ -354,14 +364,7 @@ const LvPlan = {