Merged PR 1124: Sprint 10 bug fixes
Related work items: #10834, #10835, #10836, #10837
This commit is contained in:
@@ -1245,7 +1245,9 @@ export function NumericField(props) {
|
|||||||
parentFieldShowOnValue,
|
parentFieldShowOnValue,
|
||||||
parentField,
|
parentField,
|
||||||
} = props;
|
} = props;
|
||||||
const required = (value) => (value ? undefined : "Required");
|
const required = (value) => {
|
||||||
|
return value || value == 0 ? undefined : "Requirewwwd";
|
||||||
|
};
|
||||||
|
|
||||||
//parentFieldShowOnValue
|
//parentFieldShowOnValue
|
||||||
var showIfHasParentShowValue =
|
var showIfHasParentShowValue =
|
||||||
@@ -1295,9 +1297,10 @@ export function NumericField(props) {
|
|||||||
pattern="[0-9]*"
|
pattern="[0-9]*"
|
||||||
inputMode="numeric"
|
inputMode="numeric"
|
||||||
parse={Number}
|
parse={Number}
|
||||||
validate={eval(validation)}
|
validate={[required]}
|
||||||
component={RenderTextfield}
|
component={RenderTextfield}
|
||||||
label={label}
|
label={label}
|
||||||
|
normalize={(value) => parseInt(value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -1337,6 +1340,7 @@ export function DecimalField(props) {
|
|||||||
{parentField != false ? (
|
{parentField != false ? (
|
||||||
showIfHasParentShowValue && (
|
showIfHasParentShowValue && (
|
||||||
<div className="govuk-form-group">
|
<div className="govuk-form-group">
|
||||||
|
wwww
|
||||||
<Field
|
<Field
|
||||||
name={props.name}
|
name={props.name}
|
||||||
id={props.name}
|
id={props.name}
|
||||||
|
|||||||
@@ -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-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-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-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-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-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",
|
"about-you-who-are-you-label-appellant": "Apelydd",
|
||||||
|
|||||||
@@ -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-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-on-behalf-label": "Appellants name/Organisations name (if applicable):",
|
||||||
"about-you-who-can-appeal-label": "Who can appeal?",
|
"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-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-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",
|
"about-you-who-are-you-label-appellant": "Appellant",
|
||||||
|
|||||||
@@ -1004,6 +1004,7 @@ textarea,
|
|||||||
.govuk-summary-list__actions {
|
.govuk-summary-list__actions {
|
||||||
padding: 15px 10px 15px 0;
|
padding: 15px 10px 15px 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
max-width: 560px;
|
||||||
|
|
||||||
a,
|
a,
|
||||||
a:active,
|
a:active,
|
||||||
|
|||||||
Reference in New Issue
Block a user