ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine date time range

Browse Source
This commit is contained in:
Wolfgang Huß 2023-06-07 15:34:17 +02:00
parent a7fc5536c5
commit 9346a6b543
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webapp/components/DateRange/DateRange.vue
View File

@ -8,14 +8,11 @@
<div> <div>
<base-icon name="clock" data-test="calendar" /> <base-icon name="clock" data-test="calendar" />
{{ {{
getStartTimeString + getStartTimeString + (this.endDateAsDate && isSameDay ? '&mdash;' + getEndTimeString : '')
(this.endDateAsDate && isSameDateButMayHaveTimeDifference
? '&mdash;' + getEndTimeString
: '')
}} }}
</div> </div>
</div> </div>
<template v-if="!isSameDateButMayHaveTimeDifference"> <template v-if="!isSameDay">
&nbsp;&mdash;&nbsp; &nbsp;&mdash;&nbsp;
<div> <div>
<div> <div>
@ -32,7 +29,7 @@
</template> </template>
<script> <script>
import { format, isSameDay } from 'date-fns' import { format, isSameDay, isSameYear } from 'date-fns'
export default { export default {
name: 'DateRange', name: 'DateRange',
@ -64,24 +61,17 @@ export default {
endDateAsDate() { endDateAsDate() {
return this.endDate ? new Date(this.endDate) : null return this.endDate ? new Date(this.endDate) : null
}, },
isSameDateButMayHaveTimeDifference() { isSameDay() {
return !this.endDateAsDate || isSameDay(this.endDateAsDate, this.startDateAsDate) return !this.endDateAsDate || isSameDay(this.endDateAsDate, this.startDateAsDate)
}, },
isSameYear() {
return !this.endDateAsDate || isSameYear(this.endDateAsDate, this.startDateAsDate)
},
getStartDateString() { getStartDateString() {
const isSameYear = let startDateFormat = 'dd.MM.yyyy'
this.isSameDateButMayHaveTimeDifference || if (!this.isSameDay && this.isSameYear) {
!this.endDateAsDate || startDateFormat = 'dd.MM.'
this.endDateAsDate.getYear() === this.startDateAsDate.getYear() }
const isSameMonth =
isSameYear &&
(!this.endDateAsDate || this.endDateAsDate.getMonth() === this.startDateAsDate.getMonth())
const startDateFormat = this.isSameDateButMayHaveTimeDifference
? 'dd.MM.yyyy'
: isSameMonth
? 'dd.'
: isSameYear
? 'dd.MM.'
: 'dd.MM.yyyy'
return format(this.startDateAsDate, startDateFormat) return format(this.startDateAsDate, startDateFormat)
}, },
getStartTimeString() { getStartTimeString() {