From 7ac62086854f741efbdd701e289ecac8804ba17e Mon Sep 17 00:00:00 2001 From: MailineN Date: Wed, 17 Jul 2024 11:18:48 +0200 Subject: [PATCH] fix: added placeWork to WorkTime remote source --- src/pages/activity/Activity.tsx | 1 + .../weekly-planner/WeeklyPlanner.tsx | 9 +- src/service/survey-service.ts | 9 +- src/utils/placeWork.json | 809 ++++++++++++++++++ 4 files changed, 820 insertions(+), 8 deletions(-) create mode 100644 src/utils/placeWork.json diff --git a/src/pages/activity/Activity.tsx b/src/pages/activity/Activity.tsx index 840dfbd5..a20e0b60 100644 --- a/src/pages/activity/Activity.tsx +++ b/src/pages/activity/Activity.tsx @@ -21,6 +21,7 @@ import { getData, getSource, getSurveyRights, getTabsData } from "service/survey const ActivityPage = () => { const source = getSource(SourcesEnum.ACTIVITY_SURVEY); + console.log("source ActivityPage", source); const navigate = useNavigate(); const context: OrchestratorContext = useOutletContext(); diff --git a/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx b/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx index 25bf464a..ec91d58e 100644 --- a/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx +++ b/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx @@ -85,7 +85,6 @@ const WeeklyPlannerPage = () => { // TODO: fix null check & move elsewhere & fix questionnaire model (temp solution) const initializeCollectedFields = (dataBdd: LunaticData, fieldsToInitialize: FieldNameEnum[]) => { - console.log("initializeCollectedFields"); if (dataBdd.COLLECTED !== undefined) { fieldsToInitialize.forEach(field => { if (!dataBdd.COLLECTED?.[field]) { @@ -104,10 +103,8 @@ const WeeklyPlannerPage = () => { const save = (idSurvey: string, data?: [IODataStructure[], string[], string[], any[]]): void => { const dataBdd = getData(idSurvey); - console.log("data", data); if (data && data[1].length > 0) { if (dataBdd.COLLECTED) { - console.log("DataBdd", dataBdd); initializeCollectedFields(dataBdd, [ FieldNameEnum.WEEKLYPLANNER, FieldNameEnum.DATES, @@ -148,7 +145,7 @@ const WeeklyPlannerPage = () => { dataCopy.COLLECTED[name].COLLECTED = quartier; } }); - saveData(idSurveyResponse, dataCopy); + saveDataLocally(idSurveyResponse, dataCopy); } if ( @@ -169,8 +166,7 @@ const WeeklyPlannerPage = () => { dataCopy.COLLECTED[name].EDITED = quartier; } }); - console.log("saveData duration"); - saveData(idSurveyResponse, dataCopy); + saveDataLocally(idSurveyResponse, dataCopy); } }; @@ -296,7 +292,6 @@ const WeeklyPlannerPage = () => { const onHelp = useCallback(() => { setIsHelpMenuOpen(true); }, []); - return ( { return sourcesData != null ? sourcesData.edtActivitySurvey : activitySurveySource; }; +//TODO: Temp solution as place work does not exist const getWorkTimeSource = () => { - return sourcesData != null ? sourcesData.edtWorkTimeSurvey : workTimeSource; + if (sourcesData?.edtWorkTimeSurvey) { + const data = { ...sourcesData.edtWorkTimeSurvey, ...placeWorkSource }; + return data; + } else { + return workTimeSource; + } }; const getSource = (refName: SourcesEnum) => { diff --git a/src/utils/placeWork.json b/src/utils/placeWork.json new file mode 100644 index 00000000..f9115955 --- /dev/null +++ b/src/utils/placeWork.json @@ -0,0 +1,809 @@ +{ + "components": [ + { + "componentType": "WeeklyPlanner", + "bindingDependencies": [ + "WEEKLYPLANNER", + "DATES", + "DATES_STARTED", + "00H00", + "00H15", + "00H30", + "00H45", + "01H00", + "01H15", + "01H30", + "01H45", + "02H00", + "02H15", + "02H30", + "02H45", + "03H00", + "03H15", + "03H30", + "03H45", + "04H00", + "04H15", + "04H30", + "04H45", + "05H00", + "05H15", + "05H30", + "05H45", + "06H00", + "06H15", + "06H30", + "06H45", + "07H00", + "07H15", + "07H30", + "07H45", + "08H00", + "08H15", + "08H30", + "08H45", + "09H00", + "09H15", + "09H30", + "09H45", + "10H00", + "10H15", + "10H30", + "10H45", + "11H00", + "11H15", + "11H30", + "11H45", + "12H00", + "12H15", + "12H30", + "12H45", + "13H00", + "13H15", + "13H30", + "13H45", + "14H00", + "14H15", + "14H30", + "14H45", + "15H00", + "15H15", + "15H30", + "15H45", + "16H00", + "16H15", + "16H30", + "16H45", + "17H00", + "17H15", + "17H30", + "17H45", + "18H00", + "18H15", + "18H30", + "18H45", + "19H00", + "19H15", + "19H30", + "19H45", + "20H00", + "20H15", + "20H30", + "20H45", + "21H00", + "21H15", + "21H30", + "21H45", + "22H00", + "22H15", + "22H30", + "22H45", + "23H00", + "23H15", + "23H30", + "23H45", + "ISCLOSED", + "NOTWORK", + "OTHER", + "WORK", + "HOME", + "CLIENT" + ], + "responses": [ + { + "response": { + "name": "WEEKLYPLANNER" + } + }, + { + "response": { + "name": "DATES" + } + }, + { + "response": { + "name": "DATES_STARTED" + } + }, + { + "response": { + "name": "00H00" + } + }, + { + "response": { + "name": "00H15" + } + }, + { + "response": { + "name": "00H30" + } + }, + { + "response": { + "name": "00H45" + } + }, + { + "response": { + "name": "01H00" + } + }, + { + "response": { + "name": "01H15" + } + }, + { + "response": { + "name": "01H30" + } + }, + { + "response": { + "name": "01H45" + } + }, + { + "response": { + "name": "02H00" + } + }, + { + "response": { + "name": "02H15" + } + }, + { + "response": { + "name": "02H30" + } + }, + { + "response": { + "name": "02H45" + } + }, + { + "response": { + "name": "03H00" + } + }, + { + "response": { + "name": "03H15" + } + }, + { + "response": { + "name": "03H30" + } + }, + { + "response": { + "name": "03H45" + } + }, + { + "response": { + "name": "04H00" + } + }, + { + "response": { + "name": "04H15" + } + }, + { + "response": { + "name": "04H30" + } + }, + { + "response": { + "name": "04H45" + } + }, + { + "response": { + "name": "05H00" + } + }, + { + "response": { + "name": "05H15" + } + }, + { + "response": { + "name": "05H30" + } + }, + { + "response": { + "name": "05H45" + } + }, + { + "response": { + "name": "06H00" + } + }, + { + "response": { + "name": "06H15" + } + }, + { + "response": { + "name": "06H30" + } + }, + { + "response": { + "name": "06H5" + } + }, + { + "response": { + "name": "07H00" + } + }, + { + "response": { + "name": "07H15" + } + }, + { + "response": { + "name": "07H30" + } + }, + { + "response": { + "name": "07H45" + } + }, + { + "response": { + "name": "08H00" + } + }, + { + "response": { + "name": "08H15" + } + }, + { + "response": { + "name": "08H30" + } + }, + { + "response": { + "name": "08H45" + } + }, + { + "response": { + "name": "09H00" + } + }, + { + "response": { + "name": "09H15" + } + }, + { + "response": { + "name": "09H30" + } + }, + { + "response": { + "name": "09H45" + } + }, + { + "response": { + "name": "10H00" + } + }, + { + "response": { + "name": "10H15" + } + }, + { + "response": { + "name": "10H30" + } + }, + { + "response": { + "name": "10H45" + } + }, + { + "response": { + "name": "11H00" + } + }, + { + "response": { + "name": "11H15" + } + }, + { + "response": { + "name": "11H30" + } + }, + { + "response": { + "name": "11H45" + } + }, + { + "response": { + "name": "12H00" + } + }, + { + "response": { + "name": "12H15" + } + }, + { + "response": { + "name": "12H30" + } + }, + { + "response": { + "name": "12H45" + } + }, + { + "response": { + "name": "13H00" + } + }, + { + "response": { + "name": "13H15" + } + }, + { + "response": { + "name": "13H30" + } + }, + { + "response": { + "name": "13H45" + } + }, + { + "response": { + "name": "14H00" + } + }, + { + "response": { + "name": "14H15" + } + }, + { + "response": { + "name": "14H30" + } + }, + { + "response": { + "name": "14H45" + } + }, + { + "response": { + "name": "15H00" + } + }, + { + "response": { + "name": "15H15" + } + }, + { + "response": { + "name": "15H30" + } + }, + { + "response": { + "name": "15H45" + } + }, + { + "response": { + "name": "16H00" + } + }, + { + "response": { + "name": "16H15" + } + }, + { + "response": { + "name": "16H30" + } + }, + { + "response": { + "name": "16H45" + } + }, + { + "response": { + "name": "17H00" + } + }, + { + "response": { + "name": "17H15" + } + }, + { + "response": { + "name": "17H30" + } + }, + { + "response": { + "name": "17H45" + } + }, + { + "response": { + "name": "18H00" + } + }, + { + "response": { + "name": "18H15" + } + }, + { + "response": { + "name": "18H30" + } + }, + { + "response": { + "name": "18H45" + } + }, + { + "response": { + "name": "19H00" + } + }, + { + "response": { + "name": "19H15" + } + }, + { + "response": { + "name": "19H30" + } + }, + { + "response": { + "name": "19H45" + } + }, + { + "response": { + "name": "20H00" + } + }, + { + "response": { + "name": "20H15" + } + }, + { + "response": { + "name": "20H30" + } + }, + { + "response": { + "name": "20H45" + } + }, + { + "response": { + "name": "21H00" + } + }, + { + "response": { + "name": "21H15" + } + }, + { + "response": { + "name": "21H30" + } + }, + { + "response": { + "name": "21H45" + } + }, + { + "response": { + "name": "22H00" + } + }, + { + "response": { + "name": "22H15" + } + }, + { + "response": { + "name": "22H30" + } + }, + { + "response": { + "name": "22H45" + } + }, + { + "response": { + "name": "23H00" + } + }, + { + "response": { + "name": "23H15" + } + }, + { + "response": { + "name": "23H30" + } + }, + { + "response": { + "name": "23H45" + } + }, + { + "response": { + "name": "NOTWORK" + } + }, + { + "response": { + "name": "OTHER" + } + }, + { + "response": { + "name": "WORK" + } + }, + { + "response": { + "name": "HOME" + } + }, + { + "response": { + "name": "CLIENT" + } + } + ], + "hierarchy": { + "sequence": { + "id": "sequence_1", + "page": "1" + } + }, + "conditionFilter": { + "value": "true" + }, + "id": "weeklyplanner_value", + "page": "3", + "mandatory": false, + "title": "Planning de votre semaine", + "workSumLabel": "Durée totale travaillée : ", + "presentButtonLabel": "Continuer", + "futureButtonLabel": "Commencer", + "placeWork": { + "bindingDependencies": ["NOTWORK", "OTHER", "WORK", "HOME", "CLIENT"], + "responses": [ + { + "response": { + "name": "WORK" + }, + "id": "1", + "label": "Sur mon site de travail habituel (hors domicile) / dans mon établissement." + }, + { + "response": { + "name": "HOME" + }, + "id": "2", + "label": "À domicile" + }, + { + "response": { + "name": "CLIENT" + }, + "id": "3", + "label": "Chez des clients, livraisons, déplacement..." + }, + { + "response": { + "name": "OTHER" + }, + "id": "4", + "label": "Autre situation" + }, + { + "response": { + "name": "NOTWORK" + }, + "id": "5", + "label": "Non travaillé" + } + ], + "label": "Où avez-vous travaillé" + } + }, + { + "componentType": "CheckboxGroupEdt", + "bindingDependencies": ["NOTWORK", "OTHER", "WORK", "HOME", "CLIENT"], + "responses": [ + { + "response": { + "name": "NOTWORK" + }, + "id": "1", + "label": "Non travaillé" + }, + { + "response": { + "name": "WORK" + }, + "id": "2", + "label": "Site travaille" + }, + { + "response": { + "name": "HOME" + }, + "id": "3", + "label": "À domicile" + }, + { + "response": { + "name": "CLIENT" + }, + "id": "4", + "label": "Chez client" + }, + { + "response": { + "name": "OTHER" + }, + "id": "5", + "label": "Autre situation" + } + ], + "hierarchy": { + "sequence": { + "id": "sequence_1", + "page": "1" + } + }, + "conditionFilter": { + "value": "true" + }, + "id": "checkboxgroup_placework", + "page": "3.1", + "label": "\"Où avez-vous travaillé \"", + "mandatory": false + } + ], + "variables": [ + { + "variableType": "COLLECTED", + "values": { + "COLLECTED": [null], + "EDITED": [null], + "INPUTED": [null], + "FORCED": [null], + "PREVIOUS": [null] + }, + "name": "NOTWORK", + "componentRef": "checkboxgroup_placework" + }, + { + "variableType": "COLLECTED", + "values": { + "COLLECTED": [null], + "EDITED": [null], + "INPUTED": [null], + "FORCED": [null], + "PREVIOUS": [null] + }, + "name": "OTHER", + "componentRef": "checkboxgroup_placework" + }, + { + "variableType": "COLLECTED", + "values": { + "COLLECTED": [null], + "EDITED": [null], + "INPUTED": [null], + "FORCED": [null], + "PREVIOUS": [null] + }, + "name": "CLIENT", + "componentRef": "checkboxgroup_placework" + }, + { + "variableType": "COLLECTED", + "values": { + "COLLECTED": [null], + "EDITED": [null], + "INPUTED": [null], + "FORCED": [null], + "PREVIOUS": [null] + }, + "name": "HOME", + "componentRef": "checkboxgroup_placework" + }, + { + "variableType": "COLLECTED", + "values": { + "COLLECTED": [null], + "EDITED": [null], + "INPUTED": [null], + "FORCED": [null], + "PREVIOUS": [null] + }, + "name": "WORK", + "componentRef": "checkboxgroup_placework" + } + ] +}