From af959dc0484d855bf9707954b9d8b85b0fae0627 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 11:29:25 +0000 Subject: [PATCH 01/15] questionnaire defects 2,3,4,9,13,20,22 --- .env.local | 12 +++++----- ...representationLPAQuestionnaireCheck_s78.js | 6 ++--- .../pdftemplates/lpaQuestionnaire_pdf.js | 4 ++-- locales/cy/myrepresentations.json | 10 ++++----- locales/en/myrepresentations.json | 22 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.env.local b/.env.local index 465283be..74fef70a 100644 --- a/.env.local +++ b/.env.local @@ -31,12 +31,12 @@ HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136 # //New PreProd CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E -# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/ -# RELAYURI = "ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net" -# RELAYPATH = "ar-hc-lz-pedw-ppe-uks-01" -RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-ukw-01/ -RELAYURI = "ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net" -RELAYPATH = "ar-hc-lz-pedw-ppe-ukw-01" +RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/ +RELAYURI = "ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-ppe-uks-01" +# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-ukw-01/ +# RELAYURI = "ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-ppe-ukw-01" CRMURL = "ppcrm2016.llcdt.gov.wales/PPPINSWales" diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index b719a289..67000177 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -396,7 +396,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => { <>
- 12. LPA’s adopted local development plan and + 12. LPA’s adopted Local Development Plan and Proposals Map
@@ -435,7 +435,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
14. If applicable, do you intend to submit a full - statement at the 4- week stage? + statement at the 4-week stage?
@@ -1370,7 +1370,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
27. Evidence of any publicity given to the application, including site notices and local - advertisement?** + advertisement?
diff --git a/components/pdftemplates/lpaQuestionnaire_pdf.js b/components/pdftemplates/lpaQuestionnaire_pdf.js index 939bd91e..24e2af95 100644 --- a/components/pdftemplates/lpaQuestionnaire_pdf.js +++ b/components/pdftemplates/lpaQuestionnaire_pdf.js @@ -1422,14 +1422,14 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => { - + {/* {getTrans(docProps.locale, "s78-footnote-one")} {getTrans(docProps.locale, "s78-footnote-two")}{" "} - + */} Date: Mon, 6 Jan 2025 11:30:57 +0000 Subject: [PATCH 02/15] questionnaire defect 1 --- components/case/representation/index.js | 11 ++++++----- ...epresentationLPAQuestionnaire_enforcement.js | 9 +++++---- .../representationLPAQuestionnaire_s78.js | 17 +++++++++-------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/components/case/representation/index.js b/components/case/representation/index.js index b45db9ba..957783b8 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -751,8 +751,9 @@ let MakeRepresentation = (props) => { props.props.accountDetails.accountDetails.emailaddress1, "siteAddress": detailsObj.pinswg_siteaddressline1 + - (detailsObj.pinswg_siteaddressline2 != null && - " " + detailsObj.pinswg_siteaddressline2 + " ") + + (detailsObj.pinswg_siteaddressline2 != null + ? " " + detailsObj.pinswg_siteaddressline2 + " " + : " ") + detailsObj.pinswg_siteaddresstown + " " + detailsObj.pinswg_siteaddresspostcode, @@ -954,9 +955,9 @@ let MakeRepresentation = (props) => { props.props.accountDetails.accountDetails.emailaddress1, "siteAddress": detailsObj.pinswg_siteaddressline1 + - (detailsObj.pinswg_siteaddressline2 != null && - " " + detailsObj.pinswg_siteaddressline2 + " ") + - " " + + (detailsObj.pinswg_siteaddressline2 != null + ? " " + detailsObj.pinswg_siteaddressline2 + " " + : " ") + detailsObj.pinswg_siteaddresstown + " " + detailsObj.pinswg_siteaddresspostcode, diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index 376f8375..c64949f1 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -114,10 +114,11 @@ let Enforcement_Questionnaire = (props) => {
3. {t("myrepresentations:enf-section-question-3")}:{" "} {detailsObj.pinswg_siteaddressline1 + - (detailsObj.pinswg_siteaddressline2 != null && - " " + - detailsObj.pinswg_siteaddressline2 + - " ") + + (detailsObj.pinswg_siteaddressline2 != null + ? " " + + detailsObj.pinswg_siteaddressline2 + + " " + : " ") + detailsObj.pinswg_siteaddresstown + " " + detailsObj.pinswg_siteaddresspostcode} diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index 3e0dd819..8abe898e 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -120,24 +120,25 @@ let S78_Questionnaire = (props) => {
- 1. {t("myrepresentations:s78-section-question-1")}{" "} + 1. {t("myrepresentations:s78-section-question-1")}:{" "} {currentView.caseReference.currentReference}
- 2. {t("myrepresentations:s78-section-question-2")}{" "} + 2. {t("myrepresentations:s78-section-question-2")}:{" "} {resultsObj.pinswg_lpareference}
- 3. {t("myrepresentations:s78-section-question-3")}{" "} + 3. {t("myrepresentations:s78-section-question-3")}:{" "} {detailsObj.pinswg_siteaddressline1 + - (detailsObj.pinswg_siteaddressline2 != null && - " " + - detailsObj.pinswg_siteaddressline2 + - " ") + + (detailsObj.pinswg_siteaddressline2 != null + ? " " + + detailsObj.pinswg_siteaddressline2 + + " " + : " ") + detailsObj.pinswg_siteaddresstown + " " + detailsObj.pinswg_siteaddresspostcode} @@ -145,7 +146,7 @@ let S78_Questionnaire = (props) => {
- 4. {t("myrepresentations:s78-section-question-4")}{" "} + 4. {t("myrepresentations:s78-section-question-4")}:{" "} { getFormCollectionByID( currentView.caseReference.appealType From 734f9695464f69572a22b8f2b40710d5e335ef35 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 11:31:25 +0000 Subject: [PATCH 03/15] questionnaire defect 13 for enf --- components/pdftemplates/enforcement_pdf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/pdftemplates/enforcement_pdf.js b/components/pdftemplates/enforcement_pdf.js index f2c2abdf..9e2ce2c2 100644 --- a/components/pdftemplates/enforcement_pdf.js +++ b/components/pdftemplates/enforcement_pdf.js @@ -658,7 +658,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { > 18. - LPA’s adopted local development plan and + LPA’s adopted Local Development Plan and Proposals Map @@ -695,7 +695,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { 20. If applicable, do you intend to submit a - full statement at the 4- week stage? + full statement at the 4-week stage? {values.LPAintentionToSubmitFullStatement} From 554b25ebcd347a3a287fe6f34bd460b963ba0f48 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 13:23:56 +0000 Subject: [PATCH 04/15] uat defect 125 --- locales/en/newappeal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index 1c7de39f..3c872802 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -59,7 +59,7 @@ "new-appeal-documentlist-nav": "Documents needed", "new-appeal-introduction-paragraph": "This form is to appeal against:", "new-appeal-introduction-paragraph-bullet-one": "a decision to refuse a planning application", - "new-appeal-introduction-paragraph-bullet-two": "the failure of the Local Planning Authority to give a decision with 8 weeks", + "new-appeal-introduction-paragraph-bullet-two": "the failure of the Local Planning Authority to give a decision within 8 weeks", "new-appeal-introduction-paragraph-two": "It does not include Householder applications.", "new-appeal-introduction-warning-paragraph": "You must:", "new-appeal-introduction-warning-bullet-one": "submit your appeal within 6 months of the date of the Local Planning Authority's decision notice", From 19910ec8fa939b3d7cc324385f81be6f53c94386 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 13:27:12 +0000 Subject: [PATCH 05/15] uat defect 127 --- data/crmfieldlookuptranslations.json | 2 +- locales/en/newappeal.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/crmfieldlookuptranslations.json b/data/crmfieldlookuptranslations.json index e3e74e4c..934459bf 100644 --- a/data/crmfieldlookuptranslations.json +++ b/data/crmfieldlookuptranslations.json @@ -2185,7 +2185,7 @@ "value_cy": "Tystysgrif B – Tystiaf fod yr apelydd (neu'r asiant) wedi rhoi'r hysbysiad gofynnol (gweler y daflen arweiniad) i bawb arall a oedd, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o'r tir y mae'r apêl yn ymwneud ag ef, fel y rhestrir isod:" }, { - "value": "Certificates C and D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annexe 1 of our guidance and attach it to the appeal form", + "value": "Certificates C and D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annex 1 of our guidance and attach it to the appeal form", "value_cy": "Tystysgrifau C a D - Os nad ydych yn gwybod pwy sy'n berchen ar safle cyfan yr apêl neu ran ohono, cwblhewch naill ai Dystysgrif C neu Dystysgrif D yn Atodiad 1 ein canllaw a'i hatodi i'r ffurflen apelio" }, { diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index 3c872802..76cd044f 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -71,7 +71,7 @@ "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", "new-appeal-ownership-option-B": "Certificate B - I certify that the appellant (or the agent) has given the requisite notice (see the guidance leaflet) to everyone else who, on the day 21 days before the date of this appeal, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates, as listed below:", - "new-appeal-ownership-option-CD": "Certificates C and D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annexe 1 of our guidance and attach it to the appeal form", + "new-appeal-ownership-option-CD": "Certificates C and D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annex 1 of our guidance and attach it to the appeal form", "new-appeal-agricultural-hint": "We also need to know whether the appeal site forms part of an agricultural holding. Please select either (a), (b)(i) or (b)(ii)", "new-appeal-agricultural-holding-option-yes": "(a) None of the land to which the appeal relates is, or is part of, an agricultural holding", "new-appeal-agricultural-holding-option-no": "(b) (i) The appeal site is, or is part of an agricultural holding, and the appellant is the sole agricultural tenant", From b012049029df63f96a10cbc64e32d55b4ba58add Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 13:30:56 +0000 Subject: [PATCH 06/15] rep defect 5 --- locales/en/myrepresentations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index 1a76da2d..4c5dd9a4 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -25,7 +25,7 @@ "fileupload-drop-label": "Drag and drop your files here.", "fileupload-file-list-label": "Only .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg, .jpg or .zip files will be accepted", "capacity-para-one": "This form enables you to submit representations on a case to Planning and Environment Decisions Wales.", - "capacity-para-two": "Please note that representations from interested parties need to be made within the timetable. This can be found on the previous \"Case Summary\" page. Comments submitted after this date may be considered invalid.", + "capacity-para-two": "Please note that representations from interested parties need to be made within the timetable. This can be found on the previous \"Case Summary\" page. Representations submitted after this date may be considered invalid.", "capacity-select-your-details": "Your details", "capacity-select-what-capacity-label": "In what capacity do you wish to make representations on this case?", "capacity-options-arr-appellant": "Appellant", From 16190a6ecdeb64cd9e9cf7c85b697a67267438e2 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 13:49:36 +0000 Subject: [PATCH 07/15] rep defect 17 update reps card title --- locales/cy/myportal.json | 2 +- locales/en/myportal.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index cbd5b220..9699ced4 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -24,7 +24,7 @@ "searchcases-validation-required": "Angenrheidiol", "searchcases-validation-minlength": "Rhaid iddo gynnwys 4 nod neu fwy", "awatitingsubmission-card-title": "Yn aros i’w gyflwyno", - "myrepresentations-card-title": "Fy sylwadau", + "myrepresentations-card-title": "Sylwadau yn aros i gael eu cyflwyno", "watchedcases-card-title": "Achosion sy'n cael eu gwylio", "submitted-reps-card-title": "Sylwadau a gyflwynwyd", "case-reference": "Cyfeirnod yr achos", diff --git a/locales/en/myportal.json b/locales/en/myportal.json index 6a1b198b..dcbc096b 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -24,7 +24,7 @@ "searchcases-validation-required": "Required", "searchcases-validation-minlength": "Must be 4 characters or more", "awatitingsubmission-card-title": "Awaiting submission", - "myrepresentations-card-title": "My representations", + "myrepresentations-card-title": "Representations awaiting submission", "watchedcases-card-title": "Watched cases", "submitted-reps-card-title": "Submitted representations", "case-reference": "Case reference", From e6c7ce7809772d54e6fc1d2ee9f2298dd6c92272 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 16:14:06 +0000 Subject: [PATCH 08/15] questionnaire defect 8 --- locales/en/myrepresentations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index 4c5dd9a4..dc0cc232 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -90,7 +90,7 @@ "s78-section-question-24d": "No development shall take place until a scheme to enable the provision of gigabit capable broadband infrastructure from the site boundary to the dwellings/buildings hereby permitted has been submitted to and agreed in writing by the local planning authority. Development shall be carried out in accordance with the approved details. Reason: To support the roll-out of digital communications infrastructure across Wales in accordance with Policy 13 of Future Wales.", "s78-section-question-25": "Do you consider other conditions, or amended versions of the above standard conditions, to be necessary?", "s78-section-question-25-hint": "If Yes, list them here or in an attached document. Include reasons and relevant development plan policies. If you intend to send suggested conditions alongside your 4 week statement, state this here.", - "s78-section-heading-five": "Before sending, have you attached or provided a web link to", + "s78-section-heading-five": "Before sending, have you attached or provided a web link to the following:", "s78-section-question-26": "A copy of the applicant’s certificate confirming that they notified persons with an interest in the land?", "s78-section-question-26-hint": "Insert weblink here if available online. If No, give reasons", "s78-section-question-27": "Evidence of any publicity given to the application, including site notices and local advertisement?", @@ -177,7 +177,7 @@ "enf-section-question-31c": "c) No development shall take place until a scheme to enable the provision of gigabit capable broadband infrastructure from the site boundary to the dwellings/buildings hereby permitted has been submitted to and agreed in writing by the local planning authority. Development shall be carried out in accordance with the approved details. Reason: To support the roll-out of digital communications infrastructure across Wales in accordance with Policy 13 of Future Wales.", "enf-section-question-32": "Do you consider other conditions, or amended versions of the above standard conditions, to be necessary?", "enf-section-question-32-hint": "If Yes, list them here or in an attached document. Include reasons and relevant development plan policies. If you intend to send suggested conditions alongside your 4 week statement, state this here.", - "enf-section-heading-seven": "Before sending, have you attached or provided a web link to", + "enf-section-heading-seven": "Before sending, have you attached or provided a web link to the following:", "enf-section-question-33": "A true copy of the enforcement notice?", "enf-section-question-33-hint": "Insert weblink here if available online. If No, give reasons", "enf-section-question-34": "The enforcement notice plan.", From 942f1aff9f0cbf55806184f6a40e15ab4b9e4c55 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 16:14:57 +0000 Subject: [PATCH 09/15] rep defect 17 welsh --- locales/cy/myportal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index 9699ced4..dd3254c6 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -23,7 +23,7 @@ "searchcases-card-advanced-link": "Chwiliad Uwch", "searchcases-validation-required": "Angenrheidiol", "searchcases-validation-minlength": "Rhaid iddo gynnwys 4 nod neu fwy", - "awatitingsubmission-card-title": "Yn aros i’w gyflwyno", + "awatitingsubmission-card-title": "Apeliadau yn aros i gael eu cyflwyno", "myrepresentations-card-title": "Sylwadau yn aros i gael eu cyflwyno", "watchedcases-card-title": "Achosion sy'n cael eu gwylio", "submitted-reps-card-title": "Sylwadau a gyflwynwyd", From 833eef7405cf8088dce56ddb324f5b7ff1c71c49 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 6 Jan 2025 16:15:49 +0000 Subject: [PATCH 10/15] rep defect 17 english --- locales/en/myportal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/myportal.json b/locales/en/myportal.json index dcbc096b..498cfa13 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -23,7 +23,7 @@ "searchcases-card-advanced-link": "Advanced Search", "searchcases-validation-required": "Required", "searchcases-validation-minlength": "Must be 4 characters or more", - "awatitingsubmission-card-title": "Awaiting submission", + "awatitingsubmission-card-title": "Appeals awaiting submission", "myrepresentations-card-title": "Representations awaiting submission", "watchedcases-card-title": "Watched cases", "submitted-reps-card-title": "Submitted representations", From 021cd9375c8d0293629cf8ecf277d962e101e965 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 7 Jan 2025 06:36:19 +0000 Subject: [PATCH 11/15] questionnaire defect 18 --- components/case/representation/index.js | 9 +++++++++ components/pdftemplates/lpaQuestionnaire_pdf.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/components/case/representation/index.js b/components/case/representation/index.js index 957783b8..f4d482bd 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -887,6 +887,13 @@ let MakeRepresentation = (props) => { window.scrollTo({ top: 0, behavior: "smooth" }); values = setRepFileName(values); + !values.hasOwnProperty("pinswg_lpareference") && + Object.assign(values, { + "pinswg_lpareference": + searchResultsObj.searchResultsObj.value[0] + .pinswg_lpareference, + }); + //console.log("onHandleSubmit form values - ", JSON.stringify(values)); const buildFileArray = []; @@ -1196,7 +1203,9 @@ let MakeRepresentation = (props) => { setShowQuestionnaireSection={ setShowQuestionnaireSection } + showQuestionnaireSection={showQuestionnaireSection} props={props} + questionnaireCount={questionnaireCount} /> ) : ( <> diff --git a/components/pdftemplates/lpaQuestionnaire_pdf.js b/components/pdftemplates/lpaQuestionnaire_pdf.js index 24e2af95..d86ee469 100644 --- a/components/pdftemplates/lpaQuestionnaire_pdf.js +++ b/components/pdftemplates/lpaQuestionnaire_pdf.js @@ -203,7 +203,7 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => { )} - {values.lpaRef || " "} + {values.pinswg_lpareference || " "} Date: Tue, 7 Jan 2025 06:41:31 +0000 Subject: [PATCH 12/15] questionnaire defect 11 --- .../representationLPAQuestionnaireCheck_s78.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index 67000177..371a14d8 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -216,7 +216,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
{repFormData.enterNeighbouringLandAccessRequired == - "Yes" && ( + "No" && (
Evidence @@ -226,7 +226,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
From 893136addc5883b91f75514f48ca3fe7169f8b27 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 7 Jan 2025 06:50:04 +0000 Subject: [PATCH 13/15] questionnaire defect 12 --- .../representationLPAQuestionnaireCheck_enforcement.js | 7 ++++++- .../representationLPAQuestionnaireCheck_s78.js | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js index 5028f05d..c637919a 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js @@ -336,7 +336,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.healthAndSafetyIssues} +
diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index 371a14d8..ed6d590b 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -331,7 +331,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
- {repFormData.healthAndSafetyIssues} +
From 29d8090630f3e6a4a45fe7b964b81ec268a24b57 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 7 Jan 2025 06:56:06 +0000 Subject: [PATCH 14/15] questionnaire defect 21, rep defect 30,11 --- .../representationCompleteSubmit.js | 16 +++++++++++++++- .../representation/representationElements.js | 14 +++++++++++--- .../case/representation/representationLPA.js | 2 ++ ...representationLPAQuestionnaire_enforcement.js | 2 +- .../representationLPAQuestionnaire_s78.js | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js index 2bee283a..0a3c45ae 100644 --- a/components/case/representation/representationCompleteSubmit.js +++ b/components/case/representation/representationCompleteSubmit.js @@ -27,6 +27,8 @@ const RepCompleteSubmit = (props) => { setRepresentationMessageSent, setRepresentationReset, setShowQuestionnaireSection, + showQuestionnaireSection, + questionnaireCount, } = props; const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const files = acceptedFiles.map((file) => ( @@ -411,10 +413,22 @@ const RepCompleteSubmit = (props) => { className="govuk-link" href="#" onClick={() => { - setSubmitBack(); + repFormData.representationType == + "Questionnaire" + ? (setShowQuestionnaireSection( + questionnaireCount == + 7 + ? 6 + : 8 + ), + setRepresentationSubmit( + false + )) + : setSubmitBack(); }} > {t("common:change-link-label")} + {" "} {/* {FieldsTranslations( diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index 7baa3d04..eae5eafd 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -1132,8 +1132,11 @@ export const RenderFileUpload = (field) => { "/" + (typeof field.filenamePrefix != "object" ? field.filenamePrefix - : field.filenamePrefix.representationForm - .values.repfile_name) + : encodeURIComponent( + field.filenamePrefix + .representationForm.values + .repfile_name + )) ).then((data) => { data = data.value || {}; field.input.value == null; @@ -1265,7 +1268,12 @@ export const RenderFileUpload = (field) => { "/api/file/downloadblob?container=" + field.containerID + "&casefolderID=" + - field.ticketnumber + + encodeURIComponent( + field.ticketnumber + + "/" + + field.filenamePrefix.representationForm + .values.repfile_name + ) + "&blobname=" + blob.name + blob.hashedfilepath diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js index 18582760..2edf9771 100644 --- a/components/case/representation/representationLPA.js +++ b/components/case/representation/representationLPA.js @@ -65,6 +65,7 @@ let RepLPA = (props) => { case 846040017: return ( { case 846040007: return ( { name={"representationDocuments"} id={"representationDocuments"} label={t("myrepresentations:add-files-label")} - ticketnumber={props.props.caseReference} + ticketnumber={props.props.props.caseReference} hint={"sdsd"} fileList={ props.currentView.caseReference.hasOwnProperty( diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index 8abe898e..0347009b 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -991,7 +991,7 @@ let S78_Questionnaire = (props) => { name={"representationDocuments"} id={"representationDocuments"} label={t("myrepresentations:add-files-label")} - ticketnumber={props.props.caseReference} + ticketnumber={props.props.props.caseReference} hint={"sdsd"} fileList={ props.currentView.caseReference.hasOwnProperty( From 086942df7ae03bf0dc7ea5662672a9d7579a3c75 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 7 Jan 2025 08:01:25 +0000 Subject: [PATCH 15/15] questionnaire defect 22 and 9 --- .../case/representation/representationElements.js | 10 +++++++--- .../representationLPAQuestionnaire_s78.js | 2 ++ locales/en/myrepresentations.json | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index eae5eafd..307c836a 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -367,8 +367,7 @@ export const RenderLPACondtionalRadioList = ({ ...custom }) => { const required = (value) => (value ? undefined : "Required"); - - //console.log(error); + let { t } = useTranslation(); return ( <> @@ -401,7 +400,12 @@ export const RenderLPACondtionalRadioList = ({ -
+ {typeof custom.hint != undefined && ( +
+ {t(custom.hint)} +
+ )} +
{Object.keys(options).map((key, index) => (
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index 0347009b..d7fb1332 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -814,6 +814,7 @@ let S78_Questionnaire = (props) => { legend={t( "myrepresentations:s78-section-question-27" )} + hint={t("myrepresentations:s78-footnote-two")} conditionalLabel={t( "myrepresentations:s78-section-question-27-hint" )} @@ -866,6 +867,7 @@ let S78_Questionnaire = (props) => { legend={t( "myrepresentations:s78-section-question-29" )} + hint={t("myrepresentations:s78-footnote-one")} conditionalLabel={t( "myrepresentations:s78-section-question-29-hint" )} diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index dc0cc232..8a8d71e4 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -206,8 +206,8 @@ "s78-heading-para-one": "For Planning, Conservation area, Listed Building and Advertisement applications/appeals", "s78-heading-para-two": "The LPA must send the completed questionnaire and any attachments to PEDW.casework@gov.wales and the appellant (or their agent) within 5 working days of the start date specified in our start letter", "section-heading-zero": "Case Details", - "s78-footnote-one": "* Article 11 of The Town and Country Planning (Development Management Procedure) (Wales) Order 2012; Regulation 7 of The Town and Country Planning (Listed Buildings and Conservation Areas) (Wales) Regulations 2012", - "s78-footnote-two": "** Article 12 of The Town and Country Planning (Development Management Procedure) (Wales) Order 2012; Section 67/73 of The Town and Country Planning (Listed Buildings and Conservation Areas) Act 1990; Regulation 10 of The Town and Country Planning (Listed Buildings and Conservation Areas) (Wales) Regulations 2012", + "s78-footnote-one": "Article 11 of The Town and Country Planning (Development Management Procedure) (Wales) Order 2012; Regulation 7 of The Town and Country Planning (Listed Buildings and Conservation Areas) (Wales) Regulations 2012", + "s78-footnote-two": "Article 12 of The Town and Country Planning (Development Management Procedure) (Wales) Order 2012; Section 67/73 of The Town and Country Planning (Listed Buildings and Conservation Areas) Act 1990; Regulation 10 of The Town and Country Planning (Listed Buildings and Conservation Areas) (Wales) Regulations 2012", "statement-case-type-label": "Case type", "statement-representation-capacity-label": "Representation capacity", "statement-representation-capacity-details-label": "Representation capacity details",