From 72a540436b7e8758da110b4dd01627c4b9c25529 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Thu, 11 Apr 2024 14:03:24 +0100 Subject: [PATCH 1/3] defect 10834 --- components/elements/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/elements/index.js b/components/elements/index.js index 4c329f8c..eb743b3e 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -1245,7 +1245,9 @@ export function NumericField(props) { parentFieldShowOnValue, parentField, } = props; - const required = (value) => (value ? undefined : "Required"); + const required = (value) => { + return value || value == 0 ? undefined : "Requirewwwd"; + }; //parentFieldShowOnValue var showIfHasParentShowValue = @@ -1295,9 +1297,10 @@ export function NumericField(props) { pattern="[0-9]*" inputMode="numeric" parse={Number} - validate={eval(validation)} + validate={[required]} component={RenderTextfield} label={label} + normalize={(value) => parseInt(value)} /> )} @@ -1337,6 +1340,7 @@ export function DecimalField(props) { {parentField != false ? ( showIfHasParentShowValue && (
+ wwww Date: Thu, 11 Apr 2024 14:03:53 +0100 Subject: [PATCH 2/3] defect 10837 --- locales/cy/newappeal.json | 2 +- locales/en/newappeal.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json index ebd64cde..ad3916a4 100644 --- a/locales/cy/newappeal.json +++ b/locales/cy/newappeal.json @@ -23,7 +23,7 @@ "about-you-hint": "Os ydych yn gwneud mwy nag un apêl ar gyfer y safle yna cyflwynwch drwy e-bost", "about-you-on-behalf-label": "Enw’r apelydd/enw’r sefydliad (os yw’n berthnasol):", "about-you-who-can-appeal-label": "Pwy all apelio?", - "about-you-who-can-appeal-paragraph": "Dim ond y rhai a enwir fel ymgeisydd ar y ffurflen gais wreiddiol all gyflwyno apêl. os ydych yn cyflwyno apêl ar ran cwmni nodwch enw'r cwmni yr ydych yn ei gynrychioli", + "about-you-who-can-appeal-paragraph": "Dim ond y rhai a enwir fel ymgeisydd ar y ffurflen gais wreiddiol all gyflwyno apêl. Ogovuk-summary-list__values ydych yn cyflwyno apêl ar ran cwmni nodwch enw'r cwmni yr ydych yn ei gynrychioli", "about-you-who-are-you-label": "Ai chi yw'r apelydd neu asiant sy'n gweithredu ar ran yr apelydd?", "about-you-who-are-you-hint-label": "Os ydych yn cyflwyno ar ran yr apelydd, marciwch eich hun fel Asiant. Sylwch, os rhowch fanylion yr asiant, bydd yr holl ohebiaeth yn cael ei hanfon at yr asiant", "about-you-who-are-you-label-appellant": "Apelydd", diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index 95e8e939..a26165fe 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -22,7 +22,7 @@ "about-you-hint": "If you are making more than one appeal for the site then please submit via email", "about-you-on-behalf-label": "Appellants name/Organisations name (if applicable):", "about-you-who-can-appeal-label": "Who can appeal?", - "about-you-who-can-appeal-paragraph": "Only those named as an applicant on the original application form can submit an appeal. if you are submitting an appeal on behalf of a company state the name of the company you are representing", + "about-you-who-can-appeal-paragraph": "Only those named as an applicant on the original application form can submit an appeal. If you are submitting an appeal on behalf of a company state the name of the company you are representing", "about-you-who-are-you-label": "Are you the appellant or an agent acting on behalf of the appellant?", "about-you-who-are-you-hint-label": "If you are submitting on behalf of the appellant, mark yourself as an Agent. Please note that if you enter agent details all correspondence will be sent to the agent", "about-you-who-are-you-label-appellant": "Appellant", From ab59f01bce47797ff3a59634e7bf8711555284b4 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Thu, 11 Apr 2024 14:04:12 +0100 Subject: [PATCH 3/3] defect 10835 --- styles/sass/welshgov/_application.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 318883e6..82c3f0ac 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -1004,6 +1004,7 @@ textarea, .govuk-summary-list__actions { padding: 15px 10px 15px 0; width: 100%; + max-width: 560px; a, a:active,