From 9346a6b543998122b124c75b7bd672ecb6ff3d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 7 Jun 2023 15:34:17 +0200
Subject: [PATCH] Refine date time range

---
 webapp/components/DateRange/DateRange.vue | 32 ++++++++---------------
 1 file changed, 11 insertions(+), 21 deletions(-)

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