From 7010fa49e517e997351a0dfa2fd33f0c4995bf52 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 9 Jul 2023 22:03:07 +0200
Subject: [PATCH] Fix displaying of time in calendar events
---
.../event_bar/LessonEventBar.vue | 63 +++++++++++--------
1 file changed, 38 insertions(+), 25 deletions(-)
diff --git a/aleksis/apps/chronos/frontend/components/calendar_feeds/event_bar/LessonEventBar.vue b/aleksis/apps/chronos/frontend/components/calendar_feeds/event_bar/LessonEventBar.vue
index aeaaafbe..27c1170d 100644
--- a/aleksis/apps/chronos/frontend/components/calendar_feeds/event_bar/LessonEventBar.vue
+++ b/aleksis/apps/chronos/frontend/components/calendar_feeds/event_bar/LessonEventBar.vue
@@ -1,8 +1,14 @@
<template>
- <base-calendar-feed-event-bar :with-padding="false" v-bind="$props">
+ <base-calendar-feed-event-bar
+ :with-padding="false"
+ :without-time="true"
+ v-bind="$props"
+ >
<template #icon> </template>
+
<template #title>
<div
+ class="d-flex justify-start"
:class="{
'px-1': true,
'orange-border':
@@ -14,32 +20,39 @@
height: '100%',
borderRadius: '4px',
}"
- class="d-flex justify-center align-center flex-wrap"
>
- <lesson-event-link-iterator
- v-if="!selectedEvent.meta.is_member"
- :items="selectedEvent.meta.groups"
- attr="short_name"
- class="mr-1"
- />
- <lesson-event-old-new
- v-if="!selectedEvent.meta.is_teacher || newTeachers.length > 0"
- :new-items="newTeachers"
- :old-items="oldTeachers"
- attr="short_name"
- class="mr-1"
- />
+ <span
+ v-if="calendarType === 'month' && eventParsed.start.hasTime"
+ class="mr-1 font-weight-bold ml-1"
+ >
+ {{ eventParsed.start.time }}
+ </span>
+ <div class="d-flex justify-center align-center flex-wrap flex-grow-1">
+ <lesson-event-link-iterator
+ v-if="!selectedEvent.meta.is_member"
+ :items="selectedEvent.meta.groups"
+ attr="short_name"
+ class="mr-1"
+ />
+ <lesson-event-old-new
+ v-if="!selectedEvent.meta.is_teacher || newTeachers.length > 0"
+ :new-items="newTeachers"
+ :old-items="oldTeachers"
+ attr="short_name"
+ class="mr-1"
+ />
- <lesson-event-subject
- :event="selectedEvent"
- attr="short_name"
- class="font-weight-medium mr-1"
- />
- <lesson-event-old-new
- :new-items="newRooms"
- :old-items="oldRooms"
- attr="short_name"
- />
+ <lesson-event-subject
+ :event="selectedEvent"
+ attr="short_name"
+ class="font-weight-medium mr-1"
+ />
+ <lesson-event-old-new
+ :new-items="newRooms"
+ :old-items="oldRooms"
+ attr="short_name"
+ />
+ </div>
</div>
</template>
</base-calendar-feed-event-bar>
--
GitLab