From f638b6094c38f6192782a873c945e2c8506e8313 Mon Sep 17 00:00:00 2001 From: MailineN Date: Thu, 8 Aug 2024 10:14:19 +0200 Subject: [PATCH] fix: initLocalRefs & fix ref value type --- src/App.tsx | 2 +- src/assets/surveyData/edtActivitySurvey.json | 25 -------- .../edtActivitySecondaryActivity.json | 64 +++++++++---------- .../edtRouteSecondaryActivity.json | 56 ++++++++-------- src/assets/surveyData/edtWorkTimeSurvey.json | 12 ---- src/orchestrator/Orchestrator.tsx | 9 ++- src/pages/home-surveyed/HomeSurveyed.tsx | 2 +- src/service/loop-service.ts | 1 - 8 files changed, 68 insertions(+), 103 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index a2341a2d..1c29ba3e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -15,8 +15,8 @@ import { getAuthCache, getDatas, initPropsAuth, - initializeRemoteDatas, initializeListSurveys, + initializeRemoteDatas, } from "service/survey-service"; import { getUserRights, setAuth, setUser, setUserToken } from "service/user-service"; import { getCookie } from "utils/utils"; diff --git a/src/assets/surveyData/edtActivitySurvey.json b/src/assets/surveyData/edtActivitySurvey.json index 3ca9d826..a779c576 100644 --- a/src/assets/surveyData/edtActivitySurvey.json +++ b/src/assets/surveyData/edtActivitySurvey.json @@ -449,18 +449,6 @@ "componentRef": "timepicker_phoneTime", "variableType": "COLLECTED" }, - { - "name": "ISCOMPLETED", - "values": { - "EDITED": [null], - "FORCED": [null], - "INPUTED": [null], - "PREVIOUS": [null], - "COLLECTED": [null] - }, - "componentRef": "", - "variableType": "COLLECTED" - }, { "name": "INPUT_SUGGESTER", "values": { @@ -485,18 +473,6 @@ "componentRef": "activityselecter_mainactivity", "variableType": "COLLECTED" }, - { - "name": "ISVALIDATED", - "values": { - "EDITED": null, - "FORCED": null, - "INPUTED": null, - "PREVIOUS": null, - "COLLECTED": null - }, - "componentRef": "", - "variableType": "COLLECTED" - }, { "name": "ISLOCKED", "values": { @@ -1168,7 +1144,6 @@ "OTHER", "WITHSCREEN", "ISROUTE", - "ISCOMPLETED", "INPUT_SUGGESTER", "ACTIVITY_SELECTER_HISTORY" ] diff --git a/src/assets/surveyData/edtNomenclatures/edtActivitySecondaryActivity.json b/src/assets/surveyData/edtNomenclatures/edtActivitySecondaryActivity.json index 309d11c0..732c770a 100644 --- a/src/assets/surveyData/edtNomenclatures/edtActivitySecondaryActivity.json +++ b/src/assets/surveyData/edtNomenclatures/edtActivitySecondaryActivity.json @@ -1,66 +1,66 @@ [ { - "label": "Écouter la radio, des podcasts ou de la musique", - "value": 1 + "value": 1, + "label": "Écouter la radio, des podcasts ou de la musique" }, { - "label": "Regarder la télévision, des DVD, des vidéos en ligne", - "value": 2 + "value": 2, + "label": "Regarder la télévision, des DVD, des vidéos en ligne" }, { - "label": "Conversation", - "value": 3 + "value": 3, + "label": "Conversation" }, { - "label": "Consulter mes mails personnels", - "value": 4 + "value": 4, + "label": "Consulter mes mails personnels" }, { - "label": "Consulter les notifications de mon téléphone", - "value": 5 + "value": 5, + "label": "Consulter les notifications de mon téléphone" }, { - "label": "Publier ou surfer sur les médias sociaux (Facebook, Instagram, Twitter, …)", - "value": 6 + "value": 6, + "label": "Publier ou surfer sur les médias sociaux (Facebook, Instagram, Twitter, …)" }, { - "label": "Surf sur Internet, visite de sites pour m'informer (hors journaux)", - "value": 7 + "value": 7, + "label": "Surf sur Internet, visite de sites pour m'informer (hors journaux)" }, { - "label": "Jeux sur téléphone", - "value": 8 + "value": 8, + "label": "Jeux sur téléphone" }, { - "label": "Lecture de journaux, revues", - "value": 9 + "value": 9, + "label": "Lecture de journaux, revues" }, { - "label": "Lecture de livres", - "value": 10 + "value": 10, + "label": "Lecture de livres" }, { - "label": "Repas", - "value": 11 + "value": 11, + "label": "Repas" }, { - "label": "Travail professionnel (y compris mails)", - "value": 12 + "value": 12, + "label": "Travail professionnel (y compris mails)" }, { - "label": "Me détendre, fumer", - "value": 13 + "value": 13, + "label": "Me détendre, fumer" }, { - "label": "Conversations avec les enfants, lectures", - "value": 14 + "value": 14, + "label": "Conversations avec les enfants, lectures" }, { - "label": "Repas, douche, habillage des enfants", - "value": 15 + "value": 15, + "label": "Repas, douche, habillage des enfants" }, { - "label": "Surveiller les devoirs des enfants", - "value": 16 + "value": 16, + "label": "Surveiller les devoirs des enfants" } ] diff --git a/src/assets/surveyData/edtNomenclatures/edtRouteSecondaryActivity.json b/src/assets/surveyData/edtNomenclatures/edtRouteSecondaryActivity.json index d1f8780f..f14637ac 100644 --- a/src/assets/surveyData/edtNomenclatures/edtRouteSecondaryActivity.json +++ b/src/assets/surveyData/edtNomenclatures/edtRouteSecondaryActivity.json @@ -1,58 +1,58 @@ [ { - "label": "Écouter la radio, des podcasts ou de la musique", - "value": 1 + "value": 1, + "label": "Écouter la radio, des podcasts ou de la musique" }, { - "label": "Regarder la télévision, des DVD, des vidéos en ligne", - "value": 2 + "value": 2, + "label": "Regarder la télévision, des DVD, des vidéos en ligne" }, { - "label": "Conversation", - "value": 3 + "value": 3, + "label": "Conversation" }, { - "label": "Conversations téléphoniques", - "value": 4 + "value": 4, + "label": "Conversations téléphoniques" }, { - "label": "Consulter mes mails personnels", - "value": 5 + "value": 5, + "label": "Consulter mes mails personnels" }, { - "label": "Consulter les notifications de mon téléphone", - "value": 6 + "value": 6, + "label": "Consulter les notifications de mon téléphone" }, { - "label": "Surf sur Internet, visite de sites pour m'informer (hors journaux)", - "value": 7 + "value": 7, + "label": "Surf sur Internet, visite de sites pour m'informer (hors journaux)" }, { - "label": "Publier ou surfer sur les médias sociaux (Facebook, Instagram, Twitter, ...)", - "value": 9 + "value": 8, + "label": "Publier ou surfer sur les médias sociaux (Facebook, Instagram, Twitter, ...)" }, { - "label": "Jeux sur téléphone", - "value": 9 + "value": 9, + "label": "Jeux sur téléphone" }, { - "label": "Lecture de journaux, revues", - "value": 10 + "value": 10, + "label": "Lecture de journaux, revues" }, { - "label": "Lecture de livres", - "value": 11 + "value": 11, + "label": "Lecture de livres" }, { - "label": "Manger", - "value": "12" + "value": 12, + "label": "Manger" }, { - "label": "Travail professionnel (y compris mails)", - "value": "13" + "value": 13, + "label": "Travail professionnel (y compris mails)" }, { - "label": "Me détendre, fumer", - "value": "14" + "value": 14, + "label": "Me détendre, fumer" } ] diff --git a/src/assets/surveyData/edtWorkTimeSurvey.json b/src/assets/surveyData/edtWorkTimeSurvey.json index e3f6669e..3757d900 100644 --- a/src/assets/surveyData/edtWorkTimeSurvey.json +++ b/src/assets/surveyData/edtWorkTimeSurvey.json @@ -1257,18 +1257,6 @@ "name": "ISENVOYED", "componentRef": "" }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": null, - "EDITED": null, - "INPUTED": null, - "FORCED": null, - "PREVIOUS": null - }, - "name": "ISVALIDATED", - "componentRef": "" - }, { "variableType": "COLLECTED", "values": { diff --git a/src/orchestrator/Orchestrator.tsx b/src/orchestrator/Orchestrator.tsx index 8739f6ac..ec2b9b32 100644 --- a/src/orchestrator/Orchestrator.tsx +++ b/src/orchestrator/Orchestrator.tsx @@ -141,7 +141,7 @@ const setDataOfActivityReviewer = ( const bindings: string[] = components?.filter( (component: any) => component.componentType != "Sequence", )[0]?.bindingDependencies; - + console.log("setDataOfActivityReviewer", dataCollected, data, components, iteration); for (let prop in FieldNameEnumActivity as any) { let dataOfField = dataCollected[prop]; const collected = dataOfField?.COLLECTED; @@ -251,6 +251,7 @@ const getVariablesActivity = ( isReviewerMode || isLocked ? variableEdited ?? variableCollected : variableCollected; variables.set(bindingDependency, variable); }); + console.log("getVariablesActivity", variables); return variables; }; @@ -345,6 +346,8 @@ export const OrchestratorForStories = (props: OrchestratorProps) => { {components.map(function (component: any) { const { id, componentType, response, options, value, ...other } = component; const Component = lunatic[componentType]; + const parsedValue = typeof value === "number" ? value.toString() : value; + console.log("component:", componentType, "response:", response, "value:", value); return (
{ getDataLocal(), iteration, getBindingDependencies(components), - value, + parsedValue, source, )} bindingDependencies={getBindingDependencies(components)} - value={value} + value={parsedValue} />
); diff --git a/src/pages/home-surveyed/HomeSurveyed.tsx b/src/pages/home-surveyed/HomeSurveyed.tsx index 549b6e78..91bdc420 100644 --- a/src/pages/home-surveyed/HomeSurveyed.tsx +++ b/src/pages/home-surveyed/HomeSurveyed.tsx @@ -39,8 +39,8 @@ import { getSource, getSurveyRights, getUserDatasActivity, - initializeHomeSurveys, initializeRemoteDatas, + initializeHomeSurveys, initializeSurveysDatasCache, initializeSurveysIdsDemo, nameSurveyGroupMap, diff --git a/src/service/loop-service.ts b/src/service/loop-service.ts index 5a410de3..473ac38c 100644 --- a/src/service/loop-service.ts +++ b/src/service/loop-service.ts @@ -24,7 +24,6 @@ import { getValueOfData, getVariable, saveData, - saveDataLocally, setValue, toIgnoreForActivity, toIgnoreForRoute,