always displaying timeslot on calendar event in list view

application/libraries/StundenplanLib.php

@@ -360,7 +360,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

@@ -194,6 +194,9 @@ export default {
 					v-else
 					:is="renderers[event.type]?.calendarEvent"
 					: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/LvPlan/StgOrg.js

@@ -319,6 +319,10 @@ export default {
 				this.loadListGroup();
 			}
 		}
+
+		if (this.formData.stgkz) {
+			this.loadLvPlan();
+		}
 	},
 	template: `
 	<div class="cis-lvplan-stg-org d-flex flex-column h-100">

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

@@ -338,8 +338,8 @@ export default {
 <div class="container-fluid text-break fhc-form"  >
     <edit-profil v-if="showModal" ref="editModal" :isMitarbeiter="true" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
-        <div  class="d-md-none col-12 ">
-            <!-- Bearbeiten Button -->
+		<div class="d-md-none col-12">
+			<!-- Bearbeiten Button -->
             <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" >
@@ -352,9 +352,9 @@ export default {
                     </button>
                 </div>
             </div>
+			<!-- MOBILE PROFIL UPDATES -->
             <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
-                    <!-- MOBILE PROFIL UPDATES -->
                     <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates" ></fetch-profil-updates>
                 </div>
             </div>
@@ -367,30 +367,42 @@ export default {
             <!-- ROW WITH THE PROFIL INFORMATION -->
             <div class="row mb-4">
                 <div  class="col-lg-12 col-xl-6 ">
+					<!-- PROFIL INFORMATION -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- PROFIL INFORMATION -->
                             <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
+					<!-- CALENDAR SYNC OPTIONS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div class="row mb-4 d-md-none">
+            		    <div class="col">
+							<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+            		    </div>
+					</div>
+					<!-- MITARBEITER INFO -->
                     <div class="row mb-4">
                         <div  class=" col-lg-12">
-                            <!-- MITARBEITER INFO -->
                             <role-information :title="$p.t('profil','mitarbeiterInformation')" :data="roleInformation"></role-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                 </div>
                 <div  class="col-xl-6 col-lg-12 ">
+					<!-- EMAILS -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- EMAILS -->
                             <profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
                         </div>
                     </div>
+					<!-- PRIVATE KONTAKTE-->
                     <div class="row mb-4 ">
                         <div class="col">
-                            <!-- PRIVATE KONTAKTE-->
                             <div class="card">
                                 <div class="card-header">
                                     <div class="row">
@@ -412,9 +424,9 @@ export default {
                             </div>
                         </div>
                     </div>
+					<!-- PRIVATE ADRESSEN-->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- PRIVATE ADRESSEN-->
                             <div class="card">
                                 <div class="card-header">
                                     <div class="row">
@@ -439,8 +451,8 @@ export default {
                 </div>
             </div  >
             <div class="row">
+				<!-- FUNKTIONEN TABELLE -->
                 <div class="col-12 mb-4" >
-                    <!-- FUNKTIONEN TABELLE -->
                     <core-filter-cmpt
 						v-if="arePhrasesPreloaded"
                     	@tableBuilt="funktionenTableBuilt"
@@ -451,8 +463,8 @@ export default {
 						:sideMenu="false"
                      />
                 </div>
+				<!-- BETRIEBSMITTEL TABELLE -->
                 <div class="col-12 mb-4" >
-                    <!-- BETRIEBSMITTEL TABELLE -->
                     <core-filter-cmpt
 						v-if="arePhrasesPreloaded"
                     	@tableBuilt="betriebsmittelTableBuilt"
@@ -467,11 +479,6 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
-				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
-				</div>
-			</div>
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
@@ -485,29 +492,36 @@ export default {
                     </button>
                 </div>
             </div>
-            <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
-                <div class="col mb-3">
-                    <!-- PROFIL UPDATES -->
-                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
-                </div>
-            </div>
-            <div class="row mb-3" >
-                <div class="col-12">
-                    <!-- AUSWEIS STATUS -->
-                    <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col">
-                    <!-- MAILVERTEILER -->
-                    <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
-                </div>
-            </div>
-			<div class="row">
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<!-- CALENDAR SYNC OPTIONS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div class="row mb-3 d-none d-md-block">
                 <div class="col">
 					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
                 </div>
 			</div>
+			<!-- PROFIL UPDATES -->
+            <div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
+                <div class="col mb-3">
+                    <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates" :data="data.profilUpdates"></fetch-profil-updates>
+                </div>
+            </div>
+			<!-- AUSWEIS STATUS -->
+            <div class="row mb-3" >
+                <div class="col-12">
+                    <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
+                </div>
+            </div>
+			<!-- MAILVERTEILER -->
+            <div class="row mb-3">
+                <div class="col">
+                    <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
+                </div>
+            </div>
         </div>
     </div>
 </div>

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

@@ -225,15 +225,6 @@ export default {
 <div class="container-fluid text-break fhc-form"  >
     <!-- ROW -->
     <div class="row">
-        <!-- HIDDEN QUICK LINKS -->
-        <!-- TODO: uncomment when implemented
-            <div  class="d-md-none col-12 ">
-
-            <quick-links :title="$p.t('profil','quickLinks')" :mobile="true" ></quick-links>
-
-            </div>
-            -->
-        <!-- END OF HIDDEN QUCK LINKS -->
         <!-- MAIN PANNEL -->
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -242,27 +233,33 @@ export default {
             <div class="row mb-4">
                 <!-- FIRST KAESTCHEN -->
                 <div  class="col-lg-12 col-xl-6 ">
+					<!-- Profil Informationen -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- Profil Informationen -->
                             <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
                 </div>
                 <div  class="col-xl-6 col-lg-12 ">
+					<!-- EMAILS -->
                     <div class="row mb-4">
                         <div class="col">
-                            <!-- EMAILS -->
                             <profil-emails :title="this.$p.t('person','email')" :data="personEmails"></profil-emails>
                         </div>
                     </div>
                     <!-- SECOND ROW OF SECOND COLUMN IN MAIN CONTENT -->
+					<!-- roleInformation -->
                     <div class="row mb-4">
                         <div  class=" col-lg-12">
-                            <!-- roleInformation -->
                             <role-information :data="roleInformation" :title="$p.t('profil','mitarbeiterInformation')"></role-information>
                         </div>
                     </div>
@@ -284,15 +281,15 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!-- VISIBLE UNTIL VIEWPORT MD -->
-			<div v-if="quickLinks.length" class="row mb-4">
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
 				<div class="col">
 					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>
 			</div>
+			<!-- MAILVERTEILER -->
 			<div class="row">
 				<div class="col">
-					<!-- MAILVERTEILER -->
 					<mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
 				</div>
 			</div>

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/Profil/StudentProfil.js

@@ -292,14 +292,13 @@ export default {
 					</button>
 				</div>
 			</div>
+			<!-- MOBILE PROFIL UPDATES -->
 				<div v-if="data.profilUpdates" class="row mb-3">
 					<div class="col">
-						<!-- MOBILE PROFIL UPDATES -->
 						<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
 					</div>
 				</div>
 			</div>
-			<!-- END OF HIDDEN QUCK LINKS -->
 
 			<!-- MAIN PANNEL -->
 			<div class="col-sm-12 col-md-8 col-xxl-9 ">
@@ -308,30 +307,42 @@ export default {
 				<!-- ROW WITH THE PROFIL INFORMATION -->
 				<div class="row mb-4 ">
 					<div  class="col-lg-12 col-xl-6 ">
+						<!-- PROFIL INFORMATION -->
 						<div class="row mb-4">
 							<div class="col">
-								<!-- PROFIL INFORMATION -->
 								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
+						<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+						<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+							<div class="col">
+								<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+							</div>
+						</div>
+						<!-- CALENDAR SYNC OPTIONS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+						<div class="row mb-4 d-md-none">
+            			    <div class="col">
+								<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+            			    </div>
+						</div>
+						<!-- STUDENT INFO -->
 						<div class="row mb-4">
 							<div  class=" col-lg-12">
-								<!-- STUDENT INFO -->
 								<role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
 							</div>
 						</div>
 					<!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
 					</div>
 					<div  class="col-xl-6 col-lg-12 ">
+						<!-- EMAILS -->
 						<div class="row mb-4">
 							<div class="col">
-								<!-- EMAILS -->
 								<profil-emails :title="this.$p.t('person','email')" :data="data.emails" ></profil-emails>
 							</div>
 						</div>
+						<!-- PRIVATE KONTAKTE-->
 						<div class="row mb-4 ">
 							<div class="col">
-								<!-- PRIVATE KONTAKTE-->
 								<div class="card">
 									<div class="card-header">
 										<div class="row">
@@ -354,9 +365,9 @@ export default {
 						</div>
 					</div>
 
+					<!-- PRIVATE ADRESSEN-->
 					<div class="row mb-4">
 						<div class="col">
-							<!-- PRIVATE ADRESSEN-->
 							<div class="card">
 								<div class="card-header">
 									<div class="row">
@@ -408,11 +419,6 @@ export default {
 		</div>
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
-				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
-				</div>
-			</div>
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
@@ -426,9 +432,21 @@ export default {
 					</button>
 				</div>
 			</div>
+			<!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<!-- CALENDAR SYNC OPTIONS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div class="row mb-3 d-none d-md-block">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
+			<!-- PROFIL UPDATES -->
 			<div v-if="data.profilUpdates" class="row d-none d-md-block mb-3">
 				<div class="col mb-3">
-					<!-- PROFIL UPDATES -->
 					<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
 				</div>
 			</div>
@@ -438,18 +456,13 @@ export default {
 				</div>
 			</div>
 			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
+			<!-- MAILVERTEILER -->
             <div class="row mb-3">
 				<div class="col">
-					<!-- HIER SIND DIE MAILVERTEILER -->
 					<mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 				</div>
-            <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
             </div>
-			<div class="row">
-                <div class="col">
-					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
-                </div>
-			</div>
+            <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
         <!-- END OF SIDE PANEL -->
         </div>
     <!-- END OF CONTAINER ROW-->

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

@@ -121,12 +121,12 @@ export default {
                             <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
-                    <!-- SECOND ROW OF FIRST COLUMN -->
-					<div class="row mb-4">
-                        <div class="col">
-                            
-                        </div>
-                    </div>
+					<!-- QUICK LINKS, MOBILE VIEW (HIDDEN IF VIEWPORT >= MD BREAKPOINT) -->
+					<div v-if="quickLinks.length" class="row mb-4 d-md-none">
+						<div class="col">
+							<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+						</div>
+					</div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
@@ -155,7 +155,8 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- START OF THE FIRST ROW IN THE SIDE PANEL -->
-            <div v-if="quickLinks.length" class="row mb-4">
+            <!-- QUICK LINKS, HIDDEN IF VIEWPORT < MD BREAKPOINT -->
+			<div v-if="quickLinks.length" class="row mb-3 d-none d-md-block">
 				<div class="col">
 					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>

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 
 		}
 	},
 	computed: {
@@ -50,21 +55,33 @@ 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
 		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1"
 	>
 		<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>
 		</div>
 		<div class="event-text" v-tooltip="tooltipString">
 			<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"
@@ -77,7 +94,6 @@ export default {
 			>
 				... +{{ event.lektor.length - 3 }}
 			</span>
-			<span class="event-place">{{ event.ort_kurzbz }}</span>
 		</div>
 	</div>
 	`,