fix: take into account that moment has configurable locale settings

dhis2 · Apr 29, 2024 · cfc05d3 · cfc05d3
1 parent 7b5ff09
commit cfc05d3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...pture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js b/...pture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js
@@ -1,6 +1,7 @@
 // @flow
 import moment from 'moment';
-import { ProgramStage } from '../../../../../metaData';
+import { dataElementTypes, ProgramStage } from '../../../../../metaData';
+import { convertClientToServer } from '../../../../../converters';
 import { convertCategoryOptionsToServer } from '../../../../../converters/clientToServer';
 
 const ignoreAutoGenerateIfApplicable = (stage, firstStageDuringRegistrationEvent) =>
@@ -58,9 +59,11 @@ export const deriveAutoGenerateEvents = ({
                     : {
                         status: 'SCHEDULE',
                         // for schedule type of events we want to add the standard interval days to the date
-                        scheduledAt: moment(dateToUseInScheduleStatus)
-                            .add(minDaysFromStart, 'days')
-                            .format('YYYY-MM-DD'),
+                        scheduledAt: convertClientToServer(
+                            moment(dateToUseInScheduleStatus)
+                                .add(minDaysFromStart, 'days')
+                                .format('YYYY-MM-DD'),
+                            dataElementTypes.DATE),
                     };
 
                 return {