robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check form updates

Browse Source
This commit is contained in:
robbond
2022-06-07 14:36:47 +01:00
parent 3b61d651f6
commit 9d90b7f0a8
22 changed files with 356 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/elements/index.js
+50 -37
View File
@@ -81,7 +81,7 @@ export function Textfield(props) {
<>
<div className="govuk-form-group">
<label className="govuk-label " htmlFor={props.name}>
{label}
{FieldsTranslations(label)}
</label>
<input
type="text"
@@ -163,9 +163,9 @@ const RenderMultiline = ({
: "govuk-form-group "
}
>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{FieldsTranslations(label)}
</label>
{/* <label className="govuk-label " htmlFor={id} id={id + "_label"}>
{FieldsTranslations(label)}s
</label> */}
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
@@ -177,9 +177,11 @@ const RenderMultiline = ({
</span>
)}
<textarea
{...input}
id={id}
name={id}
rows={rows}
className={className}
{...input}
></textarea>
</div>
</>
@@ -190,21 +192,26 @@ export function MultiLinefield(props) {
const {
name,
label,
parentField,
form,
formProps,
parentField,
parentFieldShowOnValue,
validation,
} = props;
const required = (value) => (value ? undefined : "Is required");
var showIfHasParentShowValue =
(parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
formProps[form].values[parentField]) == parentFieldShowOnValue;
parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
parentFieldShowOnValue.indexOf(
formProps[form].values[parentField].toString()
) > -1;
// console.log(parentField, showIfHasParentShowValue);
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
//console.log(showIfHasParentShowValue, formProps[form].values[parentField]);
return (
<>
@@ -324,12 +331,13 @@ const RenderDatePicker = ({
<fieldset
className="govuk-fieldset"
role="group"
aria-describedby="dob-hint"
aria-describedby={id + "_label"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading"
id={id + "_label"}
htmlFor={id}
>
{FieldsTranslations(label)}
</label>
@@ -355,6 +363,7 @@ const RenderDatePicker = ({
{...custom}
locale={router.locale}
autoOk={true}
id={id}
dateFormat="dd/MM/yyyy"
onChange={onChange}
selected={
@@ -527,7 +536,7 @@ const RenderYesNo = ({
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-hint"}
aria-describedby={id + "_label"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
@@ -660,7 +669,7 @@ const RenderRadio = ({
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-hint"}
aria-describedby={id + "_label"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
@@ -705,10 +714,13 @@ const RenderRadio = ({
type="radio"
className="govuk-radios__input"
value={options[key].split("|")[0]}
// checked={
// value ==
// parseInt(options[key].split("|")[0])
// }
checked={
typeof value != "undefined" &&
value ==
parseInt(options[key].split("|")[0])
? true
: false
}
onChange={(e) => {
let docListObj = custom.documentList;
if (
@@ -751,10 +763,10 @@ export function Radiofield(props) {
name,
label,
datafieldname,
parentField,
form,
formProps,
parentFieldShowOnValue,
parentField,
validation,
} = props;
@@ -767,14 +779,13 @@ export function Radiofield(props) {
.split(",");
//parentFieldShowOnValue
var showIfHasParentShowValue = parentField != false;
//debugger;
// parentField != false &&
// !_.isEmpty(formProps[form]) &&
// _.has(formProps[form].values, parentField) &&
// parentFieldShowOnValue.indexOf(
// formProps[form].values[parentField].toString()
// ) > -1;
var showIfHasParentShowValue =
parentField != false &&
!_.isEmpty(formProps[form]) &&
_.has(formProps[form].values, parentField) &&
parentFieldShowOnValue.indexOf(
formProps[form].values[parentField].toString()
) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
@@ -942,7 +953,12 @@ const RenderPickList = ({
dropdownObj = dropdownObj[0];
return (
<div>
<select {...input} className="govuk-select " id={name} name={name}>
<select
{...input}
className="govuk-select "
id={label}
name={label}
>
<option>{t("newappeal:select-default")}</option>
{Object.keys(dropdownObj).map((key, index) => {
return (
@@ -970,6 +986,7 @@ export function PickList(props) {
</label>
<Field
name={props.name}
label={props.name}
component={RenderPickList}
datafieldname={datafieldname}
picklistData={props.picklistData}
@@ -984,21 +1001,19 @@ export function NumericField(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
<Field
name={props.name}
id={props.name}
type="number"
className="govuk-input govuk-input--width-20"
spellCheck="false"
//aria-describedby="account-number-hint"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={label}
/>
</div>
);
@@ -1010,9 +1025,6 @@ export function DecimalField(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
<Field
name={props.name}
id={props.name}
@@ -1020,12 +1032,13 @@ export function DecimalField(props) {
type="number"
className="govuk-input govuk-input--width-10"
spellCheck="false"
//aria-describedby="account-number-hint"
aria-describedby={name}
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
validate={eval(validation)}
component={RenderTextfield}
label={props.label}
/>
</div>
);
@@ -1092,7 +1105,7 @@ const PickListTranslations = (optionValue) => {
export function FileUploadField(props) {
return (
<>
<h4>{props.label} </h4>
<h2 className="govuk-heading-s">{props.label} </h2>
<Field
name={props.name}
id={props.name}