diff --git a/application/core/Events.php b/application/core/Events.php index a7d4754cc..9ad474fc5 100644 --- a/application/core/Events.php +++ b/application/core/Events.php @@ -6,9 +6,19 @@ use CI3_Events as Events; Events::on('loadRenderers', function ($renderers) { $fhc_core_renderers =& $renderers(); $fhc_core_renderers["lehreinheit"] = array( - 'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js', - 'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js', - 'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js', + 'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js', + 'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js', + 'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js', + 'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css' + ); +}); + +Events::on('loadRenderers', function ($renderers) { + $fhc_core_renderers =& $renderers(); + $fhc_core_renderers["reservierung"] = array( + 'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js', + 'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js', + 'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js', 'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css' ); }); diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css index 79ca36d00..17dc817ef 100644 --- a/public/css/Cis4/CoreCalendarEvents.css +++ b/public/css/Cis4/CoreCalendarEvents.css @@ -1,30 +1,29 @@ /* Moodle Events in Month Page */ .monthPageContainer .lehreinheitEventContent{ - display: grid; - grid-template-columns: auto 1fr; - grid-template-rows: 1fr; - border-bottom: 1px solid var(--bs-border-color); - + display: flex; + border-bottom: 1px solid var(--bs-border-color); } .monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader { - display:grid; - padding: .25rem .5rem .25rem .25rem; - margin-right: .25rem; - align-content: center; + display:none; } .monthPageContainer .lehreinheitEventContent #lehreinheitEventText { - display: flex; - flex-wrap: wrap; - column-gap: 5px; + width: 100%; font-size: .875em; - align-items:center; - justify-content: space-evenly; + overflow:hidden; + white-space: nowrap; + text-overflow: ellipsis; + display:flex; + place-content: center space-evenly; } +.monthPageContainer .lehreinheitEventContent #lehreinheitEventText #lehreinheitLektoren{ + display:none; +} + /* Moodle Events in Week Page */ .weekPageContainer .lehreinheitEventContent { display: grid; @@ -44,10 +43,10 @@ .weekPageContainer .lehreinheitEventContent #lehreinheitEventText { display: flex; + flex-direction: column; + place-content: center space-evenly; flex-wrap: wrap; column-gap: 5px; - align-items: center; - justify-content: space-evenly; } diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js index f04d25efc..075a399d8 100644 --- a/public/js/apps/Dashboard/Fhc.js +++ b/public/js/apps/Dashboard/Fhc.js @@ -305,11 +305,13 @@ const app = Vue.createApp({ if (data[rendertype].calendarEventStyles){ var head = document.head; - var link = document.createElement("link"); - link.type = "text/css"; - link.rel = "stylesheet"; - link.href = data[rendertype].calendarEventStyles; - head.appendChild(link); + if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){ + var link = document.createElement("link"); + link.type = "text/css"; + link.rel = "stylesheet"; + link.href = data[rendertype].calendarEventStyles; + head.appendChild(link); + } } if(this.renderers === null) { diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js index 180122e6a..4247ffcd5 100644 --- a/public/js/components/Calendar/Day/Page.js +++ b/public/js/components/Calendar/Day/Page.js @@ -441,10 +441,10 @@ export default {
this is a slot placeholder
this is a placeholder which means that no template was passed to the Calendar Page slot
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js index 64f67d8cb..a0b93062a 100644 --- a/public/js/components/Cis/LvPlan/LvPlan.js +++ b/public/js/components/Cis/LvPlan/LvPlan.js @@ -2,7 +2,7 @@ import FhcCalendar from "../../Calendar/Calendar.js"; 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 lehreinheitEvent from "../Renderer/Lehreinheit/calendarEvent.js" import ApiLvPlan from '../../../api/factory/lvPlan.js'; import ApiAuthinfo from '../../../api/factory/authinfo.js'; @@ -352,14 +352,14 @@ const LvPlan = {