Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc

application/libraries/StundenplanLib.php

@@ -361,7 +361,10 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object = getData($ort_content_object)[0];
+				$ort_content_object_data = getData($ort_content_object);
+				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
+					? $ort_content_object_data[0]
+					: null;
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}

public/js/components/Calendar/LvPlan.js

@@ -230,6 +230,9 @@ export default {
 					:is="renderers[event.type]?.calendarEvent"
 					:event="event"
 					@delete-event="(event) => $emit('delete-event', event)"
+					:timeSlotDisplayBehavior="
+						$props.mode.toLowerCase() === 'list' ? 'always' : 'default'
+					"
 				></component>
 			</div>
 		</template>

public/js/components/Calendar/Widget.js

@@ -97,6 +97,7 @@ export default {
 				<component
 					:is="renderers[event.type]?.calendarEvent"
 					:event="event"
+					:timeSlotDisplayBehavior="'always'"
 				></component>
 			</div>
 		</template>

public/js/components/Cis/Profil/MitarbeiterProfil.js

@@ -340,7 +340,7 @@ export default {
     <div class="row">
 		<div class="d-md-none col-12">
 			<!-- Bearbeiten Button -->
-            <div v-if="isEditable" class="row mb-4">
+            <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
                     <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">

public/js/components/Cis/Profil/Profil.js

@@ -176,6 +176,7 @@ export const Profil = {
 			this.data = data.profil_data.data;
 			this.calendarSyncUrls = data.calendar_sync_urls ?? [];
 			this.authPermissions = data.permissions;
+			console.log(data.profil_data);
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {

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

@@ -3,6 +3,11 @@ export default {
 		event: {
 			type: Object,
 			required: true
+		},
+		timeSlotDisplayBehavior: {
+			type: String,
+			default: "default",
+			// options: default, always, never 
 		}
 	},
 	computed:{
@@ -50,7 +55,17 @@ export default {
 			return luxon.Duration
 				.fromISOTime(this.event.ende)
 				.toISOTime({ suppressSeconds: true });
-		}
+		},
+		timeSlotDisplayClasses() {
+			switch (this.$props.timeSlotDisplayBehavior) {
+				case "always":
+					return "d-grid";
+				case "never":
+					return "d-none";
+				default:
+					return "d-none d-xl-grid";
+			}
+		},
 	},
 	template: /*html*/`
 	<div
@@ -58,8 +73,9 @@ export default {
 		@wheel.stop
 	>
 		<div
-			v-if="!event.allDayEvent && event?.beginn && event?.ende"
-			class="event-time d-none d-xl-grid h-100"
+			v-if="!event?.allDayEvent && event?.beginn && event?.ende"
+			:class="timeSlotDisplayClasses"
+			class="event-time h-100"
 		>
 			<span>{{ start }}</span>
 			<span>{{ end }}</span>

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

@@ -3,6 +3,11 @@ export default {
 		event: {
 			type: Object,
 			required: true
+		},
+		timeSlotDisplayBehavior: {
+			type: String,
+			default: "default",
+			// options: default, always, never 
 		}
 	},
 	inject: {
@@ -63,14 +68,25 @@ export default {
 	methods: {
 		handleDelete() {
 			this.$emit('delete-event', this.event);
-		}
+		},
+		timeSlotDisplayClasses() {
+			switch (this.$props.timeSlotDisplayBehavior) {
+				case "always":
+					return "d-grid";
+				case "never":
+					return "d-none";
+				default:
+					return "d-none d-xl-grid";
+			}
+		},
 	},
 	template: /* html */`
 	<div
 		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1 position-relative">
 		<div
-			v-if="!event.allDayEvent && event?.beginn && event?.ende"
-			class="event-time d-grid h-100"
+			v-if="!event?.allDayEvent && event?.beginn && event?.ende"
+			:class="timeSlotDisplayClasses"
+			class="event-time h-100"
 		>
 			<span>{{ start }}</span>
 			<span>{{ end }}</span>
@@ -86,6 +102,7 @@ export default {
 			</button>
 		
 			<span class="event-topic">{{ event.topic }}</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
 			<span
 				v-for="lektor in event.lektor.slice(0, 3)"
 				class="event-lectors"
@@ -98,7 +115,6 @@ export default {
 			>
 				... +{{ event.lektor.length - 3 }}
 			</span>
-			<span class="event-place">{{ event.ort_kurzbz }}</span>
 		</div>
 	</div>
 	`,