diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 743d58b54..90ee788c3 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -64,22 +64,41 @@ {{ post.eventVenue }} - - + — {{ post.eventLocationName }} - - + — {{ $t('post.viewEvent.eventIsOnline') }} - - {{ getEventDateString }} + + + + {{ getEventStartDateString }} + + + + {{ getEventStartTimeString }} + + + — + + + + {{ getEventEndDateString }} + + + + {{ getEventEndTimeString }} + + - + @@ -288,26 +307,17 @@ export default { !this.post.group || (this.group && ['usual', 'admin', 'owner'].includes(this.group.myRole)) ) }, - getEventDateString() { - if (this.post.eventEnd) { - const eventStart = format(new Date(this.post.eventStart), 'dd.MM.') - const eventEnd = format(new Date(this.post.eventEnd), 'dd.MM.yyyy') - return `${eventStart} - ${eventEnd}` - } else { - return format(new Date(this.post.eventStart), 'dd.MM.yyyy') - } + getEventStartDateString() { + return format(new Date(this.post.eventStart), 'dd.MM.yyyy') }, - getEventTimeString() { - if (this.post.eventEnd) { - const eventStartTime = format(new Date(this.post.eventStart), 'HH:mm') - const eventEndTime = format(new Date(this.post.eventEnd), 'HH:mm') - /* assumption that if e.g. 00:00 == 00:00 is saved, - it's not realistic because they are the default values, so don't show the time info. - */ - return eventStartTime !== eventEndTime ? `${eventStartTime} - ${eventEndTime}` : '' - } else { - return format(new Date(this.post.eventStart), 'HH:mm') - } + getEventStartTimeString() { + return format(new Date(this.post.eventStart), 'HH:mm') + }, + getEventEndDateString() { + return this.post.eventEnd ? format(new Date(this.post.eventEnd), 'dd.MM.yyyy') : '' + }, + getEventEndTimeString() { + return this.post.eventEnd ? format(new Date(this.post.eventEnd), 'HH:mm') : '' }, }, methods: {