chore: cleanup & edit survey model to add "S_" prefix by default

src/pages/activity/activity-or-route-planner/activity/activity-location/ActivityLocation.tsx

@@ -25,7 +25,7 @@ const ActivityLocationPage = () => {
         },
         referentiel: getPlaceRef(),
     };
-    console.log("ActivityLocationPage referentiel", specifiquesProps.referentiel);
+    //console.log("ActivityLocationPage referentiel", specifiquesProps.referentiel);
     return (
         <LoopSurveyPageStep
             currentPage={EdtRoutesNameEnum.ACTIVITY_LOCATION}

src/pages/activity/activity-or-route-planner/activity/main-activity/MainActivity.tsx

@@ -133,7 +133,7 @@ const MainActivityPage = () => {
         },
         nextClickCallback: (routeToGoal: boolean) => {
             const codeActivity = getValueOfActivity(callbackHolder.getData(), currentIteration) ?? "";
-            console.log("codeActivity", codeActivity);
+            //console.log("codeActivity", codeActivity);
             const skip = filtrePage(EdtRoutesNameEnum.MAIN_ACTIVITY_GOAL, codeActivity);
             if (routeToGoal && !skip) {
                 saveAndLoopNavigate(

src/pages/work-time/weekly-planner/WeeklyPlanner.tsx

@@ -38,7 +38,6 @@ import {
     getNavigatePath,
     getOrchestratorPage,
     navFullPath,
-    saveAndNav,
     saveAndNavLocally,
     setEnviro,
 } from "service/navigation-service";
@@ -133,6 +132,7 @@ const WeeklyPlannerPage = () => {
             getArrayFromSession("DATES")) as string[];
         const currentDateIndex = dates.indexOf(response.date);
         const dataResponse = getData(idSurveyResponse);
+        console.log("Save Duration", dataCopy);
         if (
             !isReviewer() &&
             dataResponse.COLLECTED?.[FieldNameEnum.FIRSTNAME].COLLECTED ==
@@ -238,7 +238,7 @@ const WeeklyPlannerPage = () => {
     const validateAndNav = (): void => {
         if (displayDayOverview) {
             if (isPlaceWorkDisplayed) {
-                saveDataLocally(idSurvey, callbackHolder.getData());
+                saveData(idSurvey, callbackHolder.getData());
                 setDisplayDayOverview(true);
                 setIsPlaceWorkDisplayed(false);
                 isPlaceWorkDisplayed = false;
@@ -304,7 +304,7 @@ const WeeklyPlannerPage = () => {
                 <SurveyPage
                     idSurvey={idSurvey}
                     validate={useCallback(() => validateAndNav(), [displayDayOverview])}
-                    onNavigateBack={useCallback(() => validateAndNav(), [displayDayOverview])}
+                    onNavigateBack={useCallback(() => saveAndNavLocally(idSurvey), [displayDayOverview])}
                     onPrevious={useCallback(() => saveAndNavLocally(idSurvey), [])}
                     onEdit={useCallback(() => onEdit(), [])}
                     onHelp={onHelp}

src/service/api-service/getRemoteData.ts

@@ -7,6 +7,7 @@ import { getUserToken, isReviewer } from "../user-service";
 import { AuthContextProps } from "oidc-react";
 import { NomenclatureActivityOption } from "@inseefrlab/lunatic-edt";
 import { ReferentielsEnum } from "enumerations/ReferentielsEnum";
+import { revertTransformedArray } from "utils/utils";
 
 export const edtOrganisationApiBaseUrl = process.env.REACT_APP_EDT_ORGANISATION_API_BASE_URL;
 export const stromaeBackOfficeApiBaseUrl = process.env.REACT_APP_STROMAE_BACK_OFFICE_API_BASE_URL;
@@ -85,15 +86,6 @@ const fetchRemoteReferentiels = (setError: (error: ErrorCodeEnum) => void): Prom
     });
 };
 
-const revertTransformedArray = (dataAct: any) => {
-    const revertedDataAct: { [key: string]: any } = {};
-    Object.keys(dataAct).forEach(key => {
-        const revertedKey = key.startsWith("S_") ? key.substring(2) : key;
-        revertedDataAct[revertedKey] = dataAct[key];
-    });
-    return revertedDataAct;
-};
-
 const fetchUserSurveysInfo = (setError: (error: ErrorCodeEnum) => void): Promise<UserSurveys[]> => {
     return new Promise(resolve => {
         axios

src/service/api-service/putRemoteData.ts

@@ -1,5 +1,3 @@
-//TODO: fix any
-
 import axios from "axios";
 import { StateDataStateEnum } from "enumerations/StateDataStateEnum";
 import { SurveyData, StateData } from "interface/entity/Api";
@@ -9,21 +7,14 @@ import { getUserToken, getAuth } from "service/user-service";
 import { stromaeBackOfficeApiBaseUrl, getHeader } from "./getRemoteData";
 import jwt, { JwtPayload } from "jwt-decode";
 import { logout } from "service/auth-service";
-
-const transformCollectedArray = (dataAct: any) => {
-    const transformedDataAct: { [key: string]: any } = {};
-    Object.keys(dataAct).forEach(key => {
-        const transformedKey: string = /^\d/.test(key) ? `S_${key}` : key;
-        transformedDataAct[transformedKey] = dataAct[key];
-    });
-    return transformedDataAct;
-};
+import { transformCollectedArray } from "utils/utils";
 
 const requestPutSurveyData = (
     idSurvey: string,
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
+    console.log("requestPutSurveyData", data);
     const collectedData = transformCollectedArray(data?.data?.COLLECTED);
     if (data.data) {
         data.data.COLLECTED = collectedData;
@@ -102,6 +93,7 @@ const requestPutDataReviewer = (
     data: LunaticData,
     token?: string,
 ): Promise<LunaticData> => {
+    console.log("requestPutDataReviewer", data);
     data.COLLECTED = transformCollectedArray(data?.COLLECTED);
     delete data.COLLECTED?.WEEKLYPLANNER;
     return new Promise<LunaticData>(resolve => {

src/service/navigation-service.ts

@@ -241,7 +241,6 @@ const closeFormularieAndNav = (idSurvey: string, route: string) => {
  * we need to make the call twice to be able to retrieve the current state of the database
  */
 const validate = (idSurvey: string): Promise<void | LunaticData> => {
-    console.log("validate");
     return saveData(idSurvey, _callbackHolder.getData() ?? getData(idSurvey), true).then(() => {
         return saveData(idSurvey, _callbackHolder.getData() ?? getData(idSurvey), false);
     });

src/service/survey-service.ts

@@ -45,6 +45,8 @@ import {
     getArrayFromSession,
     getItemFromSession,
     groupBy,
+    revertTransformedArray,
+    transformCollectedArray,
 } from "utils/utils";
 import {
     edtWorkTimeSurvey,
@@ -746,6 +748,8 @@ const getData = (idSurvey: string): LunaticData => {
     const modifyCollected = modifyIndividualCollected(idSurvey);
     const emptyData = getDataCache(idSurvey) ?? createDataEmpty(idSurvey ?? "");
     const data = modifyCollected || emptyData;
+    const revertedCollected = revertTransformedArray(data.COLLECTED);
+    data.COLLECTED = revertedCollected;
     return data;
 };
 
@@ -1007,7 +1011,8 @@ const saveData = (
     if (!navigator.onLine || isDemoMode || localSaveOnly) stateData.date = 0;
 
     if (isChange) {
-        console.log("Attempt to save data", data.COLLECTED);
+        console.log("SaveRemote data", data.COLLECTED);
+
         data = saveQualityScore(idSurvey, data);
         stateData = getSurveyStateData(data);
 

src/utils/utils.ts

@@ -173,22 +173,28 @@ function difference(origObj: any, newObj: any) {
     return changes(newObj, origObj);
 }
 
+/**
+ * Merges specific fields from one object into another.
+ *
+ * This function merges the "variables" and "components" fields from the new object into the original object.
+ * Both objects must be valid and of type object.
+ *
+ * @param origObj - The original object to merge into.
+ * @param newObj - The new object containing fields to merge.
+ * @returns The merged object.
+ * @throws Will throw an error if either origObj or newObj is not a valid object.
+ */
 function mergeObjects(origObj: any, newObj: any): any {
-    // Validate input objects
     if (!origObj || !newObj || typeof origObj !== "object" || typeof newObj !== "object") {
         throw new Error("Both origObj and newObj must be valid objects.");
     }
 
-    // Fields to merge
     const fieldsToMerge = ["variables", "components"];
 
     fieldsToMerge.forEach(field => {
         // Check if the field exists and is an array in origObj
         if (Array.isArray(origObj[field])) {
-            // Ensure the field exists in newObj; if not, initialize as an empty array
             newObj[field] = newObj[field] || [];
-
-            // Merge the array from origObj into newObj without duplicates
             origObj[field].forEach((item: any) => {
                 if (!newObj[field].some((newItem: any) => isEqual(newItem, item))) {
                     newObj[field].push(item);
@@ -200,6 +206,39 @@ function mergeObjects(origObj: any, newObj: any): any {
     return newObj;
 }
 
+/**
+ * Reverts a transformed array back to its original structure.
+ * (Platine Back Office data transformation)
+ * @param transformedArray - The array that has been transformed.
+ * @param transformationLogic - A function that defines how to revert the transformation.
+ * @returns The original array structure before transformation.
+ * @throws Will throw an error if the transformedArray is not an array .
+ */
+const revertTransformedArray = (dataAct: any) => {
+    const revertedDataAct: { [key: string]: any } = {};
+    Object.keys(dataAct).forEach(key => {
+        const revertedKey = key.startsWith("S_") ? key.substring(2) : key;
+        revertedDataAct[revertedKey] = dataAct[key];
+    });
+    return revertedDataAct;
+};
+
+/**
+ * Transforms the keys of an object by prefixing keys that start with a digit.
+ * (Required for Platine Back Office data extract)
+ *
+ * @param dataAct - The input object whose keys need to be transformed.
+ * @returns The transformed object with prefixed keys.
+ */
+const transformCollectedArray = (dataAct: any) => {
+    const transformedDataAct: { [key: string]: any } = {};
+    Object.keys(dataAct).forEach(key => {
+        const transformedKey: string = /^\d/.test(key) ? `S_${key}` : key;
+        transformedDataAct[transformedKey] = dataAct[key];
+    });
+    return transformedDataAct;
+};
+
 export {
     addArrayToSession,
     addItemToSession,
@@ -219,4 +258,6 @@ export {
     sumAllOfArray,
     difference,
     mergeObjects,
+    revertTransformedArray,
+    transformCollectedArray,
 };