diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php index 00d0595cf..1d5b79dce 100644 --- a/application/views/templates/CISVUE-Header.php +++ b/application/views/templates/CISVUE-Header.php @@ -26,6 +26,7 @@ $this->load->view('templates/FHC-Header', $includesArray); ?> diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index b1424e4d3..2e6dc1141 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -454,8 +454,8 @@ html { /* desktop */ @media (min-width: 992px) { - body { - display: flex; + body.cis4 { + display: flex; padding-top: var(--fhc-cis-header-height); width: calc(100svw - var(--scrollbar-width, 0px)); /* overflow: visible !important; */ diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js index 79e3c8568..d08b6f348 100644 --- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js @@ -1,5 +1,6 @@ export default { + name: 'Cis-Renderer-Feiertag-CalendarEvent', props: { event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Feiertage/modalContent.js b/public/js/components/Cis/Renderer/Feiertage/modalContent.js index aa0db470c..fa7af46bb 100644 --- a/public/js/components/Cis/Renderer/Feiertage/modalContent.js +++ b/public/js/components/Cis/Renderer/Feiertage/modalContent.js @@ -1,6 +1,7 @@ import { formatDate } from "../../../../helpers/DateHelpers.js" export default { + name: 'Cis-Renderer-Feiertag-ModalContent', props:{ event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Feiertage/modalTitle.js b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js index 59feee375..674bb5be9 100644 --- a/public/js/components/Cis/Renderer/Feiertage/modalTitle.js +++ b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js @@ -1,4 +1,5 @@ export default { + name: 'Cis-Renderer-Feiertag-ModalTitle', props:{ event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js index 652b29645..314e15a5a 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js @@ -1,4 +1,5 @@ export default { + name: 'Cis-Renderer-Lehreinheit-CalendarEvent', props:{ event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js index eb8908648..c073cdab5 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js @@ -5,6 +5,7 @@ import ApiLvPlan from '../../../../api/factory/lvPlan.js'; import ApiAddons from '../../../../api/factory/addons.js'; export default { + name: 'Cis-Renderer-Lehreinheit-ModalContent', components:{ LvMenu, }, @@ -49,6 +50,16 @@ export default { return this.event.ende; } return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes()); + }, + showLvMenu: function() { + const hideOnRoutes = [ + 'OtherLvPlan', + 'StgOrgLvPlan' + ]; + if(hideOnRoutes.includes(this.$route.name)) { + return false; + } + return true; } }, watch: { @@ -162,6 +173,6 @@ export default { - + `, } \ No newline at end of file diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js b/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js index 4acb90248..cd2553f30 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js @@ -1,4 +1,5 @@ export default { + name: 'Cis-Renderer-Lehreinheit-ModalTitle', props:{ event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js index 2a0f4db95..51dc6630a 100644 --- a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js @@ -1,4 +1,5 @@ export default { + name: 'Cis-Renderer-Reservierung-CalendarEvent', props: { event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js index 66d5436f8..10d7bcd9e 100644 --- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js +++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js @@ -2,6 +2,7 @@ import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js" import LvMenu from "../../Mylv/LvMenu.js"; export default { + name: 'Cis-Renderer-Reservierung-ModalContent', props:{ event: { type: Object, diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js index c5f195ddb..1fed5d3f0 100644 --- a/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js +++ b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js @@ -1,4 +1,5 @@ export default { + name: 'Cis-Renderer-Reservierung-ModalTitle', props:{ event: { type: Object,