wip fix RegularSchedulePicker for all timezones

gip-inclusion · Dec 19, 2024 · cf443bd · cf443bd
1 parent c745c1b
commit cf443bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/front/src/app/components/forms/commons/SchedulePicker/RegularSchedulePicker.tsx b/front/src/app/components/forms/commons/SchedulePicker/RegularSchedulePicker.tsx
@@ -14,6 +14,7 @@ import {
   calculateWeeklyHoursFromSchedule,
   regularTimePeriods,
   selectedDaysFromComplexSchedule,
+  convertLocaleDateToUtcTimezoneDate,
 } from "shared";
 import { useStyles } from "tss-react/dsfr";
 import { HourPicker } from "./HourPicker";
@@ -40,6 +41,7 @@ export const RegularSchedulePicker = (props: RegularSchedulePickerProps) => {
   const selectedHours = regularTimePeriods(
     values.schedule.complexSchedule[0]?.timePeriods,
   );
+  console.log({ complexeSchedule: values.schedule.complexSchedule });
 
   return (
     <>
@@ -122,8 +124,10 @@ export const RegularSchedulePicker = (props: RegularSchedulePickerProps) => {
           <WeeksHoursIndicator
             schedule={values.schedule}
             interval={{
-              start: new Date(values.dateStart),
-              end: new Date(values.dateEnd),
+              start: convertLocaleDateToUtcTimezoneDate(
+                new Date(values.dateStart),
+              ),
+              end: convertLocaleDateToUtcTimezoneDate(new Date(values.dateEnd)),
             }}
           />
         </div>

diff --git a/front/src/app/components/forms/commons/SchedulePicker/WeekdayPicker.tsx b/front/src/app/components/forms/commons/SchedulePicker/WeekdayPicker.tsx
@@ -11,6 +11,7 @@ import {
   frenchDayMapping,
   maximumCalendarDayByInternshipKind,
   removeAtIndex,
+  convertLocaleDateToUtcTimezoneDate,
 } from "shared";
 import { useStyles } from "tss-react/dsfr";
 import { DayCircle } from "./DayCircle";
@@ -34,6 +35,7 @@ export const WeekdayPicker = ({
 }: WeekdayPickerProps) => {
   const { cx } = useStyles();
   const onDayClick = (day: WeekdayNumber) => {
+    console.log({ selectedDays, day });
     const newDaysSelected = selectedDays.includes(day)
       ? removeAtIndex(selectedDays, selectedDays.indexOf(day))
       : [...selectedDays, day];
@@ -49,8 +51,12 @@ export const WeekdayPicker = ({
     const uniqueWeekDaysOnInterval = uniq(
       arrayFromNumber(startEndDiff + 1).map(
         (dayIndex) =>
-          frenchDayMapping(addDays(new Date(start), dayIndex).toISOString())
-            .frenchDay,
+          frenchDayMapping(
+            addDays(
+              convertLocaleDateToUtcTimezoneDate(new Date(start)),
+              dayIndex,
+            ).toISOString(),
+          ).frenchDay,
       ),
     );
     return !uniqueWeekDaysOnInterval.includes(day);