fix(stateData): fix state of survey

src/components/commons/LoopSurveyPage/LoopSurveyPage.tsx

@@ -5,7 +5,7 @@ import { LoopEnum } from "enumerations/LoopEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder } from "orchestrator/Orchestrator";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { getLoopLastCompletedStep } from "service/loop-service";
 import { loopActivityStepperData } from "service/loop-stepper-service";
 import { setEnviro } from "service/navigation-service";
@@ -53,7 +53,8 @@ const LoopSurveyPage = (props: LoopSurveyPageProps) => {
     const context: OrchestratorContext = useOutletContext();
     setEnviro(context, useNavigate(), callbackHolder);
 
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     const { classes, cx } = useStyles();
 

src/components/commons/LoopSurveyPage/LoopSurveyPageStep/LoopSurveyPageStep.tsx

@@ -9,7 +9,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { OrchestratorForStories, callbackHolder } from "orchestrator/Orchestrator";
 import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { getLabels, getLabelsWhenQuit } from "service/alert-service";
 import { getLoopInitialPage, skipBackPage, skipNextPage } from "service/loop-service";
 import { getLoopPageSubpage, getStepData } from "service/loop-stepper-service";
@@ -46,7 +46,8 @@ const LoopSurveyPageStep = (props: LoopSurveyPageStepProps) => {
     const { t } = useTranslation();
     const context: OrchestratorContext = useOutletContext();
     setEnviro(context, useNavigate(), callbackHolder);
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     const paramIteration = useParams().iteration;
     const currentIteration = paramIteration ? +paramIteration : 0;

src/components/commons/SurveyPage/SurveyPageStep/SurveyPageStep.tsx

@@ -26,6 +26,7 @@ import { surveyReadOnly } from "service/survey-activity-service";
 import { getPrintedFirstName, getPrintedSurveyDate } from "service/survey-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 import SurveyPage from "../SurveyPage";
+import { useLocation } from "react-router-dom";
 
 export interface SurveyPageStepProps {
     currentPage: EdtRoutesNameEnum;
@@ -54,7 +55,8 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
 
     const { t } = useTranslation();
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     const navigate = useNavigate();
 

src/enumerations/StateDataStateEnum.ts

@@ -3,4 +3,5 @@ export enum StateDataStateEnum {
     VALIDATED = "VALIDATED",
     TOEXTRACT = "TO-EXTRACT",
     EXTRACTED = "EXTRACTED",
+    COMPLETED = "COMPLETED",
 }

src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx

@@ -28,7 +28,7 @@ import { callbackHolder } from "orchestrator/Orchestrator";
 import React, { useCallback, useEffect, useState } from "react";
 import { isAndroid, isIOS, isMobile } from "react-device-detect";
 import { useTranslation } from "react-i18next";
-import { Outlet, useNavigate, useOutletContext } from "react-router-dom";
+import { Outlet, useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { getLoopSize, setLoopSize } from "service/loop-service";
 import {
     getCurrentNavigatePath,
@@ -72,7 +72,8 @@ const ActivityOrRoutePlannerPage = () => {
     const source =
         context?.source?.components != null ? context.source : getSource(SourcesEnum.ACTIVITY_SURVEY);
 
-    let idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    let idSurvey = getSurveyIdFromUrl(context, location);
     const { t } = useTranslation();
     const [isSubchildDisplayed, setIsSubChildDisplayed] = React.useState(false);
     const [isAddActivityOrRouteOpen, setIsAddActivityOrRouteOpen] = React.useState(false);
@@ -159,7 +160,7 @@ const ActivityOrRoutePlannerPage = () => {
         } else {
             setSkip(false);
         }
-        idSurvey = getSurveyIdFromUrl(context);
+        idSurvey = getSurveyIdFromUrl(context, location);
         context.idSurvey = idSurvey;
     });
 

src/pages/activity/activity-or-route-planner/activity-duration/ActivityDuration.tsx

@@ -15,7 +15,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder, OrchestratorForStories } from "orchestrator/Orchestrator";
 import { Fragment, useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { getLabelsWhenQuit } from "service/alert-service";
 import { getLoopInitialPage } from "service/loop-service";
 import { getLoopPageSubpage, getNextLoopPage, getStepData } from "service/loop-stepper-service";
@@ -37,7 +37,8 @@ const ActivityDurationPage = () => {
     const { classes } = useStyles();
     setEnviro(context, useNavigate(), callbackHolder);
 
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const paramIteration = useParams().iteration;
     const currentIteration = paramIteration ? +paramIteration : 0;
     const isRoute = getValue(idSurvey, FieldNameEnum.ISROUTE, currentIteration) as boolean;

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

@@ -3,7 +3,7 @@ import LoopSurveyPage from "components/commons/LoopSurveyPage/LoopSurveyPage";
 import { EdtRoutesNameEnum } from "enumerations/EdtRoutesNameEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder, OrchestratorForStories } from "orchestrator/Orchestrator";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { filtrePage, getLoopInitialPage, getValueOfActivity, skipNextPage } from "service/loop-service";
 import {
     getLoopPageSubpage,
@@ -56,7 +56,8 @@ const MainActivityPage = () => {
     const context: OrchestratorContext = useOutletContext();
     setEnviro(context, useNavigate(), callbackHolder);
 
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const currentPage = EdtRoutesNameEnum.MAIN_ACTIVITY;
     const stepData = getStepData(currentPage);
     const paramIteration = useParams().iteration;

src/pages/activity/activity-or-route-planner/secondary-activity-selection/SecondaryActivitySelection.tsx

@@ -6,7 +6,7 @@ import { FieldNameEnum } from "enumerations/FieldNameEnum";
 import { ReferentielsEnum } from "enumerations/ReferentielsEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { useTranslation } from "react-i18next";
-import { useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useOutletContext, useParams } from "react-router-dom";
 import {
     getActivitySecondaryActivityRef,
     getRouteSecondaryActivityRef,
@@ -18,7 +18,8 @@ const SecondaryActivitySelectionPage = () => {
     const context: OrchestratorContext = useOutletContext();
     const { t } = useTranslation();
 
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const paramIteration = useParams().iteration;
     const currentIteration = paramIteration ? +paramIteration : 0;
     const isRoute = getValue(idSurvey, FieldNameEnum.ISROUTE, currentIteration) as boolean;

src/pages/activity/activity-or-route-planner/with-screen/WithScreen.tsx

@@ -9,7 +9,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { OrchestratorForStories, callbackHolder } from "orchestrator/Orchestrator";
 import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { getLabels, getLabelsWhenQuit } from "service/alert-service";
 import { getLoopInitialPage } from "service/loop-service";
 import { getLoopPageSubpage, getPreviousLoopPage, getStepData } from "service/loop-stepper-service";
@@ -34,7 +34,8 @@ const WithScreenPage = () => {
     const context: OrchestratorContext = useOutletContext();
     setEnviro(context, useNavigate(), callbackHolder);
 
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const paramIteration = useParams().iteration;
     const currentIteration = paramIteration ? +paramIteration : 0;
     const currentPage = EdtRoutesNameEnum.WITH_SCREEN;

src/pages/activity/activity-summary/ActivitySummary.tsx

@@ -32,7 +32,7 @@ import { LunaticModel, OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder } from "orchestrator/Orchestrator";
 import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { getFlatLocalStorageValue, getLocalStorageValue } from "service/local-storage-service";
 import { getLoopSize, setLoopSize } from "service/loop-service";
 import {
@@ -82,7 +82,8 @@ const ActivitySummaryPage = () => {
 
     const source =
         context?.source?.components != null ? context.source : getSource(SourcesEnum.ACTIVITY_SURVEY);
-    let idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    let idSurvey = getSurveyIdFromUrl(context, location);
     const [score, setScore] = React.useState<number | undefined>(undefined);
     const [isAddActivityOrRouteOpen, setIsAddActivityOrRouteOpen] = React.useState(false);
     const localIsSummaryEdited = getLocalStorageValue(
@@ -130,7 +131,7 @@ const ActivitySummaryPage = () => {
     }, []);
 
     useEffect(() => {
-        idSurvey = getSurveyIdFromUrl(context);
+        idSurvey = getSurveyIdFromUrl(context, location);
         context.idSurvey = idSurvey;
     });
 

src/pages/activity/edit-activity-information/EditActivityInformation.tsx

@@ -9,7 +9,7 @@ import { LoopEnum } from "enumerations/LoopEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext, useParams } from "react-router-dom";
 import { loopActivityRouteStepperData, loopActivityStepperData } from "service/loop-stepper-service";
 import { getLoopParameterizedNavigatePath, navFullPath } from "service/navigation-service";
 import { surveyReadOnly } from "service/survey-activity-service";
@@ -19,7 +19,8 @@ const EditActivityInformationPage = () => {
     const { t } = useTranslation();
     const navigate = useNavigate();
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     const { classes } = useStyles();
     const paramIteration = useParams().iteration;

src/pages/activity/greatest-activity-day/GreatestActivityDay.tsx

@@ -2,13 +2,14 @@ import greatestActivityDay from "assets/illustration/greatest-activity-day.svg";
 import SurveyPageStep from "components/commons/SurveyPage/SurveyPageStep/SurveyPageStep";
 import { EdtRoutesNameEnum } from "enumerations/EdtRoutesNameEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
-import { useOutletContext } from "react-router-dom";
+import { useLocation, useOutletContext } from "react-router-dom";
 import { getActivitesSelectedLabel } from "service/survey-activity-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
 const GreatestActivityDayPage = () => {
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const uniqueActivities = getActivitesSelectedLabel(idSurvey).filter(
         (value, index, self) =>
             index ===

src/pages/activity/phone-time/PhoneTime.tsx

@@ -6,7 +6,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { OrchestratorForStories, callbackHolder } from "orchestrator/Orchestrator";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import {
     getNavigatePath,
     getOrchestratorPage,
@@ -25,7 +25,8 @@ import { getSurveyIdFromUrl } from "utils/utils";
 const PhoneTimePage = () => {
     const currentPage = EdtRoutesNameEnum.PHONE_TIME;
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const { t } = useTranslation();
     setEnviro(context, useNavigate(), callbackHolder);
 

src/pages/activity/worst-activity-day/WorstActivityDay.tsx

@@ -2,13 +2,14 @@ import worstActivityDay from "assets/illustration/worst-activity-day.svg";
 import SurveyPageStep from "components/commons/SurveyPage/SurveyPageStep/SurveyPageStep";
 import { EdtRoutesNameEnum } from "enumerations/EdtRoutesNameEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
-import { useOutletContext } from "react-router-dom";
+import { useLocation, useOutletContext } from "react-router-dom";
 import { getActivitesSelectedLabel } from "service/survey-activity-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
 const WorstActivityDayPage = () => {
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const uniqueActivities = getActivitesSelectedLabel(idSurvey).filter(
         (value, index, self) =>
             index ===

src/pages/day-of-survey/DayOfSurvey.tsx

@@ -7,15 +7,16 @@ import { FieldNameEnum } from "enumerations/FieldNameEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder } from "orchestrator/Orchestrator";
 import React from "react";
-import { useOutletContext } from "react-router-dom";
+import { useLocation, useOutletContext } from "react-router-dom";
 import { navToErrorPage } from "service/navigation-service";
 import { surveyReadOnly } from "service/survey-activity-service";
 import { getComponentId, setValue } from "service/survey-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
 const DayOfSurveyPage = () => {
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     let [disabledButton, setDisabledButton] = React.useState<boolean>(false);
     const modifiable = !surveyReadOnly(context.rightsSurvey);

src/pages/edit-global-information/EditGlobalInformation.tsx

@@ -7,13 +7,14 @@ import { FieldNameEnum } from "enumerations/FieldNameEnum";
 import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder } from "orchestrator/Orchestrator";
 import React from "react";
-import { useOutletContext } from "react-router-dom";
+import { useLocation, useOutletContext } from "react-router-dom";
 import { getComponentsOfVariable, setValue } from "service/survey-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
 const EditGlobalInformationPage = () => {
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     let [disabledButton, setDisabledButton] = React.useState<boolean>(false);
 
     const keydownChange = () => {

src/pages/end-survey/EndSurvey.tsx

@@ -17,7 +17,7 @@ import { callbackHolder } from "orchestrator/Orchestrator";
 import { SetStateAction, useCallback, useEffect, useState } from "react";
 import { isMobile } from "react-device-detect";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { remotePutSurveyData, remotePutSurveyDataReviewer } from "service/api-service";
 import { getFlatLocalStorageValue } from "service/local-storage-service";
 import {
@@ -37,7 +37,8 @@ const EndSurveyPage = () => {
     const { classes, cx } = useStyles();
     const { t } = useTranslation();
     const context: OrchestratorContext = useOutletContext();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     const navigate = useNavigate();
 
@@ -86,7 +87,7 @@ const EndSurveyPage = () => {
     const remoteSaveSurveyAndGoBackHome = useCallback(() => {
         const dataWithIsEnvoyed = setValue(idSurvey, FieldNameEnum.ISENVOYED, true);
         const stateData: StateData = {
-            state: StateDataStateEnum.VALIDATED,
+            state: StateDataStateEnum.COMPLETED,
             date: Date.now(),
             currentPage: getCurrentPage(callbackHolder.getData(), context.source),
         };

src/pages/work-time/kind-of-week/KindOfWeek.tsx

@@ -9,7 +9,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { OrchestratorForStories, callbackHolder } from "orchestrator/Orchestrator";
 import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import {
     getNavigatePath,
     getOrchestratorPage,
@@ -29,8 +29,8 @@ const KindOfWeekPage = () => {
     const context: OrchestratorContext = useOutletContext();
     const { t } = useTranslation();
     setEnviro(context, useNavigate(), callbackHolder);
-
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
     const currentPage = EdtRoutesNameEnum.KIND_OF_WEEK;
 
     const routeEnd =

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

@@ -14,7 +14,7 @@ import { OrchestratorContext } from "interface/lunatic/Lunatic";
 import { callbackHolder, OrchestratorForStories } from "orchestrator/Orchestrator";
 import React, { useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useOutletContext } from "react-router-dom";
+import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import {
     closeFormularieAndNav,
     getFullNavigatePath,
@@ -32,7 +32,8 @@ import { getSurveyIdFromUrl } from "utils/utils";
 const WeeklyPlannerPage = () => {
     const context: OrchestratorContext = useOutletContext();
     const { t } = useTranslation();
-    const idSurvey = getSurveyIdFromUrl(context);
+    const location = useLocation();
+    const idSurvey = getSurveyIdFromUrl(context, location);
 
     setEnviro(context, useNavigate(), callbackHolder);
 

src/service/survey-service.ts

@@ -670,10 +670,23 @@ const setLocalDatabase = (stateData: StateData, data: LunaticData, idSurvey: str
     });
 };
 
-const getSurveyStateData = (data: LunaticData, idSurvey: string): StateData => {
+const getStateOfSurvey = (idSurvey: string): StateDataStateEnum => {
     const isSent = getValue(idSurvey, FieldNameEnum.ISENVOYED) as boolean;
+    const isLocked = surveyLocked(idSurvey);
+
+    let state: StateDataStateEnum = StateDataStateEnum.INIT;
+
+    if (isSent) {
+        state = StateDataStateEnum.COMPLETED;
+    } else if (isLocked) {
+        state = StateDataStateEnum.VALIDATED;
+    }
+    return state;
+};
+
+const getSurveyStateData = (data: LunaticData, idSurvey: string): StateData => {
     const stateData: StateData = {
-        state: isSent ? StateDataStateEnum.VALIDATED : StateDataStateEnum.INIT,
+        state: getStateOfSurvey(idSurvey),
         date: Date.now(),
         currentPage: getCurrentPage(data),
     };