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

Merged PR 1176: updated to fix breadcrumb

Browse Source 
updated to fix breadcrumb

Related work items: #11320
This commit is contained in:
Robert Bond
2024-06-04 06:57:14 +00:00
parent 04dec99af1 53e96b18bd
commit daef08f98f
7 changed files with 112 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+3 -3
View File
@@ -322,9 +322,9 @@ let MakeRepresentation = (props) => {
todaysDate <= statementDueDate && todaysDate <= statementDueDate &&
buildArr.push("Statement"); buildArr.push("Statement");
currentView.caseReference.appealType != 846040004 && (currentView.caseReference.appealType != 846040004 ||
currentView.caseReference.appealType == 846040015 && (currentView.caseReference.appealType == 846040015 &&
currentView.caseReference.specialistProcess != 846040001 && currentView.caseReference.specialistProcess != 846040001)) &&
todaysDate >= statementDueDate && todaysDate >= statementDueDate &&
todaysDate <= finalCommentsDate && todaysDate <= finalCommentsDate &&
buildArr.push("Final comments"); buildArr.push("Final comments");
components/case/representation/representationAgent.js
+26 -23
View File
@@ -196,31 +196,34 @@ const RepAgent = (props) => {
</div> </div>
</> </>
)} )}
<div className="govuk-grid-row"> {typeof formObj.representationForm.values.representationType !=
<div className="govuk-button-group"> "undefined" && (
<button <div className="govuk-grid-row">
type="submit" <div className="govuk-button-group">
className="govuk-button" <button
data-module="govuk-button" type="submit"
> className="govuk-button"
{t("common:continue-button")}{" "} data-module="govuk-button"
</button> >
{t("common:continue-button")}
</button>
<a <a
onClick={() => { onClick={() => {
setRepresentationCapacity(); setRepresentationCapacity();
props.updateField( props.updateField(
"representationForm", "representationForm",
"representationCapacity", "representationCapacity",
"" ""
); );
}} }}
className="govuk-link" className="govuk-link"
> >
{t("common:back-link")} {t("common:back-link")}
</a> </a>
</div>
</div> </div>
</div> )}
</> </>
); );
}; };
components/case/representation/representationAppellant.js
+26 -24
View File
@@ -180,31 +180,33 @@ const RepAppellant = (props) => {
</div>{" "} </div>{" "}
</div> </div>
)} )}
<div className="govuk-grid-row"> {typeof formObj.representationForm.values.representationType !=
<div className="govuk-button-group"> "undefined" && (
<button <div className="govuk-grid-row">
type="submit" <div className="govuk-button-group">
className="govuk-button" <button
data-module="govuk-button" type="submit"
> className="govuk-button"
{t("common:continue-button")} data-module="govuk-button"
</button> >
{t("common:continue-button")}
<a </button>
onClick={() => { <a
setRepresentationCapacity(); onClick={() => {
props.updateField( setRepresentationCapacity();
"representationForm", props.updateField(
"representationType", "representationForm",
"" "representationType",
); ""
}} );
className="govuk-link" }}
> className="govuk-link"
{t("common:back-link")} >
</a> {t("common:back-link")}
</a>
</div>
</div> </div>
</div> )}
</> </>
); );
}; };
components/case/representation/representationElements.js
+4 -3
View File
@@ -468,7 +468,7 @@ export const RenderPickList = ({
datafieldname, datafieldname,
name, name,
label, label,
input, input: { onChange, value },
optionsArr, optionsArr,
meta: { touched, error }, meta: { touched, error },
errorMsg, errorMsg,
@@ -493,14 +493,15 @@ export const RenderPickList = ({
{errorMsg} {errorMsg}
</span> </span>
)} )}
{value}
<div> <div>
<select <select
{...input} // {...input}
className="govuk-select " className="govuk-select "
id={datafieldname} id={datafieldname}
name={datafieldname} name={datafieldname}
disabled={custom.disabled} disabled={custom.disabled}
onChange={onChange}
> >
<option>Select...</option> <option>Select...</option>
{Object.keys(optionsArr).map((key, index) => { {Object.keys(optionsArr).map((key, index) => {
components/case/representation/representationInterestedPartyPerson.js
+31 -28
View File
@@ -157,36 +157,39 @@ const RepInterestedPartyPerson = (props) => {
</div> </div>
</> </>
)} )}
<div className="govuk-grid-row"> {typeof formObj.representationForm.values.representationType !=
<div className="govuk-button-group"> "undefined" && (
<button <div className="govuk-grid-row">
type="submit" <div className="govuk-button-group">
className="govuk-button" <button
data-module="govuk-button" type="submit"
> className="govuk-button"
{t("common:continue-button")} data-module="govuk-button"
</button> >
{t("common:continue-button")}
</button>
<a <a
onClick={() => { onClick={() => {
setRepresentationCapacity(); setRepresentationCapacity();
props.updateField( props.updateField(
"representationForm", "representationForm",
"representationCapacity", "representationCapacity",
"" ""
); );
props.updateField( props.updateField(
"representationForm", "representationForm",
"representationType", "representationType",
"" ""
); );
}} }}
className="govuk-link" className="govuk-link"
> >
{t("case:summary-back-button-label")} {t("case:summary-back-button-label")}
</a> </a>
</div>
</div> </div>
</div> )}
</> </>
); );
}; };
components/case/representation/representationLandowner.js
+21 -19
View File
@@ -104,26 +104,28 @@ const RepLandOwner = (props) => {
</fieldset> </fieldset>
</div>{" "} </div>{" "}
</div> </div>
{typeof formObj.representationForm.values.representationType !=
<div className="govuk-grid-row"> "undefined" && (
<div className="govuk-button-group"> <div className="govuk-grid-row">
<button <div className="govuk-button-group">
type="submit" <button
className="govuk-button" type="submit"
data-module="govuk-button" className="govuk-button"
> data-module="govuk-button"
{t("common:continue-button")} >
</button> {t("common:continue-button")}
<a </button>
onClick={() => { <a
setRepresentationCapacity(); onClick={() => {
}} setRepresentationCapacity();
className="govuk-link" }}
> className="govuk-link"
{t("common:back-link")} >
</a> {t("common:back-link")}
</a>
</div>
</div> </div>
</div> )}
</div> </div>
</div> </div>
); );
components/myportal/viewall.js
+1
View File
@@ -657,6 +657,7 @@ const ViewAllResults = (props) => {
</button> </button>
</dd> </dd>
)} )}
{currentView.viewKey == "watchedCases" && ( {currentView.viewKey == "watchedCases" && (
<dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem "> <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
<button <button