From e2ecb43574882ac1d5720dcc628fbaa9a3a7d2c0 Mon Sep 17 00:00:00 2001 From: MailineN Date: Sat, 10 Aug 2024 14:31:14 +0200 Subject: [PATCH] chore: cleanup & edit survey model to add "S_" prefix by default --- .../surveyData/dataEmptyWeeklyPlanner.json | 199 ++-- src/assets/surveyData/edtWorkTimeSurvey.json | 966 +++++------------- .../activity-location/ActivityLocation.tsx | 2 +- .../activity/main-activity/MainActivity.tsx | 2 +- .../weekly-planner/WeeklyPlanner.tsx | 6 +- src/service/api-service/getRemoteData.ts | 10 +- src/service/api-service/putRemoteData.ts | 14 +- src/service/navigation-service.ts | 1 - src/service/survey-service.ts | 7 +- src/utils/utils.ts | 51 +- 10 files changed, 406 insertions(+), 852 deletions(-) diff --git a/src/assets/surveyData/dataEmptyWeeklyPlanner.json b/src/assets/surveyData/dataEmptyWeeklyPlanner.json index 6514f41e..57173d38 100644 --- a/src/assets/surveyData/dataEmptyWeeklyPlanner.json +++ b/src/assets/surveyData/dataEmptyWeeklyPlanner.json @@ -34,672 +34,672 @@ "PREVIOUS": null, "COLLECTED": null }, - "00H00": { + "S_00H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "00H15": { + "S_00H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "00H30": { + "S_00H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "00H45": { + "S_00H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "01H00": { + "S_01H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "01H15": { + "S_01H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "01H30": { + "S_01H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "01H45": { + "S_01H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "02H00": { + "S_02H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "02H15": { + "S_02H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "02H30": { + "S_02H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "02H45": { + "S_02H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "03H00": { + "S_03H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "03H15": { + "S_03H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "03H30": { + "S_03H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "03H45": { + "S_03H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "04H00": { + "S_04H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "04H15": { + "S_04H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "04H30": { + "S_04H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "04H45": { + "S_04H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "05H00": { + "S_05H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "05H15": { + "S_05H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "05H30": { + "S_05H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "05H45": { + "S_05H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "06H00": { + "S_06H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "06H15": { + "S_06H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "06H30": { + "S_06H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "06H45": { + "S_06H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "07H00": { + "S_07H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "07H15": { + "S_07H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "07H30": { + "S_07H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "07H45": { + "S_07H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "08H00": { + "S_08H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "08H15": { + "S_08H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "08H30": { + "S_08H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "08H45": { + "S_08H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "09H00": { + "S_09H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "09H15": { + "S_09H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "09H30": { + "S_09H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "09H45": { + "S_09H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "10H00": { + "S_10H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "10H15": { + "S_10H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "10H30": { + "S_10H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "10H45": { + "S_10H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "11H00": { + "S_11H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "11H15": { + "S_11H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "11H30": { + "S_11H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "11H45": { + "S_11H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "12H00": { + "S_12H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "12H15": { + "S_12H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "12H30": { + "S_12H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "12H45": { + "S_12H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "13H00": { + "S_13H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "13H15": { + "S_13H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "13H30": { + "S_13H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "13H45": { + "S_13H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "14H00": { + "S_14H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "14H15": { + "S_14H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "14H30": { + "S_14H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "14H45": { + "S_14H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "15H00": { + "S_15H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "15H15": { + "S_15H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "15H30": { + "S_15H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "15H45": { + "S_15H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "16H00": { + "S_16H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "16H15": { + "S_16H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "16H30": { + "S_16H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "16H45": { + "S_16H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "17H00": { + "S_17H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "17H15": { + "S_17H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "17H30": { + "S_17H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "17H45": { + "S_17H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "18H00": { + "S_18H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "18H15": { + "S_18H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "18H30": { + "S_18H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "18H45": { + "S_18H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "19H00": { + "S_19H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "19H15": { + "S_19H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "19H30": { + "S_19H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "19H45": { + "S_19H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "20H00": { + "S_20H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "20H15": { + "S_20H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "20H30": { + "S_20H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "20H45": { + "S_20H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "21H00": { + "S_21H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "21H15": { + "S_21H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "21H30": { + "S_21H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "21H45": { + "S_21H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "22H00": { + "S_22H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "22H15": { + "S_22H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "22H30": { + "S_22H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "22H45": { + "S_22H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "23H00": { + "S_23H00": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "23H15": { + "S_23H15": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "23H30": { + "S_23H30": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], "INPUTED": [null], "PREVIOUS": [null] }, - "23H45": { + "S_23H45": { "COLLECTED": [null], "EDITED": [null], "FORCED": [null], @@ -727,13 +727,6 @@ "PREVIOUS": null, "COLLECTED": null }, - "ISVALIDATED": { - "EDITED": null, - "FORCED": null, - "INPUTED": null, - "PREVIOUS": null, - "COLLECTED": null - }, "ISLOCKED": { "EDITED": null, "FORCED": null, diff --git a/src/assets/surveyData/edtWorkTimeSurvey.json b/src/assets/surveyData/edtWorkTimeSurvey.json index 3757d900..3be0e35d 100644 --- a/src/assets/surveyData/edtWorkTimeSurvey.json +++ b/src/assets/surveyData/edtWorkTimeSurvey.json @@ -69,474 +69,6 @@ "name": "DATES_STARTED", "componentRef": "weeklyplanner_value" }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null, null, null, null, null, null, null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "00H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null, null, null, null, null, null, null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "00H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null, null, null, null, null, null, null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "00H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null, null, null, null, null, null, null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "00H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "01H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "01H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "01H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "01H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "02H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "02H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "02H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "02H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "03H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "03H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "03H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "03H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "04H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "04H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "04H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "04H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "05H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "05H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "05H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "05H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "06H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "06H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "06H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "06H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "07H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "07H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "07H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "07H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "08H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "08H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "08H30", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "08H45", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "09H00", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "09H15", - "componentRef": "weeklyplanner_value" - }, - { - "variableType": "COLLECTED", - "values": { - "COLLECTED": [null], - "EDITED": [null], - "INPUTED": [null], - "FORCED": [null], - "PREVIOUS": [null] - }, - "name": "09H30", - "componentRef": "weeklyplanner_value" - }, { "variableType": "COLLECTED", "values": { @@ -546,7 +78,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "09H45", + "name": "S_11H45", "componentRef": "weeklyplanner_value" }, { @@ -558,7 +90,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "10H00", + "name": "S_12H00", "componentRef": "weeklyplanner_value" }, { @@ -570,7 +102,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "10H15", + "name": "S_12H15", "componentRef": "weeklyplanner_value" }, { @@ -582,7 +114,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "10H30", + "name": "S_12H30", "componentRef": "weeklyplanner_value" }, { @@ -594,7 +126,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "10H45", + "name": "S_12H45", "componentRef": "weeklyplanner_value" }, { @@ -606,7 +138,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "11H00", + "name": "S_13H00", "componentRef": "weeklyplanner_value" }, { @@ -618,7 +150,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "11H15", + "name": "S_13H15", "componentRef": "weeklyplanner_value" }, { @@ -630,7 +162,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "11H30", + "name": "S_13H30", "componentRef": "weeklyplanner_value" }, { @@ -642,7 +174,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "11H45", + "name": "S_11H45", "componentRef": "weeklyplanner_value" }, { @@ -654,7 +186,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "12H00", + "name": "S_12H00", "componentRef": "weeklyplanner_value" }, { @@ -666,7 +198,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "12H15", + "name": "S_12H15", "componentRef": "weeklyplanner_value" }, { @@ -678,7 +210,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "12H30", + "name": "S_12H30", "componentRef": "weeklyplanner_value" }, { @@ -690,7 +222,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "12H45", + "name": "S_12H45", "componentRef": "weeklyplanner_value" }, { @@ -702,7 +234,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "13H00", + "name": "S_13H00", "componentRef": "weeklyplanner_value" }, { @@ -714,7 +246,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "13H15", + "name": "S_13H15", "componentRef": "weeklyplanner_value" }, { @@ -726,7 +258,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "13H30", + "name": "S_13H30", "componentRef": "weeklyplanner_value" }, { @@ -738,7 +270,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "13H45", + "name": "S_13H45", "componentRef": "weeklyplanner_value" }, { @@ -750,7 +282,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "14H00", + "name": "S_14H00", "componentRef": "weeklyplanner_value" }, { @@ -762,7 +294,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "14H15", + "name": "S_14H15", "componentRef": "weeklyplanner_value" }, { @@ -774,7 +306,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "14H30", + "name": "S_14H30", "componentRef": "weeklyplanner_value" }, { @@ -786,7 +318,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "14H45", + "name": "S_14H45", "componentRef": "weeklyplanner_value" }, { @@ -798,7 +330,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "15H00", + "name": "S_15H00", "componentRef": "weeklyplanner_value" }, { @@ -810,7 +342,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "15H15", + "name": "S_15H15", "componentRef": "weeklyplanner_value" }, { @@ -822,7 +354,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "15H30", + "name": "S_15H30", "componentRef": "weeklyplanner_value" }, { @@ -834,7 +366,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "15H45", + "name": "S_15H45", "componentRef": "weeklyplanner_value" }, { @@ -846,7 +378,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "16H00", + "name": "S_16H00", "componentRef": "weeklyplanner_value" }, { @@ -858,7 +390,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "16H15", + "name": "S_16H15", "componentRef": "weeklyplanner_value" }, { @@ -870,7 +402,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "16H30", + "name": "S_16H30", "componentRef": "weeklyplanner_value" }, { @@ -882,7 +414,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "16H45", + "name": "S_16H45", "componentRef": "weeklyplanner_value" }, { @@ -894,7 +426,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "17H00", + "name": "S_17H00", "componentRef": "weeklyplanner_value" }, { @@ -906,7 +438,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "17H15", + "name": "S_17H15", "componentRef": "weeklyplanner_value" }, { @@ -918,7 +450,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "17H30", + "name": "S_17H30", "componentRef": "weeklyplanner_value" }, { @@ -930,7 +462,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "17H45", + "name": "S_17H45", "componentRef": "weeklyplanner_value" }, { @@ -942,7 +474,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "18H00", + "name": "S_18H00", "componentRef": "weeklyplanner_value" }, { @@ -954,7 +486,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "18H15", + "name": "S_18H15", "componentRef": "weeklyplanner_value" }, { @@ -966,7 +498,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "18H30", + "name": "S_18H30", "componentRef": "weeklyplanner_value" }, { @@ -978,7 +510,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "18H45", + "name": "S_18H45", "componentRef": "weeklyplanner_value" }, { @@ -990,7 +522,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "19H00", + "name": "S_19H00", "componentRef": "weeklyplanner_value" }, { @@ -1002,7 +534,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "19H15", + "name": "S_19H15", "componentRef": "weeklyplanner_value" }, { @@ -1014,7 +546,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "19H30", + "name": "S_19H30", "componentRef": "weeklyplanner_value" }, { @@ -1026,7 +558,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "19H45", + "name": "S_19H45", "componentRef": "weeklyplanner_value" }, { @@ -1038,7 +570,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "20H00", + "name": "S_20H00", "componentRef": "weeklyplanner_value" }, { @@ -1050,7 +582,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "20H15", + "name": "S_20H15", "componentRef": "weeklyplanner_value" }, { @@ -1062,7 +594,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "20H30", + "name": "S_20H30", "componentRef": "weeklyplanner_value" }, { @@ -1074,7 +606,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "20H45", + "name": "S_20H45", "componentRef": "weeklyplanner_value" }, { @@ -1086,7 +618,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "21H00", + "name": "S_21H00", "componentRef": "weeklyplanner_value" }, { @@ -1098,7 +630,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "21H15", + "name": "S_21H15", "componentRef": "weeklyplanner_value" }, { @@ -1110,7 +642,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "21H30", + "name": "S_21H30", "componentRef": "weeklyplanner_value" }, { @@ -1122,7 +654,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "21H45", + "name": "S_21H45", "componentRef": "weeklyplanner_value" }, { @@ -1134,7 +666,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "22H00", + "name": "S_22H00", "componentRef": "weeklyplanner_value" }, { @@ -1146,7 +678,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "22H15", + "name": "S_22H15", "componentRef": "weeklyplanner_value" }, { @@ -1158,7 +690,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "22H30", + "name": "S_22H30", "componentRef": "weeklyplanner_value" }, { @@ -1170,7 +702,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "22H45", + "name": "S_22H45", "componentRef": "weeklyplanner_value" }, { @@ -1182,7 +714,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "23H00", + "name": "S_23H00", "componentRef": "weeklyplanner_value" }, { @@ -1194,7 +726,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "23H15", + "name": "S_23H15", "componentRef": "weeklyplanner_value" }, { @@ -1206,7 +738,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "23H30", + "name": "S_23H30", "componentRef": "weeklyplanner_value" }, { @@ -1218,7 +750,7 @@ "FORCED": [null], "PREVIOUS": [null] }, - "name": "23H45", + "name": "S_23H45", "componentRef": "weeklyplanner_value" }, { @@ -1439,102 +971,102 @@ "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", + "S_00H00", + "S_00H15", + "S_00H30", + "S_00H45", + "S_01H00", + "S_01H15", + "S_01H30", + "S_01H45", + "S_02H00", + "S_02H15", + "S_02H30", + "S_02H45", + "S_03H00", + "S_03H15", + "S_03H30", + "S_03H45", + "S_04H00", + "S_04H15", + "S_04H30", + "S_04H45", + "S_05H00", + "S_05H15", + "S_05H30", + "S_05H45", + "S_06H00", + "S_06H15", + "S_06H30", + "S_06H45", + "S_07H00", + "S_07H15", + "S_07H30", + "S_07H45", + "S_08H00", + "S_08H15", + "S_08H30", + "S_08H45", + "S_09H00", + "S_09H15", + "S_09H30", + "S_09H45", + "S_10H00", + "S_10H15", + "S_10H30", + "S_10H45", + "S_11H00", + "S_11H15", + "S_11H30", + "S_11H45", + "S_12H00", + "S_12H15", + "S_12H30", + "S_12H45", + "S_13H00", + "S_13H15", + "S_13H30", + "S_13H45", + "S_14H00", + "S_14H15", + "S_14H30", + "S_14H45", + "S_15H00", + "S_15H15", + "S_15H30", + "S_15H45", + "S_16H00", + "S_16H15", + "S_16H30", + "S_16H45", + "S_17H00", + "S_17H15", + "S_17H30", + "S_17H45", + "S_18H00", + "S_18H15", + "S_18H30", + "S_18H45", + "S_19H00", + "S_19H15", + "S_19H30", + "S_19H45", + "S_20H00", + "S_20H15", + "S_20H30", + "S_20H45", + "S_21H00", + "S_21H15", + "S_21H30", + "S_21H45", + "S_22H00", + "S_22H15", + "S_22H30", + "S_22H45", + "S_23H00", + "S_23H15", + "S_23H30", + "S_23H45", "ISCLOSED", "NOTWORK", "OTHER", @@ -1560,482 +1092,482 @@ }, { "response": { - "name": "00H00" + "name": "S_00H00" } }, { "response": { - "name": "00H15" + "name": "S_00H15" } }, { "response": { - "name": "00H30" + "name": "S_00H30" } }, { "response": { - "name": "00H45" + "name": "S_00H45" } }, { "response": { - "name": "01H00" + "name": "S_01H00" } }, { "response": { - "name": "01H15" + "name": "S_01H15" } }, { "response": { - "name": "01H30" + "name": "S_01H30" } }, { "response": { - "name": "01H45" + "name": "S_01H45" } }, { "response": { - "name": "02H00" + "name": "S_02H00" } }, { "response": { - "name": "02H15" + "name": "S_02H15" } }, { "response": { - "name": "02H30" + "name": "S_02H30" } }, { "response": { - "name": "02H45" + "name": "S_02H45" } }, { "response": { - "name": "03H00" + "name": "S_03H00" } }, { "response": { - "name": "03H15" + "name": "S_03H15" } }, { "response": { - "name": "03H30" + "name": "S_03H30" } }, { "response": { - "name": "03H45" + "name": "S_03H45" } }, { "response": { - "name": "04H00" + "name": "S_04H00" } }, { "response": { - "name": "04H15" + "name": "S_04H15" } }, { "response": { - "name": "04H30" + "name": "S_04H30" } }, { "response": { - "name": "04H45" + "name": "S_04H45" } }, { "response": { - "name": "05H00" + "name": "S_05H00" } }, { "response": { - "name": "05H15" + "name": "S_05H15" } }, { "response": { - "name": "05H30" + "name": "S_05H30" } }, { "response": { - "name": "05H45" + "name": "S_05H45" } }, { "response": { - "name": "06H00" + "name": "S_06H00" } }, { "response": { - "name": "06H15" + "name": "S_06H15" } }, { "response": { - "name": "06H30" + "name": "S_06H30" } }, { "response": { - "name": "06H5" + "name": "S_06H5" } }, { "response": { - "name": "07H00" + "name": "S_07H00" } }, { "response": { - "name": "07H15" + "name": "S_07H15" } }, { "response": { - "name": "07H30" + "name": "S_07H30" } }, { "response": { - "name": "07H45" + "name": "S_07H45" } }, { "response": { - "name": "08H00" + "name": "S_08H00" } }, { "response": { - "name": "08H15" + "name": "S_08H15" } }, { "response": { - "name": "08H30" + "name": "S_08H30" } }, { "response": { - "name": "08H45" + "name": "S_08H45" } }, { "response": { - "name": "09H00" + "name": "S_09H00" } }, { "response": { - "name": "09H15" + "name": "S_09H15" } }, { "response": { - "name": "09H30" + "name": "S_09H30" } }, { "response": { - "name": "09H45" + "name": "S_09H45" } }, { "response": { - "name": "10H00" + "name": "S_10H00" } }, { "response": { - "name": "10H15" + "name": "S_10H15" } }, { "response": { - "name": "10H30" + "name": "S_10H30" } }, { "response": { - "name": "10H45" + "name": "S_10H45" } }, { "response": { - "name": "11H00" + "name": "S_11H00" } }, { "response": { - "name": "11H15" + "name": "S_11H15" } }, { "response": { - "name": "11H30" + "name": "S_11H30" } }, { "response": { - "name": "11H45" + "name": "S_11H45" } }, { "response": { - "name": "12H00" + "name": "S_12H00" } }, { "response": { - "name": "12H15" + "name": "S_12H15" } }, { "response": { - "name": "12H30" + "name": "S_12H30" } }, { "response": { - "name": "12H45" + "name": "S_12H45" } }, { "response": { - "name": "13H00" + "name": "S_13H00" } }, { "response": { - "name": "13H15" + "name": "S_13H15" } }, { "response": { - "name": "13H30" + "name": "S_13H30" } }, { "response": { - "name": "13H45" + "name": "S_13H45" } }, { "response": { - "name": "14H00" + "name": "S_14H00" } }, { "response": { - "name": "14H15" + "name": "S_14H15" } }, { "response": { - "name": "14H30" + "name": "S_14H30" } }, { "response": { - "name": "14H45" + "name": "S_14H45" } }, { "response": { - "name": "15H00" + "name": "S_15H00" } }, { "response": { - "name": "15H15" + "name": "S_15H15" } }, { "response": { - "name": "15H30" + "name": "S_15H30" } }, { "response": { - "name": "15H45" + "name": "S_15H45" } }, { "response": { - "name": "16H00" + "name": "S_16H00" } }, { "response": { - "name": "16H15" + "name": "S_16H15" } }, { "response": { - "name": "16H30" + "name": "S_16H30" } }, { "response": { - "name": "16H45" + "name": "S_16H45" } }, { "response": { - "name": "17H00" + "name": "S_17H00" } }, { "response": { - "name": "17H15" + "name": "S_17H15" } }, { "response": { - "name": "17H30" + "name": "S_17H30" } }, { "response": { - "name": "17H45" + "name": "S_17H45" } }, { "response": { - "name": "18H00" + "name": "S_18H00" } }, { "response": { - "name": "18H15" + "name": "S_18H15" } }, { "response": { - "name": "18H30" + "name": "S_18H30" } }, { "response": { - "name": "18H45" + "name": "S_18H45" } }, { "response": { - "name": "19H00" + "name": "S_19H00" } }, { "response": { - "name": "19H15" + "name": "S_19H15" } }, { "response": { - "name": "19H30" + "name": "S_19H30" } }, { "response": { - "name": "19H45" + "name": "S_19H45" } }, { "response": { - "name": "20H00" + "name": "S_20H00" } }, { "response": { - "name": "20H15" + "name": "S_20H15" } }, { "response": { - "name": "20H30" + "name": "S_20H30" } }, { "response": { - "name": "20H45" + "name": "S_20H45" } }, { "response": { - "name": "21H00" + "name": "S_21H00" } }, { "response": { - "name": "21H15" + "name": "S_21H15" } }, { "response": { - "name": "21H30" + "name": "S_21H30" } }, { "response": { - "name": "21H45" + "name": "S_21H45" } }, { "response": { - "name": "22H00" + "name": "S_22H00" } }, { "response": { - "name": "22H15" + "name": "S_22H15" } }, { "response": { - "name": "22H30" + "name": "S_22H30" } }, { "response": { - "name": "22H45" + "name": "S_22H45" } }, { "response": { - "name": "23H00" + "name": "S_23H00" } }, { "response": { - "name": "23H15" + "name": "S_23H15" } }, { "response": { - "name": "23H30" + "name": "S_23H30" } }, { "response": { - "name": "23H45" + "name": "S_23H45" } }, { diff --git a/src/pages/activity/activity-or-route-planner/activity/activity-location/ActivityLocation.tsx b/src/pages/activity/activity-or-route-planner/activity/activity-location/ActivityLocation.tsx index 5c1aa16b..11cfba99 100644 --- a/src/pages/activity/activity-or-route-planner/activity/activity-location/ActivityLocation.tsx +++ b/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 ( { }, 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( diff --git a/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx b/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx index 30f5962e..99a81262 100644 --- a/src/pages/work-time/weekly-planner/WeeklyPlanner.tsx +++ b/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 = () => { validateAndNav(), [displayDayOverview])} - onNavigateBack={useCallback(() => validateAndNav(), [displayDayOverview])} + onNavigateBack={useCallback(() => saveAndNavLocally(idSurvey), [displayDayOverview])} onPrevious={useCallback(() => saveAndNavLocally(idSurvey), [])} onEdit={useCallback(() => onEdit(), [])} onHelp={onHelp} diff --git a/src/service/api-service/getRemoteData.ts b/src/service/api-service/getRemoteData.ts index 000ab213..2355efd9 100644 --- a/src/service/api-service/getRemoteData.ts +++ b/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 => { return new Promise(resolve => { axios diff --git a/src/service/api-service/putRemoteData.ts b/src/service/api-service/putRemoteData.ts index 2e5c2139..cb1c5ca8 100644 --- a/src/service/api-service/putRemoteData.ts +++ b/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 => { + 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 => { + console.log("requestPutDataReviewer", data); data.COLLECTED = transformCollectedArray(data?.COLLECTED); delete data.COLLECTED?.WEEKLYPLANNER; return new Promise(resolve => { diff --git a/src/service/navigation-service.ts b/src/service/navigation-service.ts index b9edab39..274d05fd 100644 --- a/src/service/navigation-service.ts +++ b/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 => { - console.log("validate"); return saveData(idSurvey, _callbackHolder.getData() ?? getData(idSurvey), true).then(() => { return saveData(idSurvey, _callbackHolder.getData() ?? getData(idSurvey), false); }); diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts index ad6c5666..22a37fa1 100644 --- a/src/service/survey-service.ts +++ b/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); diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 1f42a2e1..32ba76ff 100644 --- a/src/utils/utils.ts +++ b/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, };