OOC-4340

runner/src/server/forms/ReportAnOutbreak.json

@@ -43,6 +43,28 @@
           "nameHasError": false,
           "hint": "Please provide the postcode of the specific setting affected (i.e. not the overarching management company if applicable). If there is no one specific setting affected e.g. Domiciliary or Home Care, then please provide the postcode of the care provider company"
         },
+        {
+          "name": "S0Q3",
+          "options": {
+            "required": true
+          },
+          "type": "SelectField",
+          "title": "Please enter your local HPT here",
+          "list": "sjgMDe",
+          "nameHasError": false,
+          "schema": {},
+          "values": {
+            "type": "listRef"
+          },
+          "hint": "Please make sure you've selected the correct local health protection team (HPT) to guarantee you receive the appropriate support"
+        },
+        {
+          "name": "cstZQG",
+          "options": {},
+          "type": "Para",
+          "content": "Click on the link to <a target=\"_blank\" id=\"local-health-protection-team\" href=\"https://www.gov.uk/health-protection-team\">Find your local health protection team in England - GOV.UK</a> (www.gov.uk) [Enter the postcode of your care setting]",
+          "schema": {}
+        },
         {
           "name": "S0Q2a",
           "type": "RadiosField",
@@ -54,8 +76,8 @@
             "conditionallyRevealedComponents": {
               "yes": {
                 "type": "TextField",
-                "name": "SOQ2",
-                "title": "Please enter your CQC Location ID",
+                "name": "yes",
+                "title": "Please enter your CQC Location ID (Mandatory)",
                 "options": {},
                 "schema": {}
               }
@@ -68,28 +90,6 @@
           "type": "Para",
           "content": "If you don’t know your CQC Location ID then please visit <a id=\"cqc number\" target=\"_blank\" href=\"https://www.cqc.org.uk/about-us/transparency/using-cqc-data\">Using CQC data - Care Quality Commission</a> and scroll about half way down the page to <b style=\"color:#1d70b8\">CQC care directory - csv</b>. You will find your CQC Location ID in this look up table.\n</br></br>",
           "schema": {}
-        },
-        {
-          "name": "S0Q3",
-          "options": {
-            "required": true
-          },
-          "type": "SelectField",
-          "title": "Please enter your local HPT here",
-          "list": "sjgMDe",
-          "nameHasError": false,
-          "schema": {},
-          "values": {
-            "type": "listRef"
-          },
-          "hint": "Please make sure you've selected the correct local health protection team (HPT) to guarantee you receive the appropriate support"
-        },
-        {
-          "name": "cstZQG",
-          "options": {},
-          "type": "Para",
-          "content": "Click on the link to <a target=\"_blank\" id=\"local-health-protection-team\" href=\"https://www.gov.uk/health-protection-team\">Find your local health protection team in England - GOV.UK</a> (www.gov.uk) [Enter the postcode of your care setting]",
-          "schema": {}
         }
       ],
       "next": [

runner/src/server/plugins/engine/components/SelectionControlField.ts

@@ -126,7 +126,7 @@ export class SelectionControlField extends ListFormComponent {
         Object.assign(schemaKeys, {
           [key]: joi.alternatives().conditional(joi.ref(conditionalName), {
             is: key,
-            then: conditionalSchemaKeys[key].optional(),
+            then: conditionalSchemaKeys[key].required(),
             otherwise: joi.optional(),
             //TODO: Checkbox joi validation
           }),