diff --git a/src/enumerations/StateDataStateEnum.ts b/src/enumerations/StateDataStateEnum.ts index bc173118..2179f2f7 100644 --- a/src/enumerations/StateDataStateEnum.ts +++ b/src/enumerations/StateDataStateEnum.ts @@ -3,6 +3,5 @@ export enum StateDataStateEnum { VALIDATED = "VALIDATED", TOEXTRACT = "TO-EXTRACT", EXTRACTED = "EXTRACTED", - COMPLETED = "COMPLETED", LOCKED = "LOCKED", } diff --git a/src/pages/end-survey/EndSurvey.tsx b/src/pages/end-survey/EndSurvey.tsx index f2458e13..9cd0376a 100644 --- a/src/pages/end-survey/EndSurvey.tsx +++ b/src/pages/end-survey/EndSurvey.tsx @@ -95,7 +95,7 @@ const EndSurveyPage = () => { setValue(idSurvey, FieldNameEnum.ISENVOYED, true); const dataWithIsClosed = setValue(idSurvey, FieldNameEnum.ISCLOSED, true); const stateData: StateData = { - state: StateDataStateEnum.COMPLETED, + state: StateDataStateEnum.VALIDATED, date: Date.now(), currentPage: getCurrentPage(callbackHolder.getData(), context.source), }; diff --git a/src/service/navigation-service.ts b/src/service/navigation-service.ts index 111e2887..d4d12c3c 100644 --- a/src/service/navigation-service.ts +++ b/src/service/navigation-service.ts @@ -33,7 +33,7 @@ import { } from "./survey-service"; import { getLastPageStep } from "./stepper.service"; import { surveyReadOnly } from "./survey-activity-service"; -import { isSurveyClosed, isSurveyCompleted, isSurveyValidated } from "./survey-state-service"; +import { isSurveyClosed, isSurveyValidated } from "./survey-state-service"; import { mergeObjects } from "../utils/utils"; let _context: OrchestratorContext; @@ -493,8 +493,7 @@ const navToActivityOrPlannerOrSummary = ( ) => { const surveyIsClosed = isSurveyClosed(idSurvey); const surveyIsValidated = isSurveyValidated(idSurvey); - const surveyIsCompleted = isSurveyCompleted(idSurvey); - if (surveyIsClosed || surveyIsValidated || surveyIsCompleted) { + if (surveyIsClosed || surveyIsValidated) { const surveyIsEnvoyed = getValue(idSurvey, FieldNameEnum.ISENVOYED); if (surveyIsEnvoyed || surveyIsValidated) { navigate( diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts index 4c9d3865..fb02a310 100644 --- a/src/service/survey-service.ts +++ b/src/service/survey-service.ts @@ -73,7 +73,6 @@ import { initStateData, isDemoMode, isSurveyClosed, - isSurveyCompleted, isSurveyExtracted, isSurveyLocked, isSurveyStarted, @@ -1560,12 +1559,11 @@ const getStatsHousehold = (surveys: UserSurveys[]): StatsHousehold => { const isExtracted = isSurveyExtracted(idSurvey); const isClosed = isSurveyClosed(idSurvey); const isStarted = isSurveyStarted(idSurvey); - const isCompleted = isSurveyCompleted(idSurvey); numHouseholds++; if (isValidated || isExtracted) { numHouseholdsValidated++; - } else if (isClosed || isCompleted) { + } else if (isClosed) { numHouseholdsClosed++; } else if (isStarted) { numHouseholdsInProgress++; diff --git a/src/service/survey-state-service.ts b/src/service/survey-state-service.ts index 305bd1fb..cc106492 100644 --- a/src/service/survey-state-service.ts +++ b/src/service/survey-state-service.ts @@ -37,15 +37,10 @@ const isSurveyStarted = (idSurvey: string) => { return survey.COLLECTED != null && survey.COLLECTED.SURVEYDATE?.COLLECTED != null; }; -const isSurveyCompleted = (idSurvey: string) => { - const stateData = getLocalSurveyStateData(getData(idSurvey)); - return stateData.state == StateDataStateEnum.COMPLETED; -}; - const isSurveyExtracted = (idSurvey: string) => { const stateData = getLocalSurveyStateData(getData(idSurvey)); return stateData.state == StateDataStateEnum.EXTRACTED; -} +}; const isSurveyClosed = (idSurvey: string) => { const isClosed = getValue(idSurvey, FieldNameEnum.ISCLOSED) as boolean; @@ -184,7 +179,6 @@ export { isSurveyExtracted, isSurveyClosed, isSurveyStarted, - isSurveyCompleted, getStatutSurvey, getLocalSurveyStateData, lockAllSurveys, diff --git a/yarn.lock b/yarn.lock index 27891b02..65421d68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1202,10 +1202,10 @@ dependencies: antlr4 "4.8.0" -"@inseefrlab/lunatic-edt@^0.15.2": - version "0.15.2" - resolved "https://registry.yarnpkg.com/@inseefrlab/lunatic-edt/-/lunatic-edt-0.15.2.tgz#57d277a290b0582c0fb3a167f8b2fae8063ccf92" - integrity sha512-oug/+RMwH+9rK63nA8HPdTon8L7euWkpTc0JVJVi3tZlMvIIMRPLjboHtRCUt8XnFJ2KrtWLrc5hCtVAEqd+kQ== +"@inseefrlab/lunatic-edt@^0.15.3": + version "0.15.3" + resolved "https://registry.yarnpkg.com/@inseefrlab/lunatic-edt/-/lunatic-edt-0.15.3.tgz#950f8c7b0c113cfa9ca1bfaf481341f6359614f5" + integrity sha512-6VOi+LHhhgl4QEaCIE1x/s00xqxeM47TmLapPo+QRSqR5/UToiBJWOl6uOA0iT+J3qYJE5+G2pEoAfAaT9+2EQ== dependencies: "@date-io/dayjs" "^2.16.0" "@emotion/react" "^11.10.4"