-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Prepop with Latest Main (#1141)
* Make response expiry date mandatory (#1104) * Bind additional contexts to flush requests (#1108) * Schemas v3.56.0 (#1110) * Schemas v3.57.0 (#1113) * Schemas v3.57.1 (#1115) * Schemas v3.58.0 (#1116) * Implement "progress" value source (#1044) Co-authored-by: Rhys Berrow <[email protected] * Fix handling of invalid values in form numerical inputs (#1111) * Update Chromedriver to version 113 (#1118) * update chromedriver * temporarily comment out line, to be fixed separately * Feat/Grand calculated summary (#1107) * initial ideas * Implementation closer to calculated summaries * better test schemas and routing evaluation * get routing working * dont need section id * make routing better, start adding tests * start fixing test schemas * Two further schema fixes * Fix remaining schema issue * Add integration test * Add functional test * Functional tests for routing and answers not on the path * Changing an answer updates GCS progress * Add schema for overlapping answers * Functionally test skip-question in grand calculated summary * Add tests for GCS routing * Fix errors caused by merge * type hints, comments, remove some duplication * fix formatting * Update translation templates * remove accidental update * Fix some type hints * Use validator branch and update test description * refactor GCS answer format * Fix lint and test errors * Address PR comments * improve context and coverage of test schemas * Fix invalid schema and add invalid routing test * Fix line length in test * test schema linting * Fix routing bug * Make schema easier to follow * Linting * partial fix to routing * Add addtional routing test case * Remove arg from new test case * Routing to next incomplete block for summaries * linting error * remove arg from router tests * PR comments * PR Comment * Amend comment and improve dependencies function * Handle merge errors * fix gcs routing within same section * Add test for GCS with progress value source * Remove backtick * update chromedriver * Revert "update chromedriver" This reverts commit a2e3698. * Fix schema labels * Revert validator branch to latest * Fix dynamic answers functional test (#1121) * Schemas v3.59.0 (#1130) * Schemas v3.60.0 (#1133) * Update to chromedriver v114 (#1134) * Add DESNZ theme (#1131) * Schemas v3.61.0 (#1139) * Linting, formatting and cleaning up merge with main --------- Co-authored-by: petechd <[email protected]> Co-authored-by: Mebin Abraham <[email protected]> Co-authored-by: Guilhem <[email protected]> Co-authored-by: Katie Gardner_ONS <[email protected]> Co-authored-by: Rhys Berrow <[email protected]>
- Loading branch information
6 people
authored
Jun 16, 2023
1 parent
1a48972
commit 679c304
Showing
13 changed files
with
400 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v3.60.0 | ||
| v3.61.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| { | ||
| "mime_type": "application/json/ons/eq", | ||
| "language": "en", | ||
| "schema_version": "0.0.1", | ||
| "data_version": "0.0.3", | ||
| "survey_id": "0", | ||
| "title": "Test Department for Energy Security and Net Zero", | ||
| "theme": "desnz", | ||
| "description": "A questionnaire to demo the DESNZ survey theme", | ||
| "metadata": [ | ||
| { | ||
| "name": "user_id", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "period_id", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "ru_name", | ||
| "type": "string" | ||
| } | ||
| ], | ||
| "questionnaire_flow": { | ||
| "type": "Linear", | ||
| "options": { | ||
| "summary": { | ||
| "collapsible": false | ||
| } | ||
| } | ||
| }, | ||
| "sections": [ | ||
| { | ||
| "id": "section", | ||
| "groups": [ | ||
| { | ||
| "blocks": [ | ||
| { | ||
| "type": "Question", | ||
| "id": "radio", | ||
| "question": { | ||
| "answers": [ | ||
| { | ||
| "id": "radio-answer", | ||
| "mandatory": false, | ||
| "options": [ | ||
| { | ||
| "label": "Bacon", | ||
| "value": "Bacon" | ||
| }, | ||
| { | ||
| "label": "Eggs", | ||
| "value": "Eggs" | ||
| }, | ||
| { | ||
| "label": "Sausage", | ||
| "value": "Sausage" | ||
| } | ||
| ], | ||
| "type": "Radio" | ||
| } | ||
| ], | ||
| "id": "radio-question", | ||
| "title": "What is your favourite breakfast food?", | ||
| "type": "General" | ||
| } | ||
| } | ||
| ], | ||
| "id": "group", | ||
| "title": "DESNZ Theme Test" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| { | ||
| "mime_type": "application/json/ons/eq", | ||
| "language": "en", | ||
| "schema_version": "0.0.1", | ||
| "data_version": "0.0.3", | ||
| "survey_id": "0", | ||
| "title": "Test NI Department for Energy Security and Net Zero", | ||
| "theme": "desnz-ni", | ||
| "description": "A questionnaire to demo the DESNZ-NI survey theme", | ||
| "metadata": [ | ||
| { | ||
| "name": "user_id", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "period_id", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "ru_name", | ||
| "type": "string" | ||
| } | ||
| ], | ||
| "questionnaire_flow": { | ||
| "type": "Linear", | ||
| "options": { | ||
| "summary": { | ||
| "collapsible": false | ||
| } | ||
| } | ||
| }, | ||
| "sections": [ | ||
| { | ||
| "id": "section", | ||
| "groups": [ | ||
| { | ||
| "blocks": [ | ||
| { | ||
| "type": "Question", | ||
| "id": "radio", | ||
| "question": { | ||
| "answers": [ | ||
| { | ||
| "id": "radio-answer", | ||
| "mandatory": false, | ||
| "options": [ | ||
| { | ||
| "label": "Bacon", | ||
| "value": "Bacon" | ||
| }, | ||
| { | ||
| "label": "Eggs", | ||
| "value": "Eggs" | ||
| }, | ||
| { | ||
| "label": "Sausage", | ||
| "value": "Sausage" | ||
| } | ||
| ], | ||
| "type": "Radio" | ||
| } | ||
| ], | ||
| "id": "radio-question", | ||
| "title": "What is your favourite breakfast food?", | ||
| "type": "General" | ||
| } | ||
| } | ||
| ], | ||
| "id": "group", | ||
| "title": "DESNZ-NI Theme Test" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.