Merged PR 1306: PII uat defect fixes

Related work items: #12806, #12807, #12810, #12811, #12812, #12813, #12814, #12815, #12816, #12820, #12821, #12823, #12829, #12830, #12831, #12832, #12833, #12834, #12837, #12839

components/account/personaldetails.js

@@ -309,7 +309,7 @@ let PersonalDetails = (props) => {
                                 name="telephone1"
                                 id="telephone1"
                                 component={RenderTextfield}
-                                type="number"
+                                type="text"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required, phoneNumber]}
                                 label={t("account:account-telephone-label")}

components/account/personaldetailsComplete.js

@@ -30,7 +30,7 @@ const PersonalDetailsComplete = (props) => {
         <>
             <p className="govuk-body">{t("account:account-complete-para-1")}</p>
 
-            <p className="govuk-body">{t("account:account-complete-para-2")}</p>
+            {/* <p className="govuk-body">{t("account:account-complete-para-2")}</p> */}
 
             <p className="govuk-body">
                 <Link

components/account/registerform.js

@@ -190,7 +190,7 @@ const RegisterForm = (props) => {
                                 name="telephone1"
                                 id="telephone1"
                                 component={RenderTextfield}
-                                type="number"
+                                type="text"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required, phoneNumber]}
                                 label={t(

components/elements/index.js

@@ -70,7 +70,11 @@ const RenderTextfield = ({
                                 : 100
                             : 200
                     }
-                    // pattern={custom.hasOwnProperty("pattern") && custom.pattern}
+                    pattern={
+                        custom.hasOwnProperty("pattern")
+                            ? custom.pattern
+                            : undefined
+                    }
                 />
             </div>
         </>
@@ -379,24 +383,40 @@ export const RenderRichMultiline = ({
 
     return (
         <>
-            <label className="govuk-label" htmlFor={name}>
+            <div
-                {label}
+                className={
-            </label>
+                    touched && error
-            <ReactQuill
+                        ? "govuk-form-group govuk-form-group--error"
-                modules={modules}
+                        : "govuk-form-group "
-                theme="snow"
+                }
-                value={editValue}
+            >
-                onChange={changeEdit}
+                <label className="govuk-label" htmlFor={name}>
-            />
+                    {label}
-            <textarea
+                </label>
-                {...input}
+
-                id={id}
+                {error && (
-                name={name}
+                    <span id={id + "-error"} className="govuk-error-message">
-                rows={rows}
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
-                className={className}
+                        {error}
-                value={editValue}
+                    </span>
-                style={{ display: "none" }}
+                )}
-            ></textarea>
+
+                <ReactQuill
+                    modules={modules}
+                    theme="snow"
+                    value={editValue}
+                    onChange={changeEdit}
+                />
+                <textarea
+                    {...input}
+                    id={id}
+                    name={name}
+                    rows={rows}
+                    className={className}
+                    value={editValue}
+                    style={{ display: "none" }}
+                ></textarea>
+            </div>
         </>
     );
 };
@@ -503,6 +523,7 @@ const RenderDatePicker = ({
 }) => {
     const router = useRouter();
 
+    let { t } = useTranslation();
     var startDateArr =
         custom.dateStart != "0" ? custom.dateStart.split("") : custom.dateStart;
     var endDateArr =
@@ -560,6 +581,11 @@ const RenderDatePicker = ({
                         >
                             {FieldsTranslations(label)}
                         </label>
+                        {custom.hint != false && (
+                            <div className="govuk-hint govuk-!-font-size-14">
+                                {t(custom.hint)}
+                            </div>
+                        )}
                     </legend>
                     {touched && error && (
                         <span
@@ -637,6 +663,7 @@ export function DateFieldPicker(props) {
                         errorMsg="Select a date"
                         dateStart={dateStart}
                         dateEnd={dateEnd}
+                        hint={props.hint}
                     />
                 )
             ) : (
@@ -649,6 +676,7 @@ export function DateFieldPicker(props) {
                     errorMsg="Select a date"
                     dateStart={dateStart}
                     dateEnd={dateEnd}
+                    hint={props.hint}
                 />
             )}
         </div>
@@ -1230,7 +1258,7 @@ const RenderPickList = ({
     dropdownObj = dropdownObj[0];
 
     const required = (value) => {
-        return value || value == 0 ? undefined : "Requirewwwd";
+        return value || value == 0 ? undefined : "Is required";
     };
 
     return (
@@ -1251,13 +1279,10 @@ const RenderPickList = ({
                         {error}
                     </span>
                 )}
-                <select
+                <select {...input} className="govuk-select " id={id} name={id}>
-                    {...input}
+                    <option value="" disabled defaultValue>
-                    className="govuk-select "
+                        {t("newappeal:select-default")}
-                    id={label}
+                    </option>
-                    name={label}
-                >
-                    <option>{t("newappeal:select-default")}</option>
                     {Object.keys(dropdownObj).map((key, index) => {
                         return (
                             <option key={key} value={dropdownObj[key].Value}>
@@ -1311,7 +1336,7 @@ export function NumericField(props) {
     };
     const isNumber = (value) => {
         const regex = /^\d*\.?\d{0,1}$/;
-        return regex.test(value) ? undefined : "Should be a number or decimal";
+        return regex.test(value) ? undefined : "Should be a number";
     };
 
     const maxLength = (max) => (value) =>
@@ -1358,35 +1383,40 @@ export function NumericField(props) {
             ) : (
                 <div className="govuk-form-group">
                     <Field
-                        name={props.name}
-                        id={props.name}
-                        type="number"
-                        className="govuk-input  govuk-input--width-20 wwwww"
-                        spellCheck="false"
-                        aria-describedby={name}
-                        pattern="[0-9]*"
-                        inputMode="numeric"
-                        parse={Number}
-                        validate={[required]}
-                        component={RenderTextfield}
-                        label={label}
-                        normalize={(value) => parseInt(value)}
-
                         // name={props.name}
                         // id={props.name}
-                        // // component="input"
                         // type="text"
-                        // className="govuk-input govuk-input--width-20 wwww"
+                        // className="govuk-input  govuk-input--width-20 wwwww"
                         // aria-describedby={name}
-                        // pattern="^\d*(\.\d{0,2})?$"
+                        // //pattern="^\d*\.?\d+$"
+                        // pattern="[0-9]*"
+                        // // inputMode="numeric"
+                        // // parse={Number}
                         // validate={[
                         //     required,
-                        //     isNumber,
+                        //     // isNumber,
                         //     maxLength(props.maxFieldLength),
                         // ]}
                         // component={RenderTextfield}
-                        // label={props.label}
+                        // label={label}
+                        // // normalize={(value) => parseInt(value)}
                         // maxFieldLength={props.maxFieldLength}
+
+                        name={props.name}
+                        id={props.name}
+                        type="text"
+                        className="govuk-input govuk-input--width-10"
+                        aria-describedby={name}
+                        //pattern="^\d*\.?\d+$"
+                        pattern="[0-9]*"
+                        validate={[
+                            required,
+                            isNumber,
+                            maxLength(props.maxFieldLength),
+                        ]}
+                        component={RenderTextfield}
+                        label={props.label}
+                        maxFieldLength={props.maxFieldLength}
                     />
                 </div>
             )}
@@ -1460,21 +1490,18 @@ export function DecimalField(props) {
                         name={props.name}
                         id={props.name}
                         // component="input"
-                        type="number"
+                        type="text"
                         className="govuk-input govuk-input--width-10"
                         spellCheck="false"
                         aria-describedby={name}
-                        pattern="^\d*(\.\d{0,2})?$"
+                        pattern="^\d*\.?\d+$"
-                        inputMode="numeric"
+                        // inputMode="numeric"
-                        parse={Number}
+                        // parse={Number}
-                        validate={[
+                        validate={validateDecimal}
-                            required,
+                        component={RenderDecimalField}
-                            isNumber,
-                            maxLength(props.maxFieldLength),
-                        ]}
-                        component={RenderTextfield}
                         label={props.label}
                         maxFieldLength={props.maxFieldLength}
+                        // normalize={normalizeDecimal} // Normalizing input as float
                     />
                 </div>
             )}
@@ -1482,6 +1509,78 @@ export function DecimalField(props) {
     );
 }
 
+const normalizeDecimal = (value) => {
+    return value ? parseFloat(value) : value;
+};
+
+const validateDecimal = (value) => {
+    if (!value) return "This field is required";
+
+    // Regex to match whole numbers or decimal numbers (up to 7 characters including decimal)
+    const regex = /^\d{1,6}(\.\d{1,2})?$/; // Up to 6 digits before the decimal, 2 after
+
+    // Check if the value matches the regex pattern
+    if (!regex.test(value)) {
+        return "Invalid number (max 7 characters, 2 decimal places)";
+    }
+
+    return undefined;
+};
+
+const RenderDecimalField = ({
+    name,
+    id,
+    label,
+    datafieldname,
+    className,
+    input,
+    errorMsg,
+    meta: { touched, error },
+    ...custom
+}) => {
+    // <div>
+    //     <label>{label}</label>
+    //     <input {...input} type="text" />
+    //     {touched && error && <span>{error}</span>}
+    // </div>;
+
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <label className="govuk-label " htmlFor={id} id={id + "_label"}>
+                    {FieldsTranslations(label)}
+                </label>
+                {touched && error && (
+                    <span id={id + "-error"} className="govuk-error-message">
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        {error}
+                    </span>
+                )}
+                <input
+                    {...input}
+                    // type={custom.type}
+                    className={className}
+                    name={name}
+                    id={id}
+                    maxLength={
+                        custom.hasOwnProperty("maxFieldLength")
+                            ? custom.maxFieldLength
+                                ? custom.maxFieldLength
+                                : 100
+                            : 200
+                    }
+                />
+            </div>
+        </>
+    );
+};
+
 const RenderCaseID = {};
 
 export function ReadOnlyfield(props) {

components/newappeal/aboutyou.js

@@ -611,7 +611,7 @@ let AboutYou = (props) => {
                         name={"pinswg_appellantphonenumber"}
                         id={"pinswg_appellantphonenumber"}
                         component={RenderTextfield}
-                        type="number"
+                        type="text"
                         className="govuk-input govuk-input--width-20"
                         validate={[required, phoneNumber]}
                         label={t(
@@ -794,7 +794,7 @@ let AboutYou = (props) => {
                         name={"pinswg_agentphonenumber"}
                         id={"pinswg_agentphonenumber"}
                         component={RenderTextfield}
-                        type="number"
+                        type="text"
                         className="govuk-input govuk-input--width-20"
                         validate={[required, phoneNumber]}
                         label={t(

components/newappeal/buildchecksection.js

@@ -130,27 +130,29 @@ let BuildCheckSection = (props) => {
     };
 
     const finaliseAppeal = async () => {
-        setFinaliseAppealProcess(true);
         //console.log("finalising appeal:");
-        await generateAppealPDF(
+        confirmSections
-            pdfObj,
+            ? (setFinaliseAppealProcess(true),
-            props.props.accountDetails.containerID,
+              await generateAppealPDF(
-            props.appealType.caseReference.ticketnumber,
+                  pdfObj,
-            router.query.appealtypes,
+                  props.props.accountDetails.containerID,
-            pdfObj.filesList
+                  props.appealType.caseReference.ticketnumber,
-            // props.appealType.fileList
+                  router.query.appealtypes,
-        )
+                  pdfObj.filesList
-            .then((data) => {
+                  // props.appealType.fileList
-                console.log("have generated pdf:", data);
+              )
-                sendCaseCompleteMessage(
+                  .then((data) => {
-                    props.props.accountDetails.containerID,
+                      console.log("have generated pdf:", data);
-                    props.appealType.caseReference.ticketnumber
+                      sendCaseCompleteMessage(
-                );
+                          props.props.accountDetails.containerID,
-            })
+                          props.appealType.caseReference.ticketnumber
-            .then(() => {
+                      );
-                //console.log("have sent complete message :");
+                  })
-                setCurrentSection(9999);
+                  .then(() => {
-            });
+                      //console.log("have sent complete message :");
+                      setCurrentSection(9999);
+                  }))
+            : setConfirmSections(false);
     };
 
     return (

components/newappeal/buildfield.js

@@ -129,6 +129,7 @@ export default function BuildField(props) {
                         validation={props.validation}
                         dateStart={props.dateStart}
                         dateEnd={props.dateEnd}
+                        hint={props.hint}
                     />
                 );
                 break;

components/newappeal/buildsection.js

@@ -313,6 +313,26 @@ let BuildSection = (props) => {
 
         // Object.assign(values, { "filesList": buildAppealFilesArray });
 
+        // Function to parse a specific key (e.g., 'price') in an array of objects
+        const parseFloatForKeyInObject = (obj, key) => {
+            // Check if the object has the key and the value can be parsed as a float
+            if (
+                obj.hasOwnProperty(key) &&
+                typeof obj[key] === "string" &&
+                !isNaN(obj[key].trim())
+            ) {
+                // Parse the value as a float and update the object
+                return { ...obj, [key]: parseFloat(obj[key]) };
+            }
+            // If the key doesn't exist or value can't be parsed, return the original object
+            return obj;
+        };
+
+        valuesObj = parseFloatForKeyInObject(
+            valuesObj,
+            "pinswg_areaofsiteinhectaresdec"
+        );
+
         delete valuesObj["_pinswg_appellant_value"];
         //console.log("has errors:", props.invalid);
         props.invalid == false && updateCaseProgress(valuesObj, false, false);
@@ -440,53 +460,56 @@ let BuildSection = (props) => {
                                             false,
                                             false
                                         );
+                                        // currentSection == 1 &&
+                                        //     setCurrentSection(1);
                                     }}
                                 >
                                     {t("common:continue-button")}
                                 </button>
-                                {savingStatus ? (
+                                {currentSection > 1 &&
-                                    <span className=" progress-save-active">
+                                    (savingStatus ? (
-                                        {router.locale == "cy"
+                                        <span className=" progress-save-active">
-                                            ? "Nôl data"
+                                            {router.locale == "cy"
-                                            : "Saving data"}
+                                                ? "Nôl data"
-                                        <img
+                                                : "Saving data"}
-                                            className="data-loading-icon"
+                                            <img
-                                            src="/assets/images/loading.gif"
+                                                className="data-loading-icon"
-                                            alt={
+                                                src="/assets/images/loading.gif"
-                                                router.locale == "cy"
+                                                alt={
-                                                    ? "Nôl data"
+                                                    router.locale == "cy"
-                                                    : "Saving data"
+                                                        ? "Nôl data"
-                                            }
+                                                        : "Saving data"
-                                        />
+                                                }
-                                    </span>
+                                            />
-                                ) : (
+                                        </span>
-                                    <button
+                                    ) : (
-                                        className="govuk-button  progress-save "
+                                        <button
-                                        onClick={() => {
+                                            className="govuk-button  progress-save "
-                                            let valuesObj =
+                                            onClick={() => {
-                                                props.props.form[props.form]
+                                                let valuesObj =
-                                                    .values || {};
+                                                    props.props.form[props.form]
+                                                        .values || {};
 
-                                            // console.log(
+                                                // console.log(
-                                            //     "valuesobj:",
+                                                //     "valuesobj:",
-                                            //     valuesObj
+                                                //     valuesObj
-                                            // );
+                                                // );
 
-                                            delete valuesObj[
+                                                delete valuesObj[
-                                                "_pinswg_appellant_value"
+                                                    "_pinswg_appellant_value"
-                                            ];
+                                                ];
 
-                                            // console.log("on save:", valuesObj);
+                                                // console.log("on save:", valuesObj);
-                                            updateCaseProgress(
+                                                updateCaseProgress(
-                                                valuesObj,
+                                                    valuesObj,
-                                                true,
+                                                    true,
-                                                true
+                                                    true
-                                            );
+                                                );
-                                        }}
+                                            }}
-                                    >
+                                        >
-                                        {t("common:save-exit-button")}
+                                            {t("common:save-exit-button")}
-                                    </button>
+                                        </button>
-                                )}
+                                    ))}
                                 {/* <span
                                     onClick={() =>
                                         setCurrentSection(sectionCount + 1)
@@ -669,6 +692,44 @@ const mapDispatchToProps = (dispatch) => {
 
 const selector = formValueSelector("appealForm"); // <-- same as form name
 
+const validate = (values) => {
+    const errors = {};
+
+    const strippedHtml = (htmlStr) => {
+        return htmlStr.replace(/(<([^>]+)>)/gi, "").trim();
+    };
+
+    if (values.hasOwnProperty("pinswg_attachsoc")) {
+        if (values.pinswg_attachsoc == "false") {
+            if (values.hasOwnProperty("pinswg_statementofcase")) {
+                if (strippedHtml(values.pinswg_statementofcase).length == 0)
+                    errors.pinswg_statementofcase =
+                        "Enter submit a statement of case or select Yes to attach a separate Statement of Case Document";
+            } else {
+                errors.pinswg_statementofcase =
+                    "Enter submit a statement of case or select Yes to attach a separate Statement of Case Document";
+            }
+        }
+    }
+
+    if (values.hasOwnProperty("pinswg_costappliedforindicator")) {
+        if (values.pinswg_costappliedforindicator == "true") {
+            if (values.pinswg_attachcostapplication == "false") {
+                if (values.hasOwnProperty("pinswg_costapplication")) {
+                    if (strippedHtml(values.pinswg_costapplication).length == 0)
+                        errors.pinswg_costapplication =
+                            "Enter submit a Cost application or select Yes to attach a separate Costs application";
+                } else {
+                    errors.pinswg_costapplication =
+                        "Enter submit a Cost application or select Yes to attach a separate Costs application";
+                }
+            }
+        }
+    }
+
+    return errors;
+};
+
 export default connect(
     mapStateToProps,
     mapDispatchToProps
@@ -677,5 +738,6 @@ export default connect(
         form: "appealForm",
         destroyOnUnmount: false,
         enableReinitialize: true, // this is needed!!
+        validate,
     })(BuildSection)
 );

data/crmfieldlookuptranslations.json

@@ -2225,7 +2225,7 @@
                     "value_cy": "A yw'n hanfodol i'r Arolygydd fynd i mewn i'r safle i wirio mesuriadau neu ffeithiau perthnasol eraill?"
                 },
                 {
-                    "value": "Please explain why the inspector needs to enter the site",
+                    "value": "Please explain why the Inspector needs to enter the site",
                     "value_cy": "Eglurwch pam fod angen i'r arolygydd fynd i mewn i'r safle"
                 },
                 {

data/formsxml/commercialappealcas.xml

@@ -203,7 +203,7 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Please explain why the inspector needs to enter the site" />
+										<label description="Please explain why the Inspector needs to enter the site" />
 									</labels>
 									<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
 								</row>

data/formsxml/enforcementnoticeappeals174.xml

@@ -795,7 +795,7 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Please explain why the inspector needs to enter the site" />
+										<label description="Please explain why the Inspector needs to enter the site" />
 									</labels>
 									<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
 								</row>

data/formsxml/householderappealhas.xml

@@ -208,7 +208,7 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Please explain why the inspector needs to enter the site" hint="newappeal:new-appeal-inspector-onsite-paragraph" />
+										<label description="Please explain why the Inspector needs to enter the site" hint="newappeal:new-appeal-inspector-onsite-paragraph" />
 									</labels>
 									<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
 								</row>

data/formsxml/listedbuildingandconservationareaconsen.xml

@@ -170,7 +170,7 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Please explain why the inspector needs to enter the site" />
+										<label description="Please explain why the Inspector needs to enter the site" />
 									</labels>
 									<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
 								</row>

data/formsxml/planningappeals78.xml

@@ -56,7 +56,7 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Application form dated" />
+										<label description="Application form dated" hint="newappeal:new-appeal-dateofapplication-hint" />
 									</labels>
 									<control validation="[required]" id="pinswg_dateofapplication" classid="{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}" datafieldname="pinswg_dateofapplication" dateStart="-5y" dateEnd="0" disabled="false" />
 								</row>
@@ -106,13 +106,13 @@
 									<labels>
 										<label description="Size of overall appeal site (in hectares)" />
 									</labels>
-									<control validation="[required]" id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" maxFieldLength="4" disabled="false" />
+									<control validation="[required]" id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" maxFieldLength="7" disabled="false" />
 								</row>
 								<row>
 									<labels>
 										<label description="What is the area of floor space proposed (in square metres)? If no new floor space enter 0." />
 									</labels>
-									<control validation="[required]" id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="5" disabled="false" />
+									<control validation="[required]" id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" maxFieldLength="7" disabled="false" />
 								</row>
 							</rows>
 						</section>
@@ -202,9 +202,9 @@
 								</row>
 								<row>
 									<labels>
-										<label description="Please explain why the inspector needs to enter the site" hint="newappeal:new-appeal-inspector-onsite-paragraph" />
+										<label description="Please explain why the Inspector needs to enter the site" hint="newappeal:new-appeal-inspector-onsite-paragraph" />
 									</labels>
-									<control id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
+									<control validation="[required]" id="pinswg_whyisinspectorneededonsite" parentField="pinswg_inspectorneededonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_whyisinspectorneededonsite" maxFieldLength="800" disabled="false" />
 								</row>
 								<row>
 									<labels>
@@ -216,7 +216,7 @@
 									<labels>
 										<label description="Please set out the potential health and safety issues" />
 									</labels>
-									<control id="pinswg_outlinehealthandsafetyissuesonsite" parentField="pinswg_healthandsafetyissuesonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_outlinehealthandsafetyissuesonsite" maxFieldLength="800" disabled="false" />
+									<control validation="[required]" id="pinswg_outlinehealthandsafetyissuesonsite" parentField="pinswg_healthandsafetyissuesonsite" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_outlinehealthandsafetyissuesonsite" maxFieldLength="800" disabled="false" />
 								</row>
 							</rows>
 						</section>
@@ -252,7 +252,7 @@
 									<labels>
 										<label description="Please provide details of the appeals including our reference number, if known" />
 									</labels>
-									<control id="pinswg_additionalappealsmadedetails" parentField="pinswg_additionalappealsmade" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_additionalappealsmadedetails" maxFieldLength="800" disabled="false" />
+									<control validation="[required]" id="pinswg_additionalappealsmadedetails" parentField="pinswg_additionalappealsmade" parentFieldShowOnValue="true" classid="{E0DECE4B-6FC8-4a8f-A065-082708572369}" datafieldname="pinswg_additionalappealsmadedetails" maxFieldLength="800" disabled="false" />
 								</row>
 							</rows>
 						</section>
@@ -282,7 +282,7 @@
 									<labels>
 										<label description="Please submit your statement of case" hint="newappeal:new-appeal-submission-of-case-hint" />
 									</labels>
-									<control validation="[required]" id="pinswg_statementofcase" classid="{E0DECE4B-6666-4a8f-A065-082708572369}" datafieldname="pinswg_statementofcase" maxFieldLength="5000" disabled="false" />
+									<control id="pinswg_statementofcase" classid="{E0DECE4B-6666-4a8f-A065-082708572369}" datafieldname="pinswg_statementofcase" maxFieldLength="5000" disabled="false" />
 								</row>
 								<row>
 									<labels>
@@ -312,7 +312,7 @@
 									<labels>
 										<label description="Please submit your Cost Application" hint="newappeal:new-appeal-cost-application-hint" />
 									</labels>
-									<control validation="[required]" id="pinswg_costapplication" parentField="pinswg_costappliedforindicator" parentFieldShowOnValue="true" classid="{E0DECE4B-6666-4a8f-A065-082708572369}" datafieldname="pinswg_costapplication" maxFieldLength="5000" disabled="false" />
+									<control id="pinswg_costapplication" parentField="pinswg_costappliedforindicator" parentFieldShowOnValue="true" classid="{E0DECE4B-6666-4a8f-A065-082708572369}" datafieldname="pinswg_costapplication" maxFieldLength="5000" disabled="false" />
 								</row>
 								<row>
 									<labels>

locales/cy/home.json

@@ -1,7 +1,7 @@
 {
     "login-card-title-temp": "Apeliadau neu geisiadau newydd",
     "login-comingsoon-temp-1": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
-    "login-comingsoon-temp-1a": "Ar hyn o bryd gallwch godi Apeliadau Cynllunio a78, Caniatâd Adeilad Rhestredig ac Ardal Gadwraeth, Apeliadau Deiliaid Tai a Mân Apeliadau Masnachol - HAS/CAS, Hysbysebion ac apeliadau Dilysu.",
+    "login-comingsoon-temp-1a": "Ar hyn o bryd gallwch godi Apeliadau Cynllunio a78.",
     "login-comingsoon-temp-2": "Wrth i ni ddatblygu’r gwasanaeth ar-lein, dewch o hyd i:",
     "login-comingsoon-forms-link-1": "https://llyw.cymru/ffurflenni-apelio",
     "login-comingsoon-forms-label-1": "ffurflenni apêl cynllunio a ffurflenni cais cynllunio",

locales/cy/newappeal.json

@@ -60,6 +60,7 @@
     "new-appeal-introduction-warning-bullet-one": "cyflwynwch eich apêl o fewn 6 mis i ddyddiad hysbysiad penderfyniad yr Awdurdod Cynllunio Lleol",
     "new-appeal-introduction-warning-bullet-two": "darparu'r holl ddogfennau ategol hanfodol o fewn y cyfnod apelio",
     "new-appeal-development-description-hint": "Nodwch fanylion y datblygiad arfaethedig o'r ffurflen gais cynllunio. Os cafodd y cais ei ddiwygio tra’r oedd gyda’r ACLl nodwch fanylion y cynllun diwygiedig ac amgaewch gopi o gytundeb yr ACLl i’r newid.",
+    "new-appeal-dateofapplication-hint": "Dyma ddyddiad y ffurflen gais wreiddiol ",
     "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl neu ran ohono, a bod pob perchennog yn gwybod eich bod wedi gwneud apźl. Defnyddiwch y nodiadau canllaw i gwblhau'r adran hon.",
     "new-appeal-ownership-option-NA": "Amherthnasol",
     "new-appeal-ownership-option-A": "Tystysgrif A - (ar gyfer unig berchnogion safle'r apęl). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb heblaw’r apelydd yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef.",

locales/en/home.json

@@ -1,7 +1,7 @@
 {
     "login-card-title-temp": "New appeals or applications",
     "login-comingsoon-temp-1": "This service is being developed to support online appeals and applications.",
-    "login-comingsoon-temp-1a": "You can currently raise Planning Appeals s78, Listed Building and Conservation Area Consent, Householder and Minor Commercial Appeals - HAS/CAS, Adverts and Non-Validation appeals.",
+    "login-comingsoon-temp-1a": "You can currently raise Planning Appeals s78.",
     "login-comingsoon-temp-2": "While we develop the online service, find:",
     "login-comingsoon-forms-link-1": "https://gov.wales/planning-appeal-forms",
     "login-comingsoon-forms-label-1": "planning appeal and application forms",

locales/en/newappeal.json

@@ -59,6 +59,7 @@
     "new-appeal-introduction-warning-bullet-one": "submit your appeal within 6 months of the date of the Local Planning Authority's decision notice",
     "new-appeal-introduction-warning-bullet-two": "provide all essential supporting documents within the appeal period",
     "new-appeal-development-description-hint": "Enter details of the proposed development from the planning application form. If the application was revised while it was with the LPA enter details of the revised scheme and enclose a copy of the LPA’s agreement to the change.",
+    "new-appeal-dateofapplication-hint": "This is the date of the original application form",
     "new-appeal-ownership-hint": "We need to know who owns the appeal site or part of it, and that all owners know you have made an appeal. Use the guidance notes to complete this section.",
     "new-appeal-ownership-option-NA": "Not applicable",
     "new-appeal-ownership-option-A": "Certificate A - (for sole owners of the appeal site). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",