diff --git a/sources/packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn b/sources/packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn
index 9027f71b29..1282e106dc 100644
--- a/sources/packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn
+++ b/sources/packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn
@@ -101,8 +101,12 @@
-
-
+
+
+
+
+
+
diff --git a/sources/packages/forms/src/form-definitions/sfaa2022-23.json b/sources/packages/forms/src/form-definitions/sfaa2022-23.json
index cf0b9485ba..e4981089a1 100644
--- a/sources/packages/forms/src/form-definitions/sfaa2022-23.json
+++ b/sources/packages/forms/src/form-definitions/sfaa2022-23.json
@@ -19139,7 +19139,7 @@
"tags": []
},
{
- "label": "Please provide an estimation of your parents income",
+ "label": "How much will your parent(s)/step-parent/sponsor/legal guardian be giving you to help meet your specific educational costs during this study period?",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19149,7 +19149,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
+ "custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19159,7 +19159,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentsTotalIncome",
+ "key": "studentParentsNetContribution",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19213,16 +19213,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "et8xql",
+ "id": "etw5gsi",
"inputType": "text",
"inputMask": "",
- "decimalLimit": 0,
- "requireDecimal": false,
+ "decimalLimit": 2,
+ "requireDecimal": true,
"tags": [],
"lockKey": true
},
{
- "label": "Enter the total net value of all your parents Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
+ "label": "Enter the reported total income from line 15000 of your parent(s)/step-parent/sponsor/legal guardian {{data.calculatedTaxYear}} income tax return. If they did not file a {{data.calculatedTaxYear}} income tax return, enter the total income from all sources both inside and outside of Canada.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19232,7 +19232,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "",
+ "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19242,7 +19242,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetAssests",
+ "key": "studentParentsTotalIncome",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19278,7 +19278,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19296,15 +19296,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "etw5gsi",
+ "id": "et8xql",
"inputType": "text",
"inputMask": "",
"decimalLimit": 2,
- "requireDecimal": true,
- "tags": []
+ "requireDecimal": false,
+ "tags": [],
+ "lockKey": true
},
{
- "label": "How much will your parents be giving the student to help meet their specific educational costs during this study period? Enter ‘0’ if none.",
+ "label": "Enter the total net value of all Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19324,7 +19325,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetContribution",
+ "key": "studentParentsNetAssests",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19360,7 +19361,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19383,7 +19384,8 @@
"inputMask": "",
"decimalLimit": 2,
"requireDecimal": true,
- "tags": []
+ "tags": [],
+ "lockKey": true
},
{
"label": "HTML",
diff --git a/sources/packages/forms/src/form-definitions/sfaa2023-24.json b/sources/packages/forms/src/form-definitions/sfaa2023-24.json
index 7755b9ff10..0cea3368cd 100644
--- a/sources/packages/forms/src/form-definitions/sfaa2023-24.json
+++ b/sources/packages/forms/src/form-definitions/sfaa2023-24.json
@@ -19139,7 +19139,7 @@
"tags": []
},
{
- "label": "Please provide an estimation of your parents income",
+ "label": "How much will your parent(s)/step-parent/sponsor/legal guardian be giving you to help meet your specific educational costs during this study period?",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19149,7 +19149,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
+ "custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19159,7 +19159,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentsTotalIncome",
+ "key": "studentParentsNetContribution",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19213,16 +19213,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "et8xql",
+ "id": "etw5gsi",
"inputType": "text",
"inputMask": "",
- "decimalLimit": 0,
- "requireDecimal": false,
+ "decimalLimit": 2,
+ "requireDecimal": true,
"tags": [],
"lockKey": true
},
{
- "label": "Enter the total net value of all your parents Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
+ "label": "Enter the reported total income from line 15000 of your parent(s)/step-parent/sponsor/legal guardian {{data.calculatedTaxYear}} income tax return. If they did not file a {{data.calculatedTaxYear}} income tax return, enter the total income from all sources both inside and outside of Canada.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19232,7 +19232,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "",
+ "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19242,7 +19242,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetAssests",
+ "key": "studentParentsTotalIncome",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19278,7 +19278,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19296,15 +19296,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "etw5gsi",
+ "id": "et8xql",
"inputType": "text",
"inputMask": "",
"decimalLimit": 2,
- "requireDecimal": true,
- "tags": []
+ "requireDecimal": false,
+ "tags": [],
+ "lockKey": true
},
{
- "label": "How much will your parents be giving the student to help meet their specific educational costs during this study period? Enter ‘0’ if none.",
+ "label": "Enter the total net value of all Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19324,7 +19325,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetContribution",
+ "key": "studentParentsNetAssests",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19360,7 +19361,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19383,7 +19384,8 @@
"inputMask": "",
"decimalLimit": 2,
"requireDecimal": true,
- "tags": []
+ "tags": [],
+ "lockKey": true
},
{
"label": "HTML",
diff --git a/sources/packages/forms/src/form-definitions/sfaa2024-25.json b/sources/packages/forms/src/form-definitions/sfaa2024-25.json
index 3dc2040e39..617a6e88bc 100644
--- a/sources/packages/forms/src/form-definitions/sfaa2024-25.json
+++ b/sources/packages/forms/src/form-definitions/sfaa2024-25.json
@@ -19139,7 +19139,7 @@
"tags": []
},
{
- "label": "Please provide an estimation of your parents income",
+ "label": "How much will your parent(s)/step-parent/sponsor/legal guardian be giving you to help meet your specific educational costs during this study period?",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19149,7 +19149,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
+ "custom": "",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19159,7 +19159,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentsTotalIncome",
+ "key": "studentParentsNetContribution",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19213,16 +19213,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "et8xql",
+ "id": "etw5gsi",
"inputType": "text",
"inputMask": "",
- "decimalLimit": 0,
- "requireDecimal": false,
+ "decimalLimit": 2,
+ "requireDecimal": true,
"tags": [],
"lockKey": true
},
{
- "label": "Enter the total net value of all your parents Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
+ "label": "Enter the reported total income from line 15000 of your parent(s)/step-parent/sponsor/legal guardian {{data.calculatedTaxYear}} income tax return. If they did not file a {{data.calculatedTaxYear}} income tax return, enter the total income from all sources both inside and outside of Canada.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19232,7 +19232,7 @@
"truncateMultipleSpaces": false,
"validate": {
"required": true,
- "custom": "",
+ "custom": "valid = (input >= 0 && input < data.maxIncome) ? true : 'The number you have entered is outside the expected range.';",
"customPrivate": false,
"strictDateValidation": false,
"multiple": false,
@@ -19242,7 +19242,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetAssests",
+ "key": "studentParentsTotalIncome",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19278,7 +19278,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19296,15 +19296,16 @@
"properties": {},
"allowMultipleMasks": false,
"addons": [],
- "id": "etw5gsi",
+ "id": "et8xql",
"inputType": "text",
"inputMask": "",
"decimalLimit": 2,
- "requireDecimal": true,
- "tags": []
+ "requireDecimal": false,
+ "tags": [],
+ "lockKey": true
},
{
- "label": "How much will your parents be giving the student to help meet their specific educational costs during this study period? Enter ‘0’ if none.",
+ "label": "Enter the total net value of all Canadian and foreign assets (do not include RRSPs, principal residence or business). Enter ‘0’ if none.",
"prefix": "$",
"mask": false,
"spellcheck": true,
@@ -19324,7 +19325,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetContribution",
+ "key": "studentParentsNetAssests",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19360,7 +19361,7 @@
"attributes": {},
"validateOn": "change",
"conditional": {
- "show": null,
+ "show": "",
"when": null,
"eq": ""
},
@@ -19383,7 +19384,8 @@
"inputMask": "",
"decimalLimit": 2,
"requireDecimal": true,
- "tags": []
+ "tags": [],
+ "lockKey": true
},
{
"label": "HTML",
diff --git a/sources/packages/forms/src/form-definitions/sfaa2025-26.json b/sources/packages/forms/src/form-definitions/sfaa2025-26.json
index 5de728deec..8e257708f1 100644
--- a/sources/packages/forms/src/form-definitions/sfaa2025-26.json
+++ b/sources/packages/forms/src/form-definitions/sfaa2025-26.json
@@ -19402,7 +19402,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetContribution",
+ "key": "studentParentsNetContribution",
"type": "currency",
"input": true,
"delimiter": true,
@@ -19567,7 +19567,7 @@
"step": "any",
"integer": ""
},
- "key": "studentParentNetAssests",
+ "key": "studentParentsNetAssests",
"type": "currency",
"input": true,
"delimiter": true,
@@ -27846,7 +27846,7 @@
"properties": {}
},
{
- "label": "Will you receive government funding (e.g., EI training allowance, social assistance payments intended to cover education-related costs?",
+ "label": "Will you receive government funding (e.g., EI training allowance, social assistance payments intended to cover education-related costs)?",
"labelPosition": "top",
"labelWidth": "",
"labelMargin": "",