mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-08 08:12:17 +01:00
fix calendar header timezone issue
This commit is contained in:
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user