diff --git a/fsd_config/form_jsons/hsra/hsra-r1-eligibility.json b/fsd_config/form_jsons/hsra/hsra-r1-eligibility.json index 35c8a742d..d51d98af4 100644 --- a/fsd_config/form_jsons/hsra/hsra-r1-eligibility.json +++ b/fsd_config/form_jsons/hsra/hsra-r1-eligibility.json @@ -1,147 +1,308 @@ { - "metadata": {}, - "startPage": "/eligiblity-start", - "name": "Eligibility Test", - "pages": [ - { - "path": "/eligiblity-start", - "title": "Eligibility", - "components": [ + "metadata": {}, + "startPage": "/check-your-eligibility", + "pages": [ { - "name": "hsyuiX", - "options": {}, - "type": "Html", - "content": "

Tell us if you are eligible

", - "schema": {} - } - ], - "next": [ + "title": "Check your eligibility", + "path": "/check-your-eligibility", + "components": [ + { + "name": "GqJNNZ", + "options": {}, + "type": "Html", + "content": "

we'll ask about:

\n", + "schema": {} + } + ], + "next": [ + { + "path": "/is-your-organisation-based-in-united-kingdom" + } + ], + "controller": "./pages/start.js" + }, { - "path": "/eligibility-1" - } - ], - "controller": "./pages/start.js" - }, - { - "path": "/eligibility-1", - "title": "Eligibility Part 1", - "components": [ + "path": "/is-your-organisation-based-in-united-kingdom", + "title": "Is your organisation based in United Kingdom?", + "components": [ + { + "name": "lHTLBl", + "options": { + "hideTitle": true + }, + "type": "YesNoField", + "title": "Is your organisation based in United Kingdom?", + "schema": {} + } + ], + "next": [ + { + "path": "/will-the-project-take-place-in-united-kingdom", + "condition": "JyKzcX" + }, + { + "path": "/you-are-not-eligible-to-apply-for-this-fund", + "condition": "iQBpls" + } + ], + "section": "mwumLN" + }, { - "name": "areyou", - "options": {}, - "type": "RadiosField", - "title": "Do you think you are eligible?", - "list": "eligiblity-list", - "schema": {} + "title": "Summary", + "path": "/summary", + "controller": "./pages/eligibility.js", + "components": [], + "next": [ + + ] + }, + { + "path": "/will-the-project-take-place-in-united-kingdom", + "title": "Will the project take place in United Kingdom?", + "components": [ + { + "name": "uztZUm", + "options": { + "hideTitle": true + }, + "type": "YesNoField", + "title": "Will the project take place in United Kingdom?", + "schema": {} + } + ], + "next": [ + { + "path": "/you-are-not-eligible-to-apply-for-this-fund", + "condition": "hJfKKX" + }, + { + "path": "/how-is-your-organisation-classified", + "condition": "LdkfPi" + } + ], + "section": "mwumLN" + }, + { + "path": "/you-are-not-eligible-to-apply-for-this-fund", + "title": "You are not eligible to apply for this fund", + "components": [ + { + "name": "KOLAoY", + "options": {}, + "type": "Html", + "content": "

Based on your answers, you do not meet the eligibility criteria for this fund.

", + "schema": {} + } + ], + "next": [] + }, + { + "path": "/how-is-your-organisation-classified", + "title": "How is your organisation classified", + "components": [ + { + "name": "pxXhgq", + "options": { + "hideTitle": true + }, + "type": "SelectField", + "title": "How is your organisation classified", + "list": "cMCKHl", + "values": { + "type": "listRef" + }, + "schema": {} + } + ], + "next": [ + { + "path": "/summary", + "condition": "UzsxpV" + }, + { + "path": "/you-are-not-eligible-to-apply-for-this-fund", + "condition": "sChDtr" + } + ], + "section": "mwumLN" } - ], - "next": [ + ], + "lists": [ { - "path": "/summary" + "title": "Select organisation classification type", + "name": "cMCKHl", + "type": "string", + "items": [ + { + "text": "Upper or lower tier local authority", + "value": "Upper-or-lower-tier-local-authority" + }, + { + "text": "Charity with a registered charity number", + "value": "Charity-with-a-registered-charity-number" + }, + { + "text": "Registered community interest company", + "value": "Registered-community-interest-company" + }, + { + "text": "Social enterprise", + "value": 4 + }, + { + "text": "Community group", + "value": "Community-group" + }, + { + "text": "None of these", + "value": "None" + } + ] } - ], - "section": "eAEGhH", - "controller": "EligibilityPageController" - }, - - { - "path": "/summary", - "title": "Check your answers", - "components": [ + ], + "sections": [ { - "name": "BsGzRm", - "options": {}, - "type": "Para", - "content": "* Display answers *", - "schema": {} + "name": "mwumLN", + "title": "Check your eligibility" } - ], - "next": [], - "section": "eAEGhH", - "controller": "./pages/summary.js" - } - ], - "lists": [ - { - "title": "Do you think you are eligible?", - "name": "eligiblity-list", - "type": "string", - "items": [ + ], + "conditions": [ { - "text": "Yes, I think I am", - "value": "Yes, I think I am" + "displayName": "Organisation in UK", + "name": "JyKzcX", + "value": { + "name": "Organisation in UK", + "conditions": [ + { + "field": { + "name": "lHTLBl", + "type": "YesNoField", + "display": "Is your organisation based in United Kingdom?" + }, + "operator": "is", + "value": { + "type": "Value", + "value": "true", + "display": "true" + } + } + ] + } }, { - "text": "Nope", - "value": "Nope" - } - ] - } - ], - "sections": [ - { - "name": "eAEGhH", - "title": "Eligibility" - } - ], - "conditions": [ - { - "displayName": "eligible-no", - "name": "nonono", - "value": { - "name": "eligible-no", - "conditions": [ - { - "field": { - "name": "areyou", - "type": "RadiosField", - "display": "Do you think you are eligible?" - }, - "operator": "is", + "displayName": "Organisation not in UK", + "name": "iQBpls", "value": { - "type": "Value", - "value": "Nope", - "display": "Nope" + "name": "Organisation not in UK", + "conditions": [ + { + "field": { + "name": "lHTLBl", + "type": "YesNoField", + "display": "Is your organisation based in United Kingdom?" + }, + "operator": "is", + "value": { + "type": "Value", + "value": "false", + "display": "false" + } + } + ] } - } - ] - } - }, - { - "displayName": "eligible-yes", - "name": "DtRJdr", - "value": { - "name": "eligible-yes", - "conditions": [ - { - "field": { - "name": "areyou", - "type": "RadiosField", - "display": "Do you think you are eligible?" - }, - "operator": "is", + }, + { + "displayName": "Is Project location UK", + "name": "LdkfPi", + "value": { + "name": "Is Project location UK", + "conditions": [ + { + "field": { + "name": "uztZUm", + "type": "YesNoField", + "display": "Will the project take place in United Kingdom?" + }, + "operator": "is", + "value": { + "type": "Value", + "value": "true", + "display": "true" + } + } + ] + } + }, + { + "displayName": "Is Project location not in UK", + "name": "hJfKKX", "value": { - "type": "Value", - "value": "Yes, I think I am", - "display": "Yes, I think I am" + "name": "Is Project location not in UK", + "conditions": [ + { + "field": { + "name": "uztZUm", + "type": "YesNoField", + "display": "Will the project take place in United Kingdom?" + }, + "operator": "is", + "value": { + "type": "Value", + "value": "false", + "display": "false" + } + } + ] } - } - ] - } - } - ], - "fees": [], - "outputs": [ - { - "name": "update-form", - "title": "Update form in application store", - "type": "savePerPage", - "outputConfiguration": { - "savePerPageUrl": "True" - } - } - ], - "version": 2, - "skipSummary": false, - "markAsComplete": false -} + }, + { + "displayName": "Organisation classified", + "name": "UzsxpV", + "value": { + "name": "Organisation classified", + "conditions": [ + { + "field": { + "name": "pxXhgq", + "type": "SelectField", + "display": "How is your organisation classified" + }, + "operator": "is not", + "value": { + "type": "Value", + "value": "None", + "display": "None" + } + } + ] + } + }, + { + "displayName": "Organisation not classified", + "name": "sChDtr", + "value": { + "name": "Organisation not classified", + "conditions": [ + { + "field": { + "name": "pxXhgq", + "type": "SelectField", + "display": "How is your organisation classified" + }, + "operator": "is", + "value": { + "type": "Value", + "value": "None", + "display": "None" + } + } + ] + } + } + ], + "fees": [], + "outputs": [], + "version": 2, + "skipSummary": false, + "markAsComplete": false +} \ No newline at end of file diff --git a/fsd_config/form_jsons/hsra/joint-applicant-hsra.json b/fsd_config/form_jsons/hsra/joint-applicant-hsra.json index 4fea7bff3..cd64a1927 100644 --- a/fsd_config/form_jsons/hsra/joint-applicant-hsra.json +++ b/fsd_config/form_jsons/hsra/joint-applicant-hsra.json @@ -1,4 +1,4 @@ -{ + { "metadata": {}, "startPage": "/joint-applicant", "pages": [ diff --git a/fsd_config/form_jsons/hsra/organisation-information-hsra.json b/fsd_config/form_jsons/hsra/organisation-information-hsra.json index d76acc990..d323ffb89 100644 --- a/fsd_config/form_jsons/hsra/organisation-information-hsra.json +++ b/fsd_config/form_jsons/hsra/organisation-information-hsra.json @@ -17,7 +17,8 @@ { "path": "/which-local-authority-are-you-applying-from" } - ] + ], + "controller": "./pages/start.js" }, { "path": "/which-local-authority-are-you-applying-from", diff --git a/runner/src/server/plugins/engine/pageControllers/EligibilityPageController.ts b/runner/src/server/plugins/engine/pageControllers/EligibilityPageController.ts index a02b9a433..cf87ac0c6 100644 --- a/runner/src/server/plugins/engine/pageControllers/EligibilityPageController.ts +++ b/runner/src/server/plugins/engine/pageControllers/EligibilityPageController.ts @@ -18,7 +18,7 @@ export class EligibilityPageController extends PageController { savedState ); - // Start page check so forms do not save when hitting the "Contine" button on the first page + // Start page check so forms do not save when hitting the "Continue" button on the first page const startPage = this.model.def.startPage; const isStartPage = this.path === startPage;