From b588927e20c3895d14a15ac715f6715c1e6c9696 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Tue, 14 Jun 2022 11:39:06 +0100
Subject: [PATCH 1/5] added changes

---
 components/newappeal/createCase.js | 142 ++++++++++++++++++++++++++++-
 data/formsxml/adverts.xml          | 129 ++++++++------------------
 2 files changed, 177 insertions(+), 94 deletions(-)

diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 2abd947b..df6757af 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -15,6 +15,7 @@ import { getFormCollectionByID } from "../utils";
 import FileUpload from "./fileupload";
 import Aboutyou from "./aboutyou";
 import { createNewCase } from "../../actions";
+import { FieldsTranslations } from "../elements";
 
 let CreateCase = (props) => {
     // useEffect(() => {
@@ -26,7 +27,7 @@ let CreateCase = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    const { LPAData, onSubmit, handleSubmit } = props;
+    const { LPAData, onSubmit, handleSubmit, formData } = props;
 
     const appealOptionsObj = _.isEmpty(props)
         ? [{}]
@@ -155,7 +156,7 @@ let CreateCase = (props) => {
                             className="govuk-select"
                             id="appealTypes"
                             name={name}
-                            //onChange={(e) => props.onChangeSelectAppealType(e)}
+                            onChange={(e) => props.onChangeSelectAppealType(e)}
                         >
                             <option value="" disabled defaultValue>
                                 {t("common:drop-down-select")}
@@ -209,6 +210,120 @@ let CreateCase = (props) => {
         );
     };
 
+    const RenderYesNo = ({
+        datafieldname,
+        name,
+        label,
+        id,
+        errorMsg,
+        options,
+        input: { onChange, value },
+        meta: { touched, error },
+        ...custom
+    }) => {
+        return (
+            <>
+                <div
+                    className={
+                        touched && error
+                            ? "govuk-form-group govuk-form-group--error"
+                            : "govuk-form-group "
+                    }
+                >
+                    <fieldset
+                        className="govuk-fieldset"
+                        aria-describedby={id + "_label"}
+                    >
+                        <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
+                            <label
+                                className="govuk-fieldset__heading govuk-body-m"
+                                id={id + "_label"}
+                            >
+                                {FieldsTranslations(label)}
+                            </label>
+                        </legend>
+                        {touched && error && (
+                            <span
+                                id={id + "-error"}
+                                className="govuk-error-message"
+                            >
+                                <span className="govuk-visually-hidden">
+                                    Error:
+                                </span>{" "}
+                                {errorMsg}
+                            </span>
+                        )}
+                        <div
+                            className={
+                                custom.inline == false
+                                    ? "govuk-radios govuk-radios--small"
+                                    : "govuk-radios govuk-radios--inline govuk-radios--small"
+                            }
+                        >
+                            {custom.hint != false && (
+                                <div className="govuk-hint">
+                                    {t(custom.hint)}
+                                </div>
+                            )}
+                            {Object.keys(options).map((key, index) => (
+                                <div
+                                    className="govuk-radios__item"
+                                    data-children-count={key}
+                                    key={key}
+                                >
+                                    <Field
+                                        id={id + "_" + index}
+                                        name={id}
+                                        component="input"
+                                        type="radio"
+                                        className="govuk-radios__input"
+                                        value={options[key]}
+                                        //checked={value == options[key]}
+                                        onChange={(e) => {
+                                            let docListObj =
+                                                custom.documentList;
+                                            if (
+                                                custom.requiredDocumentValue ==
+                                                    "Yes" ||
+                                                custom.requiredDocumentValue ==
+                                                    "Ydw"
+                                            ) {
+                                                e.target.value == "Ydw" ||
+                                                e.target.value == "Yes"
+                                                    ? (docListObj =
+                                                          Object.assign(
+                                                              docListObj,
+                                                              {
+                                                                  ["documentCheckList_" +
+                                                                  id]:
+                                                                      custom.requiredDocumentLabel,
+                                                              }
+                                                          ))
+                                                    : delete docListObj[
+                                                          "documentCheckList_" +
+                                                              id
+                                                      ];
+                                                console.log(docListObj);
+                                                custom.setDocumentsList(
+                                                    docListObj
+                                                );
+                                            }
+                                        }}
+                                    />
+                                    <label
+                                        className="govuk-label govuk-radios__label"
+                                        htmlFor={id + "_" + index}
+                                    >
+                                        {options[key]}
+                                    </label>
+                                </div>
+                            ))}
+                        </div>
+                    </fieldset>
+                </div>
+            </>
+        );
+    };
     const required = (value) => (value ? undefined : "Required");
 
     const [formStep, setFormStep] = useState(0);
@@ -263,6 +378,7 @@ let CreateCase = (props) => {
         //     }
         // );
     };
+    const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
 
     return (
         <>
@@ -288,6 +404,28 @@ let CreateCase = (props) => {
                             "newappeal:select-appeal-type-label-error-msg"
                         )}
                     />
+                    {}
+
+                    <Field
+                        name={"confirmHASCAS"}
+                        datafieldname={"confirmHASCAS"}
+                        label={"Confirm HAS/CAS appeal is required"}
+                        options={yesNo}
+                        id={"confirmHASCAS"}
+                        //validate={[required]}
+                        errorMsg="Select an option"
+                        component={RenderYesNo}
+                        inline={true}
+                        hint={
+                            "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal"
+                        }
+                        validate={[]}
+                        requiredDocumentLabel={props.requiredDocumentLabel}
+                        requiredDocumentValue={props.requiredDocumentValue}
+                        setDocumentsList={props.setDocumentsList}
+                        documentList={props.documentList}
+                    />
+
                     <button
                         type="submit"
                         className="govuk-button"
diff --git a/data/formsxml/adverts.xml b/data/formsxml/adverts.xml
index f3f4723c..d604d802 100644
--- a/data/formsxml/adverts.xml
+++ b/data/formsxml/adverts.xml
@@ -15,98 +15,11 @@
 								<row>
 									<cell id="{2902cb65-78c7-40ff-a618-a5423c8287cb}">
 										<labels>
-											<label description="Name" languagecode="1033" />
+											<label description="Case reference" languagecode="1033" />
 										</labels>
 										<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
 									</cell>
-								</row>
-								<row>
-									<cell id="{edb2e54a-40cc-57d6-150d-84cd436965be}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Case" languagecode="1033" />
-										</labels>
-										<control id="pinswg_advertsids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_advertsids" disabled="false" uniqueid="{54aaac17-b94d-bba1-82a8-07917d933d4b}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													false
-												</DisableViewPicker>
-												<DefaultViewId>
-													{9AC51863-58C7-49A0-ADCC-AFD9A4C3EE59}
-												</DefaultViewId>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
-										</control>
-									</cell>
-								</row>
-								<row>
-									<cell id="{3b4bd3b6-b352-4438-1da4-86157c44d522}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Associated (LPA)" languagecode="1033" />
-										</labels>
-										<control id="pinswg_associatedlpa" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_associatedlpa" disabled="false" uniqueid="{8bc2102c-0000-4721-463d-6b6e64cb6009}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													true
-												</DisableViewPicker>
-												<DefaultViewId>
-													{0ABD7146-7DE5-EB11-AAC5-00224800BE9C}
-												</DefaultViewId>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
-										</control>
-									</cell>
-								</row>
-								<row>
-									<cell id="{832ed08a-b53c-553a-29cc-4c45d9d5c8ab}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Appellant" languagecode="1033" />
-										</labels>
-										<control id="pinswg_appellant" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_appellant" disabled="false" uniqueid="{66d6d8e1-2302-53b8-1e96-3281782ca7e4}">
-											<parameters>
-												<AutoResolve>
-													true
-												</AutoResolve>
-												<DisableMru>
-													false
-												</DisableMru>
-												<DisableQuickFind>
-													false
-												</DisableQuickFind>
-												<DisableViewPicker>
-													true
-												</DisableViewPicker>
-												<DefaultViewId>
-													{EF816E54-E5D5-EB11-AAC5-00224800BE9C}
-												</DefaultViewId>
-												<AllowFilterOff>
-													false
-												</AllowFilterOff>
-											</parameters>
-										</control>
-									</cell>
-								</row>
+								</row>	
 							</rows>
 						</section>
 					</sections>
@@ -494,14 +407,46 @@
 								<label description="Section" languagecode="1033" />
 							</labels>
 							<rows>
-								<row>
-									<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
+										<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="File upload" languagecode="1033" />
+											<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
 										</labels>
 										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
+									<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="The discontinuance notice" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload7" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+									<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+									<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Any other material you may deem relevant" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
 							</rows>
 						</section>
 					</sections>

From cb9995da75be972e5559f1efcc9e43a02cdd2eeb Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Tue, 14 Jun 2022 17:08:11 +0100
Subject: [PATCH 2/5] added hcas diagnostic choice

---
 components/elements/index.js       |   2 +-
 components/newappeal/aboutyou.js   |  21 +--
 components/newappeal/createCase.js | 205 +++++++++++++++++++++++------
 pages/newappeal/index.js           |   1 +
 4 files changed, 176 insertions(+), 53 deletions(-)

diff --git a/components/elements/index.js b/components/elements/index.js
index 42ef4ed4..a855f258 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -108,7 +108,7 @@ export function Textfield(props) {
         // console.log(parentField, showIfHasParentShowValue);
         // console.log(parentField, formProps, form);
 
-        //console.log("validation props:", validation);
+        console.log("validation props:", validation);
 
         return (
             <div className="govuk-form-group">
diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
index 83d38979..b8724267 100644
--- a/components/newappeal/aboutyou.js
+++ b/components/newappeal/aboutyou.js
@@ -239,6 +239,8 @@ let AboutYou = (props) => {
         ...custom
     }) => {
         let { t } = useTranslation();
+        const required = (value) => (value ? undefined : "Required");
+
         return (
             <>
                 <div
@@ -298,6 +300,7 @@ let AboutYou = (props) => {
                                         type="radio"
                                         className="govuk-radios__input"
                                         value={options[key].split("|")[0]}
+                                        validate={[required]}
                                         // checked={
                                         //     value ==
                                         //     parseInt(options[key].split("|")[0])
@@ -393,12 +396,12 @@ let AboutYou = (props) => {
                             label={label}
                             options={fieldOptions}
                             id={name}
-                            //validate={[required]}
+                            validate={[required]}
                             errorMsg="Select an option"
                             component={RenderRadio}
                             inline={props.inline}
                             hint={props.hint}
-                            validate={eval(validation)}
+                            //validate={eval(validation)}
                             requiredDocumentLabel={props.requiredDocumentLabel}
                             requiredDocumentValue={props.requiredDocumentValue}
                             setDocumentsList={props.setDocumentsList}
@@ -412,12 +415,12 @@ let AboutYou = (props) => {
                         label={label}
                         options={fieldOptions}
                         id={name}
-                        //validate={[required]}
+                        validate={[required]}
                         errorMsg="Select an option"
                         component={RenderRadio}
                         inline={props.inline}
                         hint={props.hint}
-                        validate={eval(validation)}
+                        //validate={eval(validation)}
                         requiredDocumentLabel={props.requiredDocumentLabel}
                         requiredDocumentValue={props.requiredDocumentValue}
                         setDocumentsList={props.setDocumentsList}
@@ -504,7 +507,7 @@ let AboutYou = (props) => {
                 options="[846040000|newappeal:about-you-who-are-you-label-appellant,846040001|newappeal:about-you-who-are-you-label-agent]"
                 id={"pinswg_appellantagent"}
                 className="govuk-radios__input"
-                //validate={[required]}
+                validate={"[required]"}
                 errorMsg="Select an option"
             />
 
@@ -579,7 +582,7 @@ let AboutYou = (props) => {
                         options="[846040000|newappeal:about-you-agent-contact-preferences-value-email,846040001|newappeal:about-you-agent-contact-preferences-value-post]"
                         id={"pinswg_contactprefs"}
                         className="govuk-radios__input"
-                        validate={[required]}
+                        validate={"[required]"}
                         errorMsg="Select an option"
                     />
                     <Radiofield
@@ -591,8 +594,8 @@ let AboutYou = (props) => {
                         options="[846040000|newappeal:about-you-agent-language-preferences-value-english,846040001|newappeal:about-you-agent-language-preferences-value-welsh]"
                         id={"pinswg_languagepreference"}
                         className="govuk-radios__input"
-                        validate={[required]}
-                        errorMsg="Select an option"
+                        validate={"[required]"}
+                        errorMsg="Select an optionqqq"
                     />
                 </>
             )}
@@ -749,7 +752,7 @@ let AboutYou = (props) => {
                         id={"pinswg_languagepreference"}
                         className="govuk-radios__input"
                         validate={[required]}
-                        errorMsg="Select an option"
+                        errorMsg="Select an optionwww"
                     />
                 </>
             )}
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index df6757af..95f9ae1a 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -156,7 +156,7 @@ let CreateCase = (props) => {
                             className="govuk-select"
                             id="appealTypes"
                             name={name}
-                            onChange={(e) => props.onChangeSelectAppealType(e)}
+                            //onChange={(e) => props.onChangeSelectAppealType(e)}
                         >
                             <option value="" disabled defaultValue>
                                 {t("common:drop-down-select")}
@@ -210,7 +210,7 @@ let CreateCase = (props) => {
         );
     };
 
-    const RenderYesNo = ({
+    const RenderRadio = ({
         datafieldname,
         name,
         label,
@@ -221,6 +221,9 @@ let CreateCase = (props) => {
         meta: { touched, error },
         ...custom
     }) => {
+        let { t } = useTranslation();
+        const required = (value) => (value ? undefined : "Required");
+        console.log(custom.hint);
         return (
             <>
                 <div
@@ -232,14 +235,14 @@ let CreateCase = (props) => {
                 >
                     <fieldset
                         className="govuk-fieldset"
-                        aria-describedby={id + "_label"}
+                        aria-describedby={datafieldname + "-hint"}
                     >
                         <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
                             <label
                                 className="govuk-fieldset__heading govuk-body-m"
                                 id={id + "_label"}
                             >
-                                {FieldsTranslations(label)}
+                                {label}
                             </label>
                         </legend>
                         {touched && error && (
@@ -260,10 +263,9 @@ let CreateCase = (props) => {
                                     : "govuk-radios govuk-radios--inline govuk-radios--small"
                             }
                         >
-                            {custom.hint != false && (
-                                <div className="govuk-hint">
-                                    {t(custom.hint)}
-                                </div>
+                            {" "}
+                            {custom.hint != undefined && (
+                                <div className="govuk-hint">{custom.hint}</div>
                             )}
                             {Object.keys(options).map((key, index) => (
                                 <div
@@ -276,20 +278,22 @@ let CreateCase = (props) => {
                                         name={id}
                                         component="input"
                                         type="radio"
+                                        hint={custom.hint}
                                         className="govuk-radios__input"
-                                        value={options[key]}
-                                        //checked={value == options[key]}
+                                        value={options[key].split("|")[0]}
+                                        validate={[required]}
+                                        // checked={
+                                        //     value ==
+                                        //     parseInt(options[key].split("|")[0])
+                                        // }
                                         onChange={(e) => {
                                             let docListObj =
                                                 custom.documentList;
                                             if (
                                                 custom.requiredDocumentValue ==
-                                                    "Yes" ||
-                                                custom.requiredDocumentValue ==
-                                                    "Ydw"
+                                                "Yes"
                                             ) {
-                                                e.target.value == "Ydw" ||
-                                                e.target.value == "Yes"
+                                                e.target.value != "846040000"
                                                     ? (docListObj =
                                                           Object.assign(
                                                               docListObj,
@@ -303,7 +307,6 @@ let CreateCase = (props) => {
                                                           "documentCheckList_" +
                                                               id
                                                       ];
-                                                console.log(docListObj);
                                                 custom.setDocumentsList(
                                                     docListObj
                                                 );
@@ -314,7 +317,7 @@ let CreateCase = (props) => {
                                         className="govuk-label govuk-radios__label"
                                         htmlFor={id + "_" + index}
                                     >
-                                        {options[key]}
+                                        {t(options[key].split("|")[1])}
                                     </label>
                                 </div>
                             ))}
@@ -324,6 +327,91 @@ let CreateCase = (props) => {
             </>
         );
     };
+
+    function Radiofield(props) {
+        const {
+            name,
+            label,
+            datafieldname,
+            parentField,
+            form,
+            formProps,
+            parentFieldShowOnValue,
+            validation,
+        } = props;
+
+        const router = useRouter();
+        const required = (value) => (value ? undefined : "Required");
+        // console.log(props.options);
+
+        const fieldOptions = props.options
+            .slice(1, props.options.length - 1)
+            .split(",");
+
+        //parentFieldShowOnValue
+        var showIfHasParentShowValue = parentField != false;
+        //debugger;
+        // parentField != false &&
+        // !_.isEmpty(formProps[form]) &&
+        // _.has(formProps[form].values, parentField) &&
+        // parentFieldShowOnValue.indexOf(
+        //     formProps[form].values[parentField].toString()
+        // ) > -1;
+
+        (showIfHasParentShowValue == parentField) != false &&
+            showIfHasParentShowValue;
+
+        // console.log(
+        //     datafieldname,
+        //     showIfHasParentShowValue,
+        //     formProps[form].values[parentField]
+        // );
+
+        return (
+            <>
+                {parentField != false ? (
+                    showIfHasParentShowValue && (
+                        <Field
+                            name={name}
+                            datafieldname={datafieldname}
+                            label={label}
+                            options={fieldOptions}
+                            id={name}
+                            validate={[required]}
+                            errorMsg="Select an option"
+                            component={RenderRadio}
+                            inline={props.inline}
+                            hint={props.hint}
+                            //validate={eval(validation)}
+                            requiredDocumentLabel={props.requiredDocumentLabel}
+                            requiredDocumentValue={props.requiredDocumentValue}
+                            setDocumentsList={props.setDocumentsList}
+                            documentList={props.documentList}
+                        />
+                    )
+                ) : (
+                    <Field
+                        name={name}
+                        datafieldname={datafieldname}
+                        label={label}
+                        options={fieldOptions}
+                        id={name}
+                        validate={[required]}
+                        errorMsg="Select an option"
+                        component={RenderRadio}
+                        inline={props.inline}
+                        hint={props.hint}
+                        //validate={eval(validation)}
+                        requiredDocumentLabel={props.requiredDocumentLabel}
+                        requiredDocumentValue={props.requiredDocumentValue}
+                        setDocumentsList={props.setDocumentsList}
+                        documentList={props.documentList}
+                    />
+                )}
+            </>
+        );
+    }
+
     const required = (value) => (value ? undefined : "Required");
 
     const [formStep, setFormStep] = useState(0);
@@ -333,13 +421,33 @@ let CreateCase = (props) => {
 
         var appTypeCollection = values.appealTypes;
 
-        appTypeCollection = getFormCollectionByID(appTypeCollection);
-
         formStep == 0 && setFormStep(1);
 
-        // console.log(values);
+        whichAppealType =
+            values.appealTypes == "846040004" && values.confirmHASCAS == "true"
+                ? "846040004"
+                : values.appealTypes == "846040004" &&
+                  values.confirmHASCAS == "false"
+                ? "846040000"
+                : values.appealTypes;
 
-        // console.log(props.loggedInUser);
+        var whichAppealType = whichAppealType;
+
+        appTypeCollection = getFormCollectionByID(whichAppealType);
+
+        console.log(
+            "/newappeal" +
+                "/" +
+                appTypeCollection.UrlName +
+                "?lpa=" +
+                values.lpaTypes +
+                "&apt=" +
+                whichAppealType +
+                "&id=" //+
+            //  data.incidentid
+        );
+
+        delete values.confirmHASCAS;
 
         createNewCase(
             appTypeCollection.appealTypeID,
@@ -355,7 +463,7 @@ let CreateCase = (props) => {
                         "?lpa=" +
                         values.lpaTypes +
                         "&apt=" +
-                        values.appealTypes.split(",")[0] +
+                        whichAppealType +
                         "&id=" +
                         data.incidentid
                 );
@@ -364,6 +472,7 @@ let CreateCase = (props) => {
             .catch(({ err }) => {
                 console.log(err);
             });
+
         // router.replace(
         //     "/newappeal" +
         //         "/" +
@@ -380,6 +489,22 @@ let CreateCase = (props) => {
     };
     const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
 
+    var parentField = "appealTypes",
+        formProps = props.whichForm,
+        form = "caseForm",
+        parentFieldShowOnValue = "846040004";
+
+    var showIfHasParentShowValue =
+        parentField != false &&
+        !_.isEmpty(formProps[form]) &&
+        _.has(formProps[form].values, parentField) &&
+        parentFieldShowOnValue.indexOf(
+            formProps[form].values[parentField].toString()
+        ) > -1;
+
+    (showIfHasParentShowValue == parentField) != false &&
+        showIfHasParentShowValue;
+
     return (
         <>
             {formStep == 0 ? (
@@ -404,28 +529,22 @@ let CreateCase = (props) => {
                             "newappeal:select-appeal-type-label-error-msg"
                         )}
                     />
-                    {}
-
-                    <Field
-                        name={"confirmHASCAS"}
-                        datafieldname={"confirmHASCAS"}
-                        label={"Confirm HAS/CAS appeal is required"}
-                        options={yesNo}
-                        id={"confirmHASCAS"}
-                        //validate={[required]}
-                        errorMsg="Select an option"
-                        component={RenderYesNo}
-                        inline={true}
-                        hint={
-                            "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal"
-                        }
-                        validate={[]}
-                        requiredDocumentLabel={props.requiredDocumentLabel}
-                        requiredDocumentValue={props.requiredDocumentValue}
-                        setDocumentsList={props.setDocumentsList}
-                        documentList={props.documentList}
-                    />
 
+                    {showIfHasParentShowValue && (
+                        <Radiofield
+                            name={"confirmHASCAS"}
+                            datafieldname={"confirmHASCAS"}
+                            label={"Confirm HAS/CAS appeal is required"}
+                            hint={
+                                "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal"
+                            }
+                            options="[true|Yes,false|No]"
+                            id={"confirmHASCAS"}
+                            className="govuk-radios__input"
+                            validate={"[required]"}
+                            errorMsg="Select an option"
+                        />
+                    )}
                     <button
                         type="submit"
                         className="govuk-button"
diff --git a/pages/newappeal/index.js b/pages/newappeal/index.js
index 1a2ff2b9..c710748a 100644
--- a/pages/newappeal/index.js
+++ b/pages/newappeal/index.js
@@ -117,6 +117,7 @@ const Home = (props) => {
                             LPAData={props.LPAData}
                             appealType={props.setAppealType}
                             loggedInUser={props.accountDetails.loggedinUserId}
+                            whichForm={props.form}
                         />
                     </main>
                 </div>

From b3ce573c9c3e700df89976f7feb5a78385553d00 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Tue, 14 Jun 2022 18:21:47 +0100
Subject: [PATCH 3/5] welsh trans for validation message

---
 .../representationCapacitySelection.js        |  2 +-
 components/elements/index.js                  |  8 ++--
 components/newappeal/aboutyou.js              | 14 +++----
 components/newappeal/createCase.js            | 37 +++++++++----------
 locales/cy/newappeal.json                     |  5 +++
 locales/en/newappeal.json                     |  5 +++
 6 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/components/case/representation/representationCapacitySelection.js b/components/case/representation/representationCapacitySelection.js
index 16ac04d6..e75265c4 100644
--- a/components/case/representation/representationCapacitySelection.js
+++ b/components/case/representation/representationCapacitySelection.js
@@ -61,7 +61,7 @@ let RepCapacitySelection = (props) => {
                             options={capacityOptionsArr}
                             id="representationCapacity"
                             className="govuk-radios__input"
-                            errorMsg="Select an option"
+                            errorMsg={t("newappeal:select-an-option-label")}
                             component={RenderRadioList}
                             validate={[required]}
                         />
diff --git a/components/elements/index.js b/components/elements/index.js
index a855f258..ae011265 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -635,7 +635,7 @@ export function YesNofield(props) {
             id={props.name}
             className={"govuk-radios__input"}
             validate={eval(validation)}
-            errorMsg="Select an option"
+            errorMsg={t("newappeal:select-an-option-label")}
             component={RenderYesNo}
             inline={_.has(props, "inline") ? props.inline : "true"}
             requiredDocumentLabel={props.requiredDocumentLabel}
@@ -807,7 +807,7 @@ export function Radiofield(props) {
                         options={fieldOptions}
                         id={name}
                         //validate={[required]}
-                        errorMsg="Select an option"
+                        errorMsg={t("newappeal:select-an-option-label")}
                         component={RenderRadio}
                         inline={props.inline}
                         hint={props.hint}
@@ -826,7 +826,7 @@ export function Radiofield(props) {
                     options={fieldOptions}
                     id={name}
                     //validate={[required]}
-                    errorMsg="Select an option"
+                    errorMsg={t("newappeal:select-an-option-label")}
                     component={RenderRadio}
                     inline={props.inline}
                     hint={props.hint}
@@ -930,7 +930,7 @@ export function CheckBoxfield(props) {
             id={props.id}
             className={props.className}
             //validate={[required]}
-            errorMsg="Select an option"
+            errorMsg={t("newappeal:select-an-option-label")}
             component={RenderCheckBox}
         />
     );
diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
index b8724267..f52596b6 100644
--- a/components/newappeal/aboutyou.js
+++ b/components/newappeal/aboutyou.js
@@ -397,7 +397,7 @@ let AboutYou = (props) => {
                             options={fieldOptions}
                             id={name}
                             validate={[required]}
-                            errorMsg="Select an option"
+                            errorMsg={t("newappeal:select-an-option-label")}
                             component={RenderRadio}
                             inline={props.inline}
                             hint={props.hint}
@@ -416,7 +416,7 @@ let AboutYou = (props) => {
                         options={fieldOptions}
                         id={name}
                         validate={[required]}
-                        errorMsg="Select an option"
+                        errorMsg={t("newappeal:select-an-option-label")}
                         component={RenderRadio}
                         inline={props.inline}
                         hint={props.hint}
@@ -508,7 +508,7 @@ let AboutYou = (props) => {
                 id={"pinswg_appellantagent"}
                 className="govuk-radios__input"
                 validate={"[required]"}
-                errorMsg="Select an option"
+                errorMsg={t("newappeal:select-an-option-label")}
             />
 
             {appellantAgentValue == "846040000" && (
@@ -583,7 +583,7 @@ let AboutYou = (props) => {
                         id={"pinswg_contactprefs"}
                         className="govuk-radios__input"
                         validate={"[required]"}
-                        errorMsg="Select an option"
+                        errorMsg={t("newappeal:select-an-option-label")}
                     />
                     <Radiofield
                         name={"pinswg_languagepreference"}
@@ -595,7 +595,7 @@ let AboutYou = (props) => {
                         id={"pinswg_languagepreference"}
                         className="govuk-radios__input"
                         validate={"[required]"}
-                        errorMsg="Select an optionqqq"
+                        errorMsg={t("newappeal:select-an-option-label")}
                     />
                 </>
             )}
@@ -740,7 +740,7 @@ let AboutYou = (props) => {
                         id={"pinswg_contactprefs"}
                         className="govuk-radios__input"
                         validate={[required]}
-                        errorMsg="Select an option"
+                        errorMsg={t("newappeal:select-an-option-label")}
                     />
                     <Radiofield
                         name={"pinswg_languagepreference"}
@@ -752,7 +752,7 @@ let AboutYou = (props) => {
                         id={"pinswg_languagepreference"}
                         className="govuk-radios__input"
                         validate={[required]}
-                        errorMsg="Select an optionwww"
+                        errorMsg={t("newappeal:select-an-option-label")}
                     />
                 </>
             )}
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 95f9ae1a..16382da1 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -223,7 +223,6 @@ let CreateCase = (props) => {
     }) => {
         let { t } = useTranslation();
         const required = (value) => (value ? undefined : "Required");
-        console.log(custom.hint);
         return (
             <>
                 <div
@@ -378,7 +377,7 @@ let CreateCase = (props) => {
                             options={fieldOptions}
                             id={name}
                             validate={[required]}
-                            errorMsg="Select an option"
+                            errorMsg={t("newappeal:select-an-option-label")}
                             component={RenderRadio}
                             inline={props.inline}
                             hint={props.hint}
@@ -397,7 +396,7 @@ let CreateCase = (props) => {
                         options={fieldOptions}
                         id={name}
                         validate={[required]}
-                        errorMsg="Select an option"
+                        errorMsg={t("newappeal:select-an-option-label")}
                         component={RenderRadio}
                         inline={props.inline}
                         hint={props.hint}
@@ -435,17 +434,17 @@ let CreateCase = (props) => {
 
         appTypeCollection = getFormCollectionByID(whichAppealType);
 
-        console.log(
-            "/newappeal" +
-                "/" +
-                appTypeCollection.UrlName +
-                "?lpa=" +
-                values.lpaTypes +
-                "&apt=" +
-                whichAppealType +
-                "&id=" //+
-            //  data.incidentid
-        );
+        // console.log(
+        //     "/newappeal" +
+        //         "/" +
+        //         appTypeCollection.UrlName +
+        //         "?lpa=" +
+        //         values.lpaTypes +
+        //         "&apt=" +
+        //         whichAppealType +
+        //         "&id=" //+
+        //     //  data.incidentid
+        // );
 
         delete values.confirmHASCAS;
 
@@ -534,15 +533,13 @@ let CreateCase = (props) => {
                         <Radiofield
                             name={"confirmHASCAS"}
                             datafieldname={"confirmHASCAS"}
-                            label={"Confirm HAS/CAS appeal is required"}
-                            hint={
-                                "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal"
-                            }
-                            options="[true|Yes,false|No]"
+                            label={t("newappeal:hascas-confirmation-label")}
+                            hint={t("newappeal:hascas-confirmation-hint")}
+                            options="[true|newappeal:yes-option-label,false|newappeal:no-option-label]"
                             id={"confirmHASCAS"}
                             className="govuk-radios__input"
                             validate={"[required]"}
-                            errorMsg="Select an option"
+                            errorMsg={t("newappeal:select-an-option-label")}
                         />
                     )}
                     <button
diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json
index 4bf19550..ae12bc98 100644
--- a/locales/cy/newappeal.json
+++ b/locales/cy/newappeal.json
@@ -9,6 +9,11 @@
     "select-default": "Dewiswch...",
     "change-link-label": "Newid",
     "submit-appeal-button": "Cyflwyno apêl",
+    "yes-option-label": "Ydw",
+    "no-option-label": "Na",
+    "select-an-option-label": "Dewiswch opsiwn",
+    "hascas-confirmation-label": "Cadarnhau bod angen apêl HAS/CAS",
+    "hascas-confirmation-hint": "Mae'r llwybr apêl hwn yn berthnasol dim ond os yw'ch cais yn ymwneud â gwrthod caniatâd cynllunio, neu wrthodiad i gais i amrywio neu ddileu amod sydd ynghlwm wrth ganiatâd blaenorol. Bydd pob cais arall yn cael ei gyflwyno drwy Apêl Cynllunio Adran 78",
     "about-you-page-title": "Amdanat ti",
     "about-you-on-behalf-label": "Cyflwynwyd apêl ar ran:",
     "about-you-who-can-appeal-label": "Pwy all apelio?",
diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json
index 013645ef..a19f74ac 100644
--- a/locales/en/newappeal.json
+++ b/locales/en/newappeal.json
@@ -9,6 +9,11 @@
     "select-default": "Select...",
     "change-link-label": "Change",
     "submit-appeal-button": "Submit appeal",
+    "yes-option-label": "Yes",
+    "no-option-label": "No",
+    "select-an-option-label": "Select an option",
+    "hascas-confirmation-label": "Confirm HAS/CAS appeal is required",
+    "hascas-confirmation-hint": "This appeal route is only applicable if your application relates the refusal of planning permission, orthe refusal of an application to vary or remove a condition attached to a previous permision. All other applications will be submitted via a Section 78 Planning Appeal",
     "about-you-page-title": "About you",
     "about-you-on-behalf-label": "Appeal submitted on behalf of:",
     "about-you-who-can-appeal-label": "Who can appeal?",

From 45e11c57134244b93a270fb974eb39692f5d08f9 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 15 Jun 2022 14:54:59 +0100
Subject: [PATCH 4/5] logic for has or cas

---
 components/elements/index.js                  | 163 ++++++++++++++----
 components/newappeal/buildfield.js            |   8 +
 components/newappeal/createCase.js            |   2 +
 data/formsxml/householderappealhas.xml        |  69 +++++---
 .../getappealtypesfornewappeal_api.js         |  10 +-
 5 files changed, 188 insertions(+), 64 deletions(-)

diff --git a/components/elements/index.js b/components/elements/index.js
index ae011265..8ddc18ab 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -621,6 +621,7 @@ const RenderYesNo = ({
 
 export function YesNofield(props) {
     const router = useRouter();
+    let { t } = useTranslation();
 
     const { name, label, inline, validation } = props;
     const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
@@ -773,6 +774,7 @@ export function Radiofield(props) {
     const router = useRouter();
     const required = (value) => (value ? undefined : "Required");
     // console.log(props.options);
+    let { t } = useTranslation();
 
     const fieldOptions = props.options
         .slice(1, props.options.length - 1)
@@ -996,51 +998,142 @@ export function PickList(props) {
 }
 
 export function NumericField(props) {
-    const { name, label, validation } = props;
+    const {
+        name,
+        label,
+        validation,
+        form,
+        formProps,
+        parentFieldShowOnValue,
+        parentField,
+    } = props;
     const required = (value) => (value ? undefined : "Required");
 
+    //parentFieldShowOnValue
+    var showIfHasParentShowValue =
+        parentField != false &&
+        !_.isEmpty(formProps[form]) &&
+        _.has(formProps[form].values, parentField) &&
+        parentFieldShowOnValue.indexOf(
+            formProps[form].values[parentField].toString()
+        ) > -1;
+
+    (showIfHasParentShowValue == parentField) != false &&
+        showIfHasParentShowValue;
+
+    console.log("parentField:", parentField, showIfHasParentShowValue);
+
     return (
-        <div className="govuk-form-group">
-            <Field
-                name={props.name}
-                id={props.name}
-                type="number"
-                className="govuk-input  govuk-input--width-20"
-                spellCheck="false"
-                aria-describedby={name}
-                pattern="[0-9]*"
-                inputMode="numeric"
-                parse={Number}
-                validate={eval(validation)}
-                component={RenderTextfield}
-                label={label}
-            />
-        </div>
+        <>
+            {parentField != false ? (
+                showIfHasParentShowValue && (
+                    <div className="govuk-form-group">
+                        <Field
+                            name={props.name}
+                            id={props.name}
+                            type="number"
+                            className="govuk-input  govuk-input--width-20"
+                            spellCheck="false"
+                            aria-describedby={name}
+                            pattern="[0-9]*"
+                            inputMode="numeric"
+                            parse={Number}
+                            validate={eval(validation)}
+                            component={RenderTextfield}
+                            label={label}
+                        />
+                    </div>
+                )
+            ) : (
+                <div className="govuk-form-group">
+                    <Field
+                        name={props.name}
+                        id={props.name}
+                        type="number"
+                        className="govuk-input  govuk-input--width-20"
+                        spellCheck="false"
+                        aria-describedby={name}
+                        pattern="[0-9]*"
+                        inputMode="numeric"
+                        parse={Number}
+                        validate={eval(validation)}
+                        component={RenderTextfield}
+                        label={label}
+                    />
+                </div>
+            )}
+        </>
     );
 }
 
 export function DecimalField(props) {
-    const { name, label, validation } = props;
+    const {
+        name,
+        label,
+        validation,
+        form,
+        formProps,
+        parentFieldShowOnValue,
+        parentField,
+    } = props;
     const required = (value) => (value ? undefined : "Required");
 
+    //parentFieldShowOnValue
+    var showIfHasParentShowValue =
+        parentField != false &&
+        !_.isEmpty(formProps[form]) &&
+        _.has(formProps[form].values, parentField) &&
+        parentFieldShowOnValue.indexOf(
+            formProps[form].values[parentField].toString()
+        ) > -1;
+
+    (showIfHasParentShowValue == parentField) != false &&
+        showIfHasParentShowValue;
+
+    console.log("parentField:", parentField, showIfHasParentShowValue);
+
     return (
-        <div className="govuk-form-group">
-            <Field
-                name={props.name}
-                id={props.name}
-                // component="input"
-                type="number"
-                className="govuk-input govuk-input--width-10"
-                spellCheck="false"
-                aria-describedby={name}
-                pattern="[0-9]*"
-                inputMode="numeric"
-                parse={Number}
-                validate={eval(validation)}
-                component={RenderTextfield}
-                label={props.label}
-            />
-        </div>
+        <>
+            {parentField != false ? (
+                showIfHasParentShowValue && (
+                    <div className="govuk-form-group">
+                        <Field
+                            name={props.name}
+                            id={props.name}
+                            // component="input"
+                            type="number"
+                            className="govuk-input govuk-input--width-10"
+                            spellCheck="false"
+                            aria-describedby={name}
+                            pattern="[0-9]*"
+                            inputMode="numeric"
+                            parse={Number}
+                            validate={eval(validation)}
+                            component={RenderTextfield}
+                            label={props.label}
+                        />
+                    </div>
+                )
+            ) : (
+                <div className="govuk-form-group">
+                    <Field
+                        name={props.name}
+                        id={props.name}
+                        // component="input"
+                        type="number"
+                        className="govuk-input govuk-input--width-10"
+                        spellCheck="false"
+                        aria-describedby={name}
+                        pattern="[0-9]*"
+                        inputMode="numeric"
+                        parse={Number}
+                        validate={eval(validation)}
+                        component={RenderTextfield}
+                        label={props.label}
+                    />
+                </div>
+            )}
+        </>
     );
 }
 
diff --git a/components/newappeal/buildfield.js b/components/newappeal/buildfield.js
index 0f4e9a50..6244b143 100644
--- a/components/newappeal/buildfield.js
+++ b/components/newappeal/buildfield.js
@@ -149,7 +149,11 @@ export default function BuildField(props) {
                     <NumericField
                         name={props.datafieldname}
                         label={props.label}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
                         validation={props.validation}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
                     />
                 );
                 break;
@@ -158,7 +162,11 @@ export default function BuildField(props) {
                     <DecimalField
                         name={props.datafieldname}
                         label={props.label}
+                        form={props.props.props.form}
+                        formProps={props.props.props.props.form}
                         validation={props.validation}
+                        parentField={props.parentField}
+                        parentFieldShowOnValue={props.parentFieldShowOnValue}
                     />
                 );
                 break;
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 16382da1..b9aa1837 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -448,6 +448,8 @@ let CreateCase = (props) => {
 
         delete values.confirmHASCAS;
 
+        console.log(appTypeCollection);
+
         createNewCase(
             appTypeCollection.appealTypeID,
             values.lpaTypes,
diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml
index d4bf0870..d9091e7d 100644
--- a/data/formsxml/householderappealhas.xml
+++ b/data/formsxml/householderappealhas.xml
@@ -21,30 +21,11 @@
 									</cell>
 								</row>
 								<row>
-									<cell id="{a3018a30-9552-d2a6-5796-78a11a3b1c17}" showlabel="true" locklevel="0">
+									<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="Case" languagecode="1033" />
+											<label description="What is this appeal type?" languagecode="1033" />
 										</labels>
-										<control id="pinswg_planningappeals78ids" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_planningappeals78ids" disabled="false" uniqueid="{e66b1aa3-59b9-7508-818e-c5289da259d3}">
-										</control>
-									</cell>
-								</row>
-								<row>
-									<cell id="{9cdd3935-7db9-8449-0442-80b615089b76}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Associated (LPA)" languagecode="1033" />
-										</labels>
-										<control id="pinswg_localplanningauthority" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_localplanningauthority" disabled="false" uniqueid="{70a200cc-bb9e-6844-4a34-1a602a160655}">
-										</control>
-									</cell>
-								</row>
-								<row>
-									<cell id="{a60c3762-2733-ed52-7323-5b8b2c35673a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Appellant" languagecode="1033" />
-										</labels>
-										<control id="pinswg_appellant" classid="{270BD3DB-D9AF-4782-9025-509E298DEC0A}" datafieldname="pinswg_appellant" disabled="false" uniqueid="{741912d8-01ae-e9d6-1d7c-cc2aedc47696}">
-										</control>
+										<control id="pinswg_hascas_appealtype" classid="{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldcontent="[846040000|Householder Appeal,846040001|Minor Commercial appeal]" datafieldname="pinswg_hascas_appealtype" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
 									</cell>
 								</row>
 							</rows>
@@ -312,6 +293,14 @@
 								<label description="Section" languagecode="1033" />
 							</labels>
 							<rows>
+								<row>
+									<cell id="{736042e8-d03e-e30e-520e-c2226136c43c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="What is overall the size of the appeal site, as shown on the red line boundary plan? (in hectares)" languagecode="1033" />
+										</labels>
+										<control validation="[required]" id="pinswg_areaofsiteinhectaresdec" parentField="pinswg_hascas_appealtype" parentFieldShowOnValue="846040001" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
+									</cell>
+								</row>
 								<row>
 									<cell id="{977a773c-b96c-8e0a-776e-240024ea1839}" showlabel="true" locklevel="0">
 										<labels>
@@ -325,7 +314,7 @@
 										<labels>
 											<label description="Is flooding an issue?" languagecode="1033" />
 										</labels>
-										<control validation="[required]" id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
+										<control validation="[required]" id="pinswg_isfloodinganissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodinganissue" disabled="false" uniqueid="{d36097a3-122e-273b-75b4-2230a0917679}" />
 									</cell>
 								</row>
 								<row>
@@ -333,7 +322,7 @@
 										<labels>
 											<label description="Do the works affect the setting of a Listed Building?" languagecode="1033" />
 										</labels>
-										<control validation="[required]" id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
+										<control validation="[required]" id="pinswg_developmentaffectsettingifalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingifalisted" disabled="false" uniqueid="{001d4a59-1a09-007c-c0bc-e72b09693863}" />
 									</cell>
 								</row>
 								<row>
@@ -488,21 +477,45 @@
 							</labels>
 							<rows>
 								<row>
-									<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="File upload" languagecode="1033" />
+											<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
 										</labels>
 										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 								<row>
-									<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="File upload2" languagecode="1033" />
+											<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
 										</labels>
 										<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Design and Access Statement (if relevant)" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload3" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Any other material you may deem relevant" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload6" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
 							</rows>
 						</section>
 					</sections>
diff --git a/pages/api/endpoint/getappealtypesfornewappeal_api.js b/pages/api/endpoint/getappealtypesfornewappeal_api.js
index 2b561553..2ccf80e4 100644
--- a/pages/api/endpoint/getappealtypesfornewappeal_api.js
+++ b/pages/api/endpoint/getappealtypesfornewappeal_api.js
@@ -19,7 +19,15 @@ const ApiResponse = (req, res) => {
                 "attributevalue": 846040025,
             },
             {
-                "value": "Householder and Minor Commercial Appeals - HAS/CAS",
+                "value": "Householder Appeals - HAS",
+                "stringmapid": "585d46a7-9138-ec11-aacb-00224800be9c",
+                "organizationid": "01191a4d-105f-eb11-aaba-00224800be9c",
+                "attributevalue@OData.Community.Display.V1.FormattedValue":
+                    "846,040,004",
+                "attributevalue": 846040004,
+            },
+            {
+                "value": "Minor Commercial Appeals - CAS",
                 "stringmapid": "585d46a7-9138-ec11-aacb-00224800be9c",
                 "organizationid": "01191a4d-105f-eb11-aaba-00224800be9c",
                 "attributevalue@OData.Community.Display.V1.FormattedValue":

From 44f2ae222d87de4c71813deefb40cfc2eeed7b2e Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 15 Jun 2022 15:34:48 +0100
Subject: [PATCH 5/5] updates to lbc

---
 components/myportal/topthree.js               | 21 +++----
 data/formsxml/adverts.xml                     | 12 ++--
 data/formsxml/householderappealhas.xml        |  2 +-
 ...istedbuildingandconservationareaconsen.xml | 56 +++++++++++++++++--
 .../getappealtypesfornewappeal_api.js         | 10 +---
 styles/sass/welshgov/_application.scss        |  2 +
 6 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index c11546b0..0321b5dc 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -209,16 +209,17 @@ const TopThree = (props) => {
                             </a>
                         </Link>
                     </div>
-                    {(topThreeType == "awaitingSubmission" ||
-                        topThreeType == "watchedCases") && (
-                        <div>
-                            {
-                                showTopThreeArr[key][
-                                    "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
-                                ]
-                            }
-                        </div>
-                    )}
+                    {/* {(topThreeType == "awaitingSubmission" ||
+                        topThreeType == "watchedCases") && ( */}
+                    <div>
+                        <b>Appeal type:</b>{" "}
+                        {
+                            showTopThreeArr[key][
+                                "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+                            ]
+                        }
+                    </div>
+                    {/* )} */}
                     {/* {topThreeType != "awaitingSubmission" ? ( */}
                     <div className="carModuleAddress">
                         <b>{t("myportal:case-address")}:</b>{" "}
diff --git a/data/formsxml/adverts.xml b/data/formsxml/adverts.xml
index d604d802..a19b3338 100644
--- a/data/formsxml/adverts.xml
+++ b/data/formsxml/adverts.xml
@@ -19,7 +19,7 @@
 										</labels>
 										<control id="pinswg_name" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_name" />
 									</cell>
-								</row>	
+								</row>
 							</rows>
 						</section>
 					</sections>
@@ -407,7 +407,7 @@
 								<label description="Section" languagecode="1033" />
 							</labels>
 							<rows>
-										<row>
+								<row>
 									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
 											<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
@@ -415,7 +415,7 @@
 										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
-									<row>
+								<row>
 									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
 											<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
@@ -431,7 +431,7 @@
 										<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload7" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
-									<row>
+								<row>
 									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
 											<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
@@ -439,12 +439,12 @@
 										<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
-									<row>
+								<row>
 									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
 											<label description="Any other material you may deem relevant" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml
index d9091e7d..141271c0 100644
--- a/data/formsxml/householderappealhas.xml
+++ b/data/formsxml/householderappealhas.xml
@@ -513,7 +513,7 @@
 										<labels>
 											<label description="Any other material you may deem relevant" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload6" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/listedbuildingandconservationareaconsen.xml b/data/formsxml/listedbuildingandconservationareaconsen.xml
index eead9858..b1572049 100644
--- a/data/formsxml/listedbuildingandconservationareaconsen.xml
+++ b/data/formsxml/listedbuildingandconservationareaconsen.xml
@@ -409,7 +409,7 @@
 										<labels>
 											<label description="Please explain why you have chosen this procedure" languagecode="1033" />
 										</labels>
-										<control id="pinswg_chosenprocedureexplanation" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_chosenprocedureexplanation" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
+										<control id="pinswg_chosenprocedureexplanation" parentField="pinswg_procedure" parentFieldShowOnValue="846040001,846040002" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_chosenprocedureexplanation" disabled="false" uniqueid="{76e34a67-9087-98a0-037b-c4e2077d3248}" />
 									</cell>
 								</row>
 								<row>
@@ -417,7 +417,7 @@
 										<labels>
 											<label description="Do you intend to submit a costs application with this appeal? (see guidance for further information)" languagecode="1033" />
 										</labels>
-										<control validation="[required]" id="pinswg_costappliedforindicator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindicator" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of costs" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
+										<control validation="[required]" id="pinswg_costappliedforindecator" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_costappliedforindecator" requiredDocumentValue="Yes" requiredDocumentLabel="Statement of costs" disabled="false" uniqueid="{1d56690d-96b4-9338-2935-4a111d9c9e80}" />
 									</cell>
 								</row>
 							</rows>
@@ -450,13 +450,61 @@
 							</labels>
 							<rows>
 								<row>
-									<cell id="{a85e23f4-b453-445b-b62c-a33a54cdc831}" showlabel="true" locklevel="0">
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
 										<labels>
-											<label description="File upload" languagecode="1033" />
+											<label description="Site plan" languagecode="1033" hint="Site plan (preferably on a copy of an Ordnance Survey map at not less than 10,000 scale) showing the general location of the proposed development and its boundary. This plan should show two named roads so as to assist the location of the appeal site or premises. The application site should be edged or shaded in red and any other adjoining land owned or controlled by the appellant (if any) edged or shaded in blue." />
 										</labels>
 										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Plans, drawings and documents submitted to the LPA (and list)" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload2" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload2" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Design and Access Statement (if relevant)" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload3" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload3" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Correspondence with the LPA relating to the application" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Any other material you may deem relevant" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload4" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload4" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="If the appeal is against the LPA's refusal or failure to decide an application which relates to a condition, we must have a copy of the original permission with the condition attached" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload5" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload5" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16D63FD6-119B-4353-BDCA-18358721C3FE}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="If the appeal is against the LPA's failure to decide an application please supply a copy of the LPA's letter registering your application" languagecode="1033" />
+										</labels>
+										<control id="pinswg_fileUpload6" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload6" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+									</cell>
+								</row>
 							</rows>
 						</section>
 					</sections>
diff --git a/pages/api/endpoint/getappealtypesfornewappeal_api.js b/pages/api/endpoint/getappealtypesfornewappeal_api.js
index 2ccf80e4..2b561553 100644
--- a/pages/api/endpoint/getappealtypesfornewappeal_api.js
+++ b/pages/api/endpoint/getappealtypesfornewappeal_api.js
@@ -19,15 +19,7 @@ const ApiResponse = (req, res) => {
                 "attributevalue": 846040025,
             },
             {
-                "value": "Householder Appeals - HAS",
-                "stringmapid": "585d46a7-9138-ec11-aacb-00224800be9c",
-                "organizationid": "01191a4d-105f-eb11-aaba-00224800be9c",
-                "attributevalue@OData.Community.Display.V1.FormattedValue":
-                    "846,040,004",
-                "attributevalue": 846040004,
-            },
-            {
-                "value": "Minor Commercial Appeals - CAS",
+                "value": "Householder and Minor Commercial Appeals - HAS/CAS",
                 "stringmapid": "585d46a7-9138-ec11-aacb-00224800be9c",
                 "organizationid": "01191a4d-105f-eb11-aaba-00224800be9c",
                 "attributevalue@OData.Community.Display.V1.FormattedValue":
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 93b67216..902d81d4 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -28,9 +28,11 @@ html {
 .govuk-breadcrumbs__link,
 .govuk-fieldset__legend--s,
 .govuk-input,
+.govuk-textarea,
 .govuk-panel,
 .govuk-panel__title,
 .govuk-warning-text__text,
+.govuk-hint,
 .app-cookie-banner,
 .govuk-error-message.govuk-form-group--error,
 h1,