Skip to content

Fix scheduling for negative timezones #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gregorydlogan merged 1 commit into from
Jan 16, 2025
Merged

Fix scheduling for negative timezones #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/events/partials/wizards/NewEventSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const NewEventSummary = <T extends RequiredFormProps>({
</td>
<td>
{t("dateFormats.date.short", {
date: formik.values.scheduleStartDate,
date: renderValidDate(formik.values.scheduleStartDate),
})}
</td>
</tr>
Expand All @@ -210,7 +210,7 @@ const NewEventSummary = <T extends RequiredFormProps>({
</td>
<td>
{t("dateFormats.date.short", {
date: formik.values.scheduleEndDate,
date: renderValidDate(formik.values.scheduleEndDate),
})}
</td>
</tr>
Expand Down
25 changes: 10 additions & 15 deletions src/utils/dateUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ import { FormikErrors } from "formik";
* This File contains methods concerning dates
*/

// Get the ISO date string based on local time
const getISODateString = (date: Date) => {
return moment(date).format('YYYY-MM-DD');
}

// check if date can be parsed
export const renderValidDate = (date: string) => {
return !isNaN(Date.parse(date)) ? new Date(date) : ""
Expand Down Expand Up @@ -126,8 +121,8 @@ const changeStart = (
}

setDuration(startDate, endDate, setFieldValue);
setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleStartDate", getISODateString(startDate));
setFieldValue("scheduleEndDate", endDate.toISOString());
setFieldValue("scheduleStartDate", startDate.toISOString());

if (!!checkConflicts && !!formikValues.captureAgent) {
checkConflicts(
Expand Down Expand Up @@ -230,7 +225,7 @@ const changeEnd = (
}

setDuration(startDate, endDate, setFieldValue);
setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleEndDate", endDate.toISOString());

if (!!checkConflicts && !!formikValues.captureAgent) {
checkConflicts(
Expand Down Expand Up @@ -304,7 +299,7 @@ const changeDuration = (

setFieldValue("scheduleEndHour", makeTwoDigits(endDate.getHours()));
setFieldValue("scheduleEndMinute", makeTwoDigits(endDate.getMinutes()));
setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleEndDate", endDate.toISOString());

if (!!checkConflicts && !!formikValues.captureAgent) {
checkConflicts(
Expand Down Expand Up @@ -405,8 +400,8 @@ const changeStartMultiple = (
endDate.setDate(startDate.getDate() + 1);
}

setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleStartDate", getISODateString(startDate));
setFieldValue("scheduleEndDate", endDate.toISOString());
setFieldValue("scheduleStartDate", startDate.toISOString());

if (!!checkConflicts && !! formikValues.captureAgent) {
checkConflicts(
Expand Down Expand Up @@ -525,8 +520,8 @@ export const changeEndDateMultiple = async (
}
}

setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleStartDate", getISODateString(startDate));
setFieldValue("scheduleEndDate", endDate.toISOString());
setFieldValue("scheduleStartDate", startDate.toISOString());

if (!!checkConflicts && !!formikValues.captureAgent) {
checkConflicts(
Expand Down Expand Up @@ -571,7 +566,7 @@ const changeEndMultiple = (

if (isEndBeforeStart(startDate, endDate)) {
endDate.setDate(startDate.getDate() + 1);
setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleEndDate", endDate.toISOString());
}

if (!!checkConflicts && !!formikValues.captureAgent) {
Expand Down Expand Up @@ -668,7 +663,7 @@ const changeDurationMultiple = (

setFieldValue("scheduleEndHour", makeTwoDigits(endDate.getHours()));
setFieldValue("scheduleEndMinute", makeTwoDigits(endDate.getMinutes()));
setFieldValue("scheduleEndDate", getISODateString(endDate));
setFieldValue("scheduleEndDate", endDate.toISOString());

if (!!checkConflicts && !!formikValues.captureAgent) {
checkConflicts(
Expand Down