From da220b6fcb29a70ce3b1904c86e086a3e4f1bfd2 Mon Sep 17 00:00:00 2001 From: iamsivin Date: Fri, 6 Feb 2026 18:03:23 +0530 Subject: [PATCH] fix: improve date range formatting in date picker button --- .../ui/DatePicker/components/DatePickerButton.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue b/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue index ba0f46e37..5885fb47b 100644 --- a/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue +++ b/app/javascript/dashboard/components/ui/DatePicker/components/DatePickerButton.vue @@ -36,15 +36,15 @@ const formatDateRange = computed(() => { return 'Select a date range'; } - const now = new Date(); - const bothCurrentYear = - isSameYear(startDate, now) && isSameYear(endDate, now); + const crossesYears = !isSameYear(startDate, endDate); - if (bothCurrentYear) { - return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d')}`; + // Always show years when crossing year boundaries + if (crossesYears) { + return `${format(startDate, 'MMM d, yyyy')} - ${format(endDate, 'MMM d, yyyy')}`; } - return `${format(startDate, 'MMM d yyyy')} - ${format(endDate, 'MMM d yyyy')}`; + // For same year, always show the year for clarity + return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d, yyyy')}`; }); const activeDateRange = computed(