fix RegularSchedulePicker for all timezones

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

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/front/src/app/components/forms/commons/SchedulePicker/RegularSchedulePicker.tsx b/front/src/app/components/forms/commons/SchedulePicker/RegularSchedulePicker.tsx
@@ -12,6 +12,7 @@ import {
   calculateNumberOfWorkedDays,
   calculateTotalImmersionHoursFromComplexSchedule,
   calculateWeeklyHoursFromSchedule,
+  convertLocaleDateToUtcTimezoneDate,
   regularTimePeriods,
   selectedDaysFromComplexSchedule,
 } from "shared";
@@ -122,8 +123,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
@@ -8,6 +8,7 @@ import {
   SelectedDaysOfTheWeekDto,
   WeekdayNumber,
   arrayFromNumber,
+  convertLocaleDateToUtcTimezoneDate,
   frenchDayMapping,
   maximumCalendarDayByInternshipKind,
   removeAtIndex,
@@ -49,8 +50,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);

diff --git a/front/src/app/components/forms/convention/sections/schedule/ScheduleSection.tsx b/front/src/app/components/forms/convention/sections/schedule/ScheduleSection.tsx
@@ -208,8 +208,8 @@ export const ScheduleSection = () => {
 
       <SchedulePicker
         interval={{
-          start: new Date(values.dateStart),
-          end: new Date(values.dateEnd),
+          start: convertLocaleDateToUtcTimezoneDate(new Date(values.dateStart)),
+          end: convertLocaleDateToUtcTimezoneDate(new Date(values.dateEnd)),
         }}
         excludedDays={excludedDays}
       />