Skip to content

Commit

Permalink
Merge pull request #45 from InseeFrLab/feat/sprint19
Browse files Browse the repository at this point in the history
Feat/sprint19
  • Loading branch information
MichaelC67 authored Mar 5, 2024
2 parents fbc439f + 0876f31 commit 44200f1
Show file tree
Hide file tree
Showing 200 changed files with 1,466 additions and 3,881 deletions.
276 changes: 276 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,282 @@ Here a diagram of the flow of orchestrator data

![Orchestrator data flow](./src/documentation/images/orchestrator_flow.png)

#### Examples

**1. Connect with one user surveyer**

![Authentification](./src/documentation/images/auth_interviewer.png)
![HOME](./src/documentation/images/home_interviewer.png)

**2. Create one survey**

Click in one of day one, person one.

![FIRSTNAME PAGE](./src/documentation/images/create_survey_one_interviewer.png)

In this step, the values of variables FIRSTNAME, SURVEYDATE are set in COLLECTED part, EDITED rest empty.

![FIRSTNAME VALUE](./src/documentation/images/create_survey_one_interviewer_value_firstname.png)

**3. Create activity complete**

3.1 - DURATION ACITVITY

![DURATION PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_duration_page.png)

The variables START_TIME and END_TIME are set in first element of array situate in COLLECTED part, EDITED rest empty.

![DURATION START_TIME VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_duration_value_starttime.png)
![DURATION END_TIME VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_duration_value_endtime.png)

3.2 - MAIN ACTIVITY

The variables ACTIVITY_SELECTER_HISTORY, MAINACTIVITY_ID, MAINACTIVITY_SUGGESTERID, MAINACTIVITY_ISFULLYCOMPLETED, MAINACTIVITY_LABEL, GOAL are updated in this step.

![MAIN ACTIVITY CATEGORIES](./src/documentation/images/create_survey_one_interviewer_first_activity_main_activity_categories.png)
![MAIN ACTIVITY SUBCATEGORIES](./src/documentation/images/create_survey_one_interviewer_first_activity_main_activity_subcategories.png)

Selected category "EAT" -> update variables ACTIVITY_SELECTER_HISTORY, MAINACTIVITY_ID, MAINACTIVITY_ISFULLYCOMPLETED in first element of array situate in COLLECTED part.

![ACTIVITY_SELECTER_HISTORY](./src/documentation/images/create_survey_one_interviewer_first_activity_activityselecterhistory_values.png)
![MAINACTIVITY_ID, MAINACTIVITY_ISFULLYCOMPLETED](./src/documentation/images/create_survey_one_interviewer_first_activity_main_activity_values.png)

3.3 - SECONDARY ACTIVITY

3.3.1 WITH SECONDARY ACTIVITY

![WITH SECONDARY ACTIVITY PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_secondaryActivity_page.png)

Select "YES".

The variable WITHSECONDARYACTIVITY are updated first element of array situate in COLLECTED part, EDITED rest empty.

![WITH SECONDARY ACTIVITY VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_withsecondaryActivity_value.png)

3.3.2 SECONDARY ACTIVITY

![SECONDARY ACTIVITY PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withSecondaryActivity_page.png)

Select "Conversation".

The variable SECONDARYACTIVITY are updated with id of value in first element of array situate in COLLECTED part, EDITED rest empty.

![SECONDARY ACTIVITY VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_secondaryActivity_value.png)

3.4 - PLACE

![PLACE PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_place_page.png)

Select "Place of travail and study"

The variable PLACE are updated with id of value in first element of array situate in COLLECTED part, EDITED rest empty.

![PLACE VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_place_value.png)

3.5 - SOMEONE

3.5.1 SOMEONE CHOICE

![WITH SOMEONE PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withsomeone_page.png)

Select "YES"

The variable WITHSOMEONE are updated first element of array situate in COLLECTED part, EDITED rest empty.

![WITH SOMEONE VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_withsomeone_value.png)

3.5.2 SOMEONE

![SOMEONE PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_someone_page.png)

Select "your couple", "your mother, your father".

The variable COUPLE, PARENTS, CHILD, OTHERKNOW, OTHER are updated in first element of array situate in COLLECTED part, EDITED rest empty.

![COUPLE, CHILD VALUES](./src/documentation/images/create_survey_one_interviewer_first_activity_someone_value_1.png)
![PARENTS, OTHER, OTHERKNOW VALUES](./src/documentation/images/create_survey_one_interviewer_first_activity_someone_value_2.png)

3.6 - WITH SCREEN

![WITH SCREEN PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withscreen_page.png)

Select "YES"

The variable WITHSCREEN are updated first element of array situate in COLLECTED part, EDITED rest empty.

![WITH SCREEN VALUE](./src/documentation/images/create_survey_one_interviewer_first_activity_withscreen_page.png)

**4. Create route complete**

4.1 - DURATION ROUTE

![DURATION VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_duration_page.png)

The variables START_TIME and END_TIME are set in second element of array situate in COLLECTED part, EDITED rest empty.

![STARTTIME VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_duration_starttime_value.png)
![ENDTIME VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_duration_endtime_value.png)

3.2 - ROUTE

![ROUTE PAGE](create_survey_one_interviewer_first_route_route_page.png)

Select "route home - work"

The variable ROUTE are updated in second element of array situate in COLLECTED part, EDITED rest empty.

![ROUTE VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_route_value.png)

4.3 - MEAN OF TRANSPORT

![MEANOFTRANSPORT PAGE](./src/documentation/images/create_survey_one_interviewer_first_route_meanOfTransport_page.png)

Select "foot", "bicycle", "private car".

The variableS FOOT, BICYCLE, TWOWHEELSMOTORIZED, PRIVATECAR, OTHERPRIVATE, PUBLIC are updated in second element of array situate in COLLECTED part, EDITED rest empty.

![BICYCLE, FOOT](./src/documentation/images/create_survey_one_interviewer_first_route_meanOfTransport_value_1.png)
![OTHERPRIVATE, PUBLIC, PRIVATECAR, TWOWHEELSMOTORIZED](./src/documentation/images/create_survey_one_interviewer_first_route_meanOfTransport_value_2.png)

4.4 - SECONDARY ACTIVITY

4.4.1 WITH SECONDARY ACTIVITY

![WITH SECONDARY ACTIVITY PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_secondaryActivity_page.png)

Select "YES".

The variable WITHSECONDARYACTIVITY are updated second element of array situate in COLLECTED part, EDITED rest empty.

![WITH SECONDARY ACTIVITY VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_secondaryActivity_value.png)

4.4.2 SECONDARY ACTIVITY

![SECONDARY ACTIVITY PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withSecondaryActivity_page.png)

Select "Conversation".

The variable SECONDARYACTIVITY are updated in second element of array situate in COLLECTED part, EDITED rest empty.

![SECONDARY ACTIVITY VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_secondaryActivity_value_1.png)

4.5 WITH SOMEONE

4.5.1 SOMEONE CHOICE

![WITH SOMEONE PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withsomeone_page.png)

Select "YES".

The variable WITHSOMEONE are updated second element of array situate in COLLECTED part, EDITED rest empty.

![WITH SOMEONE VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_withsomeone_value.png)

4.5.2 SOMEONE

![SOMEONE PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_someone_page.png)

Select "your couple", "other person of household".

The variable COUPLE, PARENTS, CHILD, OTHERKNOW, OTHER are updated in second element of array situate in COLLECTED part, EDITED rest empty.

As we selected COUPLE and OTHERKNOW, these 2 elements are updated with their value, and the rest with a null on the corresponding index.

![CHILD, COUPLE VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_someone_value_1.png)
![PARENTS, OTHER, OTHERKNOW VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_someone_value_2.png)

4.7 WITH SCREEN

![WITH SCREEN PAGE](./src/documentation/images/create_survey_one_interviewer_first_activity_withscreen_page.png)

Select "NO".

The variable WITHSCREEN are updated second element of array situate in COLLECTED part, EDITED rest empty.

![WITH SCREEN VALUE](./src/documentation/images/create_survey_one_interviewer_first_route_screen_value.png)

**5. Create activity - parcial**

5.1 - DURATION ACITVITY

![DURATION PAGE](./src/documentation/images/create_survey_one_interviewer_second_activity_duration_page.png)

The variables START_TIME and END_TIME are set in third element of array situate in COLLECTED part, EDITED rest empty.

The rest of variables aren't updated of size. Ex: variable of main_Activity

![STARTTIME VALUE](./src/documentation/images/create_survey_one_interviewer_second_activity_duration_endtime_value.png)
![ENDTIME VALUE](./src/documentation/images/create_survey_one_interviewer_second_activity_duration_starttime_value.png)
![MAIN_ACTIVITY_ID VALUE](./src/documentation/images/create_survey_one_interviewer_second_activity_main_Activity_value.png)

The variables are updated only in the related component.

**6. Quit step, go to planner**

![PLANNER PAGE](./src/documentation/images/planner_interviewer.png)

**7. Disconnect and connect with one user reviewer**

![HOME REVIEWER](./src/documentation/images/reviewer_home.png)

**8. Get all households**

![HOUSEHOLDS LIST](./src/documentation/images/housheholds_list.png)

**9. Go to household**

![HOUSEHOLD](./src/documentation/images/household_home.png)

**10. Click to first day**

![PLANNER REVIEWR](./src/documentation/images/planner_reviewer.png)

**11. Click last activity**

![MAIN ACTIVITY CATEGORIES PAGE](./src/documentation/images/update_survey_main_activity_categories_page.png)

**12. Select subcategory**

![MAIN ACTIVITY SUBCATEGORIES PAGE](./src/documentation/images/update_survey_main_activity_subcategories_page.png)

**13. Select "SLEEP"**

![MAIN ACTIVITY VALUES](./src/documentation/images/update_survey_main_activity_values.png)

The variables related of component ActivitySelected (component in this page) are updated.
The variables MAINACTIVITY_ID, MAINACTIVITY_ISFULLYCOMPLETED are updated EDITED part, COLLECTED part rest without change. THe value of EDTED part is an array of size equal to the number of surveys. In this case, the index of surveys the type ROUTE are undefined values.

The variables MAINACTIVITY_lABEL and MAINACTIVIY_SUGGESTERID aren't value, so EDITED part is updated with null values.

**14. PLACE PAGE**

Select "Restaurant, coffee, bar".

![PLACE VALUE](./src/documentation/images/update_survey_place_values.png)

The variable PLACE is updated EDITED part, COLLECTED part rest without change. THe value of EDTED part is an array of size equal to the number of surveys. In this case, the index of surveys the type ROUTE are undefined values.

**15. Create new activity**

SET only duration step.

![DURATION PAGE](./src/documentation/images/update_survey_new_activity_duration_page.png)

The variable ENDTIME is updated EDITED part, COLLECTED part rest without change. THe value of EDTED part is an array of size equal to the number of surveys. In this case, EDITED part rest with 4 elements and COLLECTED part reste with 3 elements which are surveys created by the surveyed.

![DURATION ENDTIME VALUE](./src/documentation/images/update_survey_new_activity_duration_endtime_value.png)

**16. QUIT step**

**17. Delete third activity**

All variables update EDITED part by removing third element of array.

Ex: ENDTIME value

The variable ENDTIME is updated EDITED part by removing the ancient third element. COLLECTED rest without change, so always 3 elements which are created by the surveyed.

![DURATION ENDTIME VALUE](./src/documentation/images/update_survey_delete_activity_duration_endtime_value.png)

## Maintenance and evolution

Expand Down
7 changes: 7 additions & 0 deletions config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,12 @@ module.exports = function override(config) {
config.resolve.alias["@emotion/react"] = path.resolve('./node_modules/@emotion/react');
config.resolve.alias["@mui/material"] = path.resolve('./node_modules/@mui/material');
config.resolve.alias["@inseefr/lunatic"] = path.resolve('./node_modules/@inseefr/lunatic');
//config.resolve.plugins = config.resolve.plugins.filter(plugin => !(plugin instanceof ModuleScopePlugin));
const scopePluginIndex = config.resolve.plugins.findIndex(
({ constructor }) => constructor && constructor.name === "ModuleScopePlugin"
);

config.resolve.plugins.splice(scopePluginIndex, 1);

return config;
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "edt",
"version": "3.12.4",
"dateVersion": "20/02/2024",
"version": "3.13.2",
"dateVersion": "05/03/2024",
"licence": "MIT",
"dependencies": {
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@inseefr/lunatic": "2.0.7-v2",
"@inseefrlab/lunatic-edt": "^0.12.1",
"@inseefrlab/lunatic-edt": "^0.12.3",
"@mui/material": "^5.10.7",
"@mui/styles": "^5.12.0",
"@react-pdf/font": "2.2.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/illustration/install/ios/edge1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/illustration/install/ios/edge2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/illustration/install/ios/edge3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/illustration/install/ios/edge4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/illustration/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 44200f1

Please sign in to comment.