From 51f2a74b9baeb1a877fcf28a70c8660270c69ce6 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 24 Apr 2024 17:24:35 +0100 Subject: [PATCH] preamble text and other copy changes --- components/elements/index.js | 7 +- components/header.js | 30 +- components/newappeal/complete.js | 49 ++-- components/newappeal/createCase.js | 2 +- data/formsxml/adverts.xml | 16 +- data/formsxml/commercialappealcas.xml | 16 +- data/formsxml/enforcementnoticeappeals174.xml | 16 +- data/formsxml/householderappealhas.xml | 198 ++++++++------ ...istedbuildingandconservationareaconsen.xml | 16 +- .../pinswg_householderappealhas.json | 258 ------------------ locales/cy/newappeal.json | 12 +- locales/en/newappeal.json | 12 +- .../getappealtypesfornewappeal_api.js | 8 + 13 files changed, 247 insertions(+), 393 deletions(-) diff --git a/components/elements/index.js b/components/elements/index.js index 54c886a6..c328e35f 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -131,7 +131,12 @@ export function Textfield(props) { />
- {t("newappeal:new-appeal-introduction-paragraph")} +

{t("newappeal:new-appeal-introduction-paragraph")}

+

+ {t( + "newappeal:new-appeal-introduction-warning-paragraph" + )} +

); diff --git a/components/header.js b/components/header.js index beee003d..7088eed2 100644 --- a/components/header.js +++ b/components/header.js @@ -29,6 +29,10 @@ const Header = (props) => { "/case", "/advancedsearch", "/advancedsearchresults", + "/addresssearch", + "/addresssearchresults", + "/case/id/[incident]", + "/case/[ticketnumber]", "/dnsapplications", "/dnsdetails", "/404", @@ -76,15 +80,14 @@ const Header = (props) => {
- + className="govuk-header__link govuk-link--no-underline govuk-header__link--homepage" + > gov.wales -
@@ -213,10 +216,9 @@ const Header = (props) => { {hasContactLink.includes(router.pathname) == true ? ( - - Contact - + className="govuk-header__link govuk-!-margin-right-3" + > + Contact ) : ( "" @@ -224,7 +226,7 @@ const Header = (props) => { {noSignoutLink.includes(router.pathname) == true ? ( "" ) : ( - ( { onClick={() => { handleLogout(); }} - className="govuk-header__link govuk-!-margin-right-3"> - + className="govuk-header__link govuk-!-margin-right-3" + > {t("common:signout-label")} - - ) + )} { path: "/", } ); - }}> - + }} + > {" "} {t("common:available-in")} - diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js index 3908fa64..d0b1b606 100644 --- a/components/newappeal/complete.js +++ b/components/newappeal/complete.js @@ -110,44 +110,51 @@ let CompleteAppeal = (props) => {

- Appeal Submission complete + {t("newappeal:new-appeal-complete-heading-1")}

- We have sent you a confirmation email. + {t("newappeal:new-appeal-complete-paragraph-1")}

-

What happens next

+

+ {" "} + {t("newappeal:new-appeal-complete-heading-2")} +

- When we receive your appeal form, we will write to you - letting you know if your appeal is valid, who is dealing - with it and what happens next. + {t("newappeal:new-appeal-complete-paragraph-2")}

- Any enquiries regarding this document/publication should be - sent to us at the address above or e-mail: - - PEDW.Casework@gov.wales - {" "} - /{" "} - - PEDW.GwaithAchos@llyw.cymru - + {t("newappeal:new-appeal-complete-paragraph-3")}:: + {router.locale == "cy" ? ( + + PEDW.GwaithAchos@llyw.cymru + + ) : ( + + PEDW.Casework@gov.wales + + )}

- Please note you can check for updates on our current service - at: - - https://www.gov.wales/planning-and-environment-decisions-wales-pedw-service-update - + {t("newappeal:new-appeal-complete-paragraph-4")}: + {router.locale == "cy" ? ( + + https://www.llyw.cymru/diweddariad-i-wasanaeth-penderfyniadau-cynllunio-ac-amgylchedd-cymru-pcac + + ) : ( + + https://www.gov.wales/planning-and-environment-decisions-wales-pedw-service-update + + )}

- Back to My Portal + {t("newappeal:new-appeal-complete-back-link")}

diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js index cdb0b7fe..8076d15f 100644 --- a/components/newappeal/createCase.js +++ b/components/newappeal/createCase.js @@ -289,7 +289,7 @@ function Radiofield(props) { parentFieldShowOnValue, validation, } = props; - + let { t } = useTranslation(); const router = useRouter(); const required = (value) => (value ? undefined : "Required"); // console.log(props.options); diff --git a/data/formsxml/adverts.xml b/data/formsxml/adverts.xml index 59060141..5d16323c 100644 --- a/data/formsxml/adverts.xml +++ b/data/formsxml/adverts.xml @@ -296,9 +296,21 @@ - - + + + + + + + + + + + diff --git a/data/formsxml/commercialappealcas.xml b/data/formsxml/commercialappealcas.xml index 194ee723..5d39ca57 100644 --- a/data/formsxml/commercialappealcas.xml +++ b/data/formsxml/commercialappealcas.xml @@ -317,9 +317,21 @@ - - + + + + + + + + + + + diff --git a/data/formsxml/enforcementnoticeappeals174.xml b/data/formsxml/enforcementnoticeappeals174.xml index 32e5ea2b..d5469b50 100644 --- a/data/formsxml/enforcementnoticeappeals174.xml +++ b/data/formsxml/enforcementnoticeappeals174.xml @@ -1162,9 +1162,21 @@ - - + + + + + + + + + + + diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml index 4430b5b7..7320c67d 100644 --- a/data/formsxml/householderappealhas.xml +++ b/data/formsxml/householderappealhas.xml @@ -44,7 +44,7 @@ - @@ -66,18 +66,26 @@ + + + + + + + + + + + + + + + + @@ -136,7 +156,7 @@ - + @@ -188,7 +208,7 @@ - @@ -216,78 +236,68 @@ + - - - - - - - + + + + + + + + + + + diff --git a/data/picklistdata/pinswg_householderappealhas.json b/data/picklistdata/pinswg_householderappealhas.json index 3f7037a4..14893c90 100644 --- a/data/picklistdata/pinswg_householderappealhas.json +++ b/data/picklistdata/pinswg_householderappealhas.json @@ -1434,221 +1434,6 @@ "MetadataId": null, "HasChanged": null }, - { - "Value": 846040003, - "Label": { - "LocalizedLabels": [ - { - "Label": "Granted approval of the matters reserved under the outline planning permission subject to conditions which you object", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9d52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Granted approval of the matters reserved under the outline planning permission subject to conditions which you object", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9d52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9f52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9f52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null - }, - { - "Value": 846040001, - "Label": { - "LocalizedLabels": [ - { - "Label": "Granted planning permission for the development subject to the conditions which you object", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9752d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Granted planning permission for the development subject to the conditions which you object", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9752d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9952d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9952d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null - }, - { - "Value": 846040006, - "Label": { - "LocalizedLabels": [ - { - "Label": "Refuse listed building consent/conservation area consent for the development as described", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "1a414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Refuse listed building consent/conservation area consent for the development as described", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "1a414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "1c414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "1c414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null - }, - { - "Value": 846040002, - "Label": { - "LocalizedLabels": [ - { - "Label": "Refused approval of the matters reserved under an outline planning permission", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9a52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Refused approval of the matters reserved under an outline planning permission", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9a52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9c52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "9c52d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null - }, - { - "Value": 846040007, - "Label": { - "LocalizedLabels": [ - { - "Label": "Refused permission to vary or remove a condition(s)", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "20414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Refused permission to vary or remove a condition(s)", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "20414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "22414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "22414e46-8505-ec11-aac8-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null - }, { "Value": 846040000, "Label": { @@ -1691,49 +1476,6 @@ "IsManaged": false, "MetadataId": null, "HasChanged": null - }, - { - "Value": 846040004, - "Label": { - "LocalizedLabels": [ - { - "Label": "Refused to approve any matters requiered by a condition on a previous planning permission (other than those above)", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "a052d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "Refused to approve any matters requiered by a condition on a previous planning permission (other than those above)", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "a052d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Description": { - "LocalizedLabels": [ - { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "a252d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - ], - "UserLocalizedLabel": { - "Label": "", - "LanguageCode": 1033, - "IsManaged": false, - "MetadataId": "a252d2aa-4283-eb11-aac0-00224800be9c", - "HasChanged": null - } - }, - "Color": "#0000ff", - "IsManaged": false, - "MetadataId": null, - "HasChanged": null } ] } diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json index ad3916a4..20b426ec 100644 --- a/locales/cy/newappeal.json +++ b/locales/cy/newappeal.json @@ -52,7 +52,8 @@ "about-you-communication-disclaimer-label": "Bydd cyfathrebu trwy e-bost rhagosodedig. Os byddai'n well gennych gyfathrebu drwy'r post yna cysylltwch â ni. Byddwch yn ymwybodol y gall cyfathrebu drwy'r post fod yn arafach.", "new-appeal-progress-nav-label": "Cynnydd", "new-appeal-documentlist-nav": "Angen dogfen", - "new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.", + "new-appeal-introduction-paragraph": "Mae’r ffurflen hon ar gyfer apelio yn erbyn penderfyniad i wrthod cais cynllunio, yn erbyn penderfyniad i ganiatáu cais gydag amodau yr ydych yn eu gwrthwynebu, neu yn erbyn methiant yr Awdurdod Cynllunio Lleol i roi penderfyniad o fewn y cyfnod priodol, heb gynnwys Deiliad Tai. ceisiadau.", + "new-appeal-introduction-warning-paragraph": "RHYBUDD: Rhaid i’ch apêl gyrraedd Penderfyniadau Cynllunio ac Amgylchedd Cymru o fewn 6 mis i ddyddiad hysbysiad o benderfyniad yr awdurdod cynllunio lleol. (NODER: Os na fyddwn yn derbyn unrhyw rai o’r “Dogfennau ategol hanfodol” o fewn y cyfnod apelio, ni fydd yr apêl yn cael ei derbyn).", "new-appeal-development-description-hint": "Nodwch fanylion y datblygiad arfaethedig. Dylid cymryd hwn fel arfer o’r ffurflen gais cynllunio, ond os cafodd y cais ei adolygu tra’r oedd gyda’r ACLl i’w ystyried, gallwch nodi disgrifiad o’r cynllun diwygiedig. Amgaewch gopi o gytundeb yr ACLl i’r newid.", "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon.", "new-appeal-ownership-option-NA": "Amherthnasol", @@ -77,5 +78,12 @@ "new-appeal-check-confirm-label": "Cadarnhaf fod pob adran wedi’i chwblhau’n llawn hyd eithaf fy ngwybodaeth.", "new-appeal-check-confirm-paragraph-one": "Rwy’n deall y gallwch ddefnyddio’r wybodaeth a roddais at ddibenion swyddogol mewn cysylltiad â Deddf Cynllunio Gwlad a Thref 1990 a gall manylion gan gynnwys fy enw, disgrifiad o’r safle a fy natganiad achos ymddangos ar-lein. Trwy gyflwyno'r ffurflen hon rwy'n cytuno i'r wybodaeth a roddaf gael ei defnyddio yn y modd hwn.", "new-appeal-check-confirm-paragraph-two": "Mae casglu a phrosesu dilynol y data personol a ddarparwyd gennych chi ar y ffurflen hon, yn unol â thelerau ein cofrestriad o dan Ddeddf Diogelu Data 1998. Mae rhagor o wybodaeth am y Polisi Diogelu Data ar gael yn ", - "new-appeal-check-confirm-paragraph-two-link": "https://www.llyw.cymru/hysbysiad-preifatrwydd-llywodraeth-cymru" + "new-appeal-check-confirm-paragraph-two-link": "https://www.llyw.cymru/hysbysiad-preifatrwydd-llywodraeth-cymru", + "new-appeal-complete-heading-1": "Cyflwynwyd yr apêl wedi'i gwblhau", + "new-appeal-complete-paragraph-1": "Rydym wedi anfon e-bost cadarnhau atoch.", + "new-appeal-complete-heading-2": "Beth sy'n digwydd nesaf", + "new-appeal-complete-paragraph-2": "Pan fyddwn yn derbyn eich ffurflen apêl, byddwn yn ysgrifennu atoch i roi gwybod i chi a yw eich apêl yn ddilys, pwy sy'n delio â hi a beth sy'n digwydd nesaf.", + "new-appeal-complete-paragraph-3": "Dylid anfon unrhyw ymholiadau ynghylch y ddogfen/cyhoeddiad hwn atom yn y cyfeiriad uchod neu drwy e-bost", + "new-appeal-complete-paragraph-4": "Sylwch y gallwch wirio am ddiweddariadau ar ein gwasanaeth presennol yn", + "new-appeal-complete-back-link": "Yn ôl i Fy Mhorth" } \ No newline at end of file diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index a26165fe..4aab7e80 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -51,7 +51,8 @@ "about-you-communication-disclaimer-label": "Communication will be by default email. If you would prefer postal communication then please contact us. Please be aware that postal communication may be slower.", "new-appeal-progress-nav-label": "Progress", "new-appeal-documentlist-nav": "Documents needed", - "new-appeal-introduction-paragraph": "Intro text to explain process. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ornare lobortis sollicitudin. Pellentesque ac libero auctor, efficitur urna faucibus, fringilla nisi. Fusce viverra pharetra tristique. In diam est, interdum sagittis tempus non, ultricies at ante. Nullam porta dolor sit amet.", + "new-appeal-introduction-paragraph": "This form is to appeal against a decision to refuse a planning application, against a decision to grant an application subject to conditions to which you object, or against the failure of the Local Planning Authority to give a decision within the appropriate period, not including Householder applications.", + "new-appeal-introduction-warning-paragraph": "WARNING: Your appeal must reach Planning and Environment Decisions Wales within 6 months of the date of the Local Planning authority’s decision notice. (NOTE: If any of the “Essential supporting documents” are not received by us within the appeal period, the appeal will not be accepted).", "new-appeal-development-description-hint": "Please enter details of the proposed development. This should normally be taken from the planning application form, but if the application was revised while it was with the LPA for consideration, you may enter a description of the revised scheme. Please enclose a copy of the LPA’s agreement to the change.", "new-appeal-ownership-hint": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.", "new-appeal-ownership-option-NA": "Not applicable", @@ -76,5 +77,12 @@ "new-appeal-check-confirm-label": "I confirm that all sections have been fully completed to the best of my knowledge.", "new-appeal-check-confirm-paragraph-one": "I understand that you may use the information I have given for official purposes in connection with the Town and Country Planning Act 1990 and details including my name, the site description and my statement of case may appear online. By submitting this form I am agreeing to the use of the information I provide in this way.", "new-appeal-check-confirm-paragraph-two": "The gathering and subsequent processing of the personal data supplied by you in this form, is in accordance with the terms of our registration under the Data Protection Act 1998. Further information about Data Protection Policy can be found at", - "new-appeal-check-confirm-paragraph-two-link": "https://gov.wales/welsh-government-privacy-notice" + "new-appeal-check-confirm-paragraph-two-link": "https://gov.wales/welsh-government-privacy-notice", + "new-appeal-complete-heading-1": "Appeal Submission complete", + "new-appeal-complete-paragraph-1": "We have sent you a confirmation email.", + "new-appeal-complete-heading-2": "What happens next", + "new-appeal-complete-paragraph-2": "When we receive your appeal form, we will write to you letting you know if your appeal is valid, who is dealing with it and what happens next.", + "new-appeal-complete-paragraph-3": "Any enquiries regarding this document/publication should be sent to us at the address above or e-mail", + "new-appeal-complete-paragraph-4": "Please note you can check for updates on our current service at", + "new-appeal-complete-back-link": "Back to My Portal" } \ No newline at end of file diff --git a/pages/api/endpoint/getappealtypesfornewappeal_api.js b/pages/api/endpoint/getappealtypesfornewappeal_api.js index 57d9ce8b..2325f37a 100644 --- a/pages/api/endpoint/getappealtypesfornewappeal_api.js +++ b/pages/api/endpoint/getappealtypesfornewappeal_api.js @@ -22,6 +22,14 @@ const ApiResponse = (req, res) => { "846,040,000", "attributevalue": 846040000, }, + { + "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": + "846,040,004", + "attributevalue": 846040004, + }, ], }); };