diff --git a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue index c9a6e72b..e952ee63 100644 --- a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue +++ b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue @@ -196,11 +196,13 @@ async function handleEventDrop(arg: EventDropArg) { start: getDayJsInstance()(arg.event.start.toISOString()) .utc() .tz(getUserTimezone(), true) + .second(0) .utc() .format(), end: getDayJsInstance()(arg.event.end.toISOString()) .utc() .tz(getUserTimezone(), true) + .second(0) .utc() .format(), } as TimeEntry; @@ -217,11 +219,13 @@ async function handleEventResize(arg: EventChangeArg) { start: getDayJsInstance()(arg.event.start.toISOString()) .utc() .tz(getUserTimezone(), true) + .second(0) .utc() .format(), end: getDayJsInstance()(arg.event.end.toISOString()) .utc() .tz(getUserTimezone(), true) + .second(0) .utc() .format(), } as TimeEntry; @@ -243,7 +247,7 @@ const calendarOptions = computed(() => ({ slotDuration: '00:15:00', slotLabelInterval: '01:00:00', slotLabelFormat: getSlotLabelFormat(), - snapDuration: '00:15:00', + snapDuration: '00:01:00', firstDay: getFirstDay(), allDaySlot: false, nowIndicator: true, diff --git a/resources/js/packages/ui/src/Input/TimePickerSimple.vue b/resources/js/packages/ui/src/Input/TimePickerSimple.vue index 4e389589..9eb2a6a0 100644 --- a/resources/js/packages/ui/src/Input/TimePickerSimple.vue +++ b/resources/js/packages/ui/src/Input/TimePickerSimple.vue @@ -30,6 +30,7 @@ function updateTime(event: Event) { model.value = getLocalizedDayJs(model.value) .set('hours', Math.min(parseInt(hours), 23)) .set('minutes', Math.min(parseInt(minutes), 59)) + .set('seconds', 0) .format(); emit('changed', model.value); } @@ -42,6 +43,7 @@ function updateTime(event: Event) { model.value = getLocalizedDayJs(model.value) .set('hours', Math.min(parseInt(hours), 23)) .set('minutes', Math.min(parseInt(minutes), 59)) + .set('seconds', 0) .format(); emit('changed', model.value); } else if (newValue.length === 3) { @@ -50,6 +52,7 @@ function updateTime(event: Event) { model.value = getLocalizedDayJs(model.value) .set('hours', Math.min(parseInt(hours), 23)) .set('minutes', Math.min(parseInt(minutes), 59)) + .set('seconds', 0) .format(); emit('changed', model.value); } else if (newValue.length === 2) { @@ -57,6 +60,7 @@ function updateTime(event: Event) { model.value = getLocalizedDayJs(model.value) .set('hours', Math.min(parseInt(newValue), 23)) .set('minutes', 0) + .set('seconds', 0) .format(); emit('changed', model.value); } else if (newValue.length === 1) { @@ -64,6 +68,7 @@ function updateTime(event: Event) { model.value = getLocalizedDayJs(model.value) .set('hours', Math.min(parseInt(newValue), 23)) .set('minutes', 0) + .set('seconds', 0) .format(); emit('changed', model.value); }