From 4a50145329a4949798ff7322632abe50f290a2a2 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Mon, 6 Oct 2025 19:30:58 +0200
Subject: [PATCH] fix calendar header timezone issue

---
 .../ui/src/FullCalendar/FullCalendarDayHeader.vue   |  5 +++--
 .../ui/src/FullCalendar/TimeEntryCalendar.vue       | 13 ++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue b/resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue
index fd2d7a17..e4688733 100644
--- a/resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue
+++ b/resources/js/packages/ui/src/FullCalendar/FullCalendarDayHeader.vue
@@ -2,9 +2,10 @@
 import { computed, inject, type ComputedRef } from 'vue';
 import { formatDate, formatHumanReadableDuration } from '../utils/time';
 import type { Organization } from '@/packages/api/src';
+import type { Dayjs } from 'dayjs';
 
 const props = defineProps<{
-    date: Date;
+    date: Dayjs;
     totalMinutes?: number;
 }>();
 
@@ -20,7 +21,7 @@ const dateFormat = computed(() => organization?.value?.date_format);
 <template>
     <div class="fc-day-header-custom">
         <div class="text-xs text-muted-foreground font-medium">
-            {{ date.toLocaleDateString('en-US', { weekday: 'short' }) }}
+            {{ date.format('ddd') }}
         </div>
         <span>{{ formatDate(date.toISOString(), dateFormat) }}</span>
         <span class="block text-xs text-muted-foreground font-medium mt-1">
diff --git a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
index fc4c04bb..422b6490 100644
--- a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
+++ b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
@@ -250,7 +250,7 @@ const calendarOptions = computed(() => ({
     editable: true,
     eventResizableFromStart: true,
     eventDurationEditable: true,
-    timeZone: 'America/Adak',
+    timeZone: getUserTimezone(),
     eventStartEditable: true,
     select: handleDateSelect,
     eventClick: handleEventClick,
@@ -332,9 +332,16 @@ watch(showEditTimeEntryModal, (value) => {
             </template>
             <template #dayHeaderContent="arg">
                 <FullCalendarDayHeader
-                    :date="arg.date"
+                    :date="
+                        getDayJsInstance()(arg.date.toISOString()).utc().tz(getUserTimezone(), true)
+                    "
                     :total-minutes="
-                        dailyTotals[getDayJsInstance()(arg.date).format('YYYY-MM-DD')] || 0
+                        dailyTotals[
+                            getDayJsInstance()(arg.date)
+                                .utc()
+                                .tz(getUserTimezone(), true)
+                                .format('YYYY-MM-DD')
+                        ] || 0
                     " />
             </template>
         </FullCalendar>