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

Merged PR 384: bug fix

Browse Source 
Related work items: #5253
This commit is contained in:
Robert Bond
2021-07-28 14:51:51 +00:00
parent 8afb768c9f 777df3f907
commit 24e53c05ba
8 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/account/personaldetails.js
+1 -4
View File
@@ -96,7 +96,7 @@ const PersonalDetails = (props) => {
return ( return (
<> <>
{props.accountUpdatedComplete != true ? ( {props.accountUpdatedComplete == false ? (
props.personalDetailsComplete == false ? ( props.personalDetailsComplete == false ? (
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
@@ -216,9 +216,6 @@ const PersonalDetails = (props) => {
type="submit" type="submit"
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
onClick={() => {
setPersonalDetailsComplete(true);
}}
> >
Continue Continue
</button> </button>
components/elements/index.js
+7 -7
View File
@@ -53,7 +53,7 @@ export function Textfield(props) {
component={RenderTextfield} component={RenderTextfield}
type="text" type="text"
className="govuk-input govuk-input--width-20" className="govuk-input govuk-input--width-20"
validate={[required]} //validate={[required]}
label={props.label} label={props.label}
errorMsg="Is required" errorMsg="Is required"
/> />
@@ -83,12 +83,12 @@ export function MultiLinefield(props) {
return ( return (
<div className="govuk-form-group"> <div className="govuk-form-group">
<h1 className="govuk-label-wrapper"> <h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor="more-detail"> <label className="govuk-label" htmlFor={props.name}>
{props.label} {props.label}
</label> </label>
</h1> </h1>
<div <div
id="more-detail-hint" id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14" className="govuk-hint govuk-!-font-size-14"
> >
Do not include personal or financial information, like your Do not include personal or financial information, like your
@@ -102,7 +102,7 @@ export function MultiLinefield(props) {
type="text" type="text"
rows="5" rows="5"
className="govuk-textarea govuk-input--width-30" className="govuk-textarea govuk-input--width-30"
aria-describedby="more-detail-hint" aria-describedby={props.name + "-hint"}
/> />
</div> </div>
); );
@@ -387,7 +387,7 @@ const RenderPickList = ({
return ( return (
<div> <div>
<select {...input} className="govuk-select" id={name} name={name}> <select {...input} className="govuk-select " id={name} name={name}>
<option>Select...</option> <option>Select...</option>
{Object.keys(dropdownObj).map((key, index) => { {Object.keys(dropdownObj).map((key, index) => {
return ( return (
@@ -441,7 +441,7 @@ export function NumericField(props) {
type="text" type="text"
className="govuk-input govuk-input--width-20" className="govuk-input govuk-input--width-20"
spellCheck="false" spellCheck="false"
aria-describedby="account-number-hint" //aria-describedby="account-number-hint"
pattern="[0-9]*" pattern="[0-9]*"
inputMode="numeric" inputMode="numeric"
/> />
@@ -464,7 +464,7 @@ export function DecimalField(props) {
type="text" type="text"
className="govuk-input govuk-input--width-10" className="govuk-input govuk-input--width-10"
spellCheck="false" spellCheck="false"
aria-describedby="account-number-hint" //aria-describedby="account-number-hint"
pattern="[0-9]*" pattern="[0-9]*"
inputMode="numeric" inputMode="numeric"
/> />
components/newappeal/buildcheckrow.js
+25 -5
View File
@@ -34,6 +34,21 @@ let BuildCheckRow = (props) => {
doc doc
); );
function formatDate(dateObj) {
var m = new Date(dateObj);
var dateString;
dateObj != null
? (dateString =
("0" + m.getDate()).slice(-2) +
"/" +
("0" + (m.getMonth() + 1)).slice(-2) +
"/" +
m.getFullYear())
: (dateString = "");
return dateString;
}
return ( return (
<> <>
{Object.keys(rowXML).map((key, index) => { {Object.keys(rowXML).map((key, index) => {
@@ -51,11 +66,16 @@ let BuildCheckRow = (props) => {
{rows[0].value} {rows[0].value}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ {fieldtype[0].value ==
props.props.form["appealForm"].values[ "{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}"
datafieldname[0].value ? formatDate(
] props.props.form["appealForm"].values[
} datafieldname[0].value
]
)
: props.props.form["appealForm"].values[
datafieldname[0].value
]}
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
<a <a
components/newappeal/buildchecksection.js
+4 -1
View File
@@ -67,7 +67,10 @@ let BuildCheckSection = (props) => {
{titles[key].value} {titles[key].value}
</h2> </h2>
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> <dl
className="govuk-summary-list govuk-!-margin-bottom-9"
key={key}
>
<BuildCheckRow <BuildCheckRow
formXML={formXML} formXML={formXML}
whichSection={parseInt(key) + 1} whichSection={parseInt(key) + 1}
components/newappeal/buildsection.js
+1 -1
View File
@@ -88,7 +88,7 @@ let BuildSection = (props) => {
//get label from error key - search rowxml for id = errorobj //get label from error key - search rowxml for id = errorobj
errorList.push( errorList.push(
<li> <li key={i}>
<a href={"#" + errorsobj[i] + "_label"}> <a href={"#" + errorsobj[i] + "_label"}>
{" "} {" "}
{getErrorLabel(errorsobj[i])} {getErrorLabel(errorsobj[i])}
components/newappeal/createCase.js
+2 -2
View File
@@ -82,7 +82,7 @@ let CreateCase = (props) => {
<div> <div>
<select <select
{...input} {...input}
className="govuk-select govuk-input--error" className="govuk-select govuk-!-width-one-half"
id="lpatypes" id="lpatypes"
name={name} name={name}
//onChange={(e) => props.onChangeSelectLPA(e)} //onChange={(e) => props.onChangeSelectLPA(e)}
@@ -143,7 +143,7 @@ let CreateCase = (props) => {
<div> <div>
<select <select
{...input} {...input}
className="govuk-select" className="govuk-select govuk-!-width-one-half"
id="appealTypes" id="appealTypes"
name={name} name={name}
//onChange={(e) => props.onChangeSelectAppealType(e)} //onChange={(e) => props.onChangeSelectAppealType(e)}
pages/newappeal/index.js
+14 -18
View File
@@ -50,24 +50,20 @@ const Home = (props) => {
<CookieBanner /> <CookieBanner />
<Header courseName={t("common:service-name")} /> <Header courseName={t("common:service-name")} />
<div className="govuk-grid-row"> <div className="govuk-width-container">
<div className="govuk-grid-column-full"> <Banner />
<div className="govuk-width-container"> <Breadcrumbs slug={appealtypes} />
<Banner /> <main
<Breadcrumbs slug={appealtypes} /> className="govuk-main-wrapper--auto-spacing"
<main id="main-content"
className="govuk-main-wrapper--auto-spacing" role="main"
id="main-content" >
role="main" <h1>New Appeal</h1>
> <CreateCase
<h1>New Appeal</h1> LPAData={props.LPAData}
<CreateCase appealType={props.setAppealType}
LPAData={props.LPAData} />
appealType={props.setAppealType} </main>
/>
</main>
</div>
</div>
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
styles/sass/welshgov/_application.scss
+7
View File
@@ -30,6 +30,13 @@ a {
background-color: #323232; background-color: #323232;
} }
.govuk-grid-row {
@media screen and (max-width: 900px) {
// margin-right: 0px;
// margin-left: 0px;
}
}
.govuk-button { .govuk-button {
background-color: $red; background-color: $red;