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] 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,