Merge branch 'cis40_2026-09_ma_rc' into demo-cis40

application/views/templates/CISVUE-Header.php

@@ -26,6 +26,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
 <script type="text/javascript">
+	document.body.classList.add("cis4");
 	if (window.self !== window.top)
 		document.body.classList.add("in-frame");
 </script>

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; */

public/js/components/Cis/Mylv/LvUebersicht.js

@@ -73,7 +73,7 @@ export default  {
 			// check if the lv has lvplan entries for this studiensemester
 			if (this.studiensemester && this.event) {
 				return this.$fhcApi.factory.studium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
-					.then(data => data.data)
+					.then(data => data.data?.retval)
 					.then(res => {
 						if (Array.isArray(res) && res.length > 0) {
 							this.hasLvPlanEintraege = true;
@@ -114,4 +114,4 @@ export default  {
 
     
     `,
-};
+};

public/js/components/Cis/Renderer/Feiertage/calendarEvent.js

@@ -1,5 +1,6 @@
 
 export default {
+	name: 'Cis-Renderer-Feiertag-CalendarEvent',
 	props: {
 		event: {
 			type: Object,

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,

public/js/components/Cis/Renderer/Feiertage/modalTitle.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Feiertag-ModalTitle',
 	props:{
 		event: {
 			type: Object,

public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Lehreinheit-CalendarEvent',
 	props:{
 		event: {
 			type: Object,

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 {
 					</tr>
 				</tbody>
 		</table>
-		<lv-menu v-if="lvMenu.length && $route.name === 'MyLvPlan'" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
+		<lv-menu v-if="lvMenu.length && showLvMenu" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
 	</div>`,
 }

public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Lehreinheit-ModalTitle',
 	props:{
 		event: {
 			type: Object,

public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Reservierung-CalendarEvent',
 	props: {
 		event: {
 			type: Object,

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,

public/js/components/Cis/Renderer/Reservierungen/modalTitle.js

@@ -1,4 +1,5 @@
 export default {
+	name: 'Cis-Renderer-Reservierung-ModalTitle',
 	props:{
 		event: {
 			type: Object,