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

breacrumb change & form styling

Browse Source
This commit is contained in:
robbond
2024-08-12 17:20:06 +01:00
parent c93e9e0056
commit 80f499c072
7 changed files with 422 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/newappeal/buildsection.js
+133 -34
View File
@@ -388,8 +388,8 @@ let BuildSection = (props) => {
return (
<div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds">
<h1 className="govuk-heading-m govuk-!-margin-top-5">
<div className="govuk-grid-column-two-thirds wgForm ">
<h1 className="govuk-heading-m ">
{FieldsTranslations(titles[0].value)}
</h1>
<form onSubmit={handleSubmit(onHandleSubmit)}>
@@ -413,45 +413,142 @@ let BuildSection = (props) => {
<div className="govuk-button-group">
{props.sectionCount != currentSection ? (
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
getErrors();
let valuesObj = _.has(
props.props.form[props.form],
"values"
)
? props.props.form[props.form].values
: {};
<>
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
getErrors();
let valuesObj = _.has(
props.props.form[props.form],
"values"
)
? props.props.form[props.form]
.values
: {};
//console.log("valuesobj:", valuesObj);
//console.log("valuesobj:", valuesObj);
delete valuesObj["_pinswg_appellant_value"];
delete valuesObj[
"_pinswg_appellant_value"
];
//console.log("on save:", valuesObj);
updateCaseProgress(valuesObj, false, false);
}}
>
{t("common:continue-button")}
</button>
//console.log("on save:", valuesObj);
updateCaseProgress(
valuesObj,
false,
false
);
}}
>
{t("common:continue-button")}
</button>
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form]
.values || {};
console.log(
"valuesobj:",
valuesObj
);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log("on save:", valuesObj);
updateCaseProgress(
valuesObj,
true,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</>
) : (
""
)}
{props.sectionCount == currentSection ? (
<button
disabled={!isProgressComplete(progObj)}
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:submit-button")}
</button>
<>
<button
disabled={!isProgressComplete(progObj)}
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:submit-button")}
</button>
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale == "cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form]
.values || {};
console.log(
"valuesobj:",
valuesObj
);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log("on save:", valuesObj);
updateCaseProgress(
valuesObj,
true,
true
);
}}
>
{t("common:save-exit-button")}
</button>
)}
</>
) : (
""
)}
{currentSection > 1 ? (
{/* {currentSection > 1 ? (
<a
className="govuk-link"
href="#"
@@ -463,7 +560,7 @@ let BuildSection = (props) => {
</a>
) : (
""
)}
)} */}
</div>
</form>
</div>
@@ -486,6 +583,8 @@ let BuildSection = (props) => {
<hr className="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
{/*
Mpved save and exit button from progess section
{savingStatus ? (
<span className=" progress-save-active">
{router.locale == "cy" ? "Nôl data" : "Saving data"}
@@ -501,7 +600,7 @@ let BuildSection = (props) => {
</span>
) : (
<button
className="govuk-button govuk-button--secondary progress-save "
className="govuk-button progress-save "
onClick={() => {
let valuesObj =
props.props.form[props.form].values || {};
@@ -516,7 +615,7 @@ let BuildSection = (props) => {
>
{t("common:save-exit-button")}
</button>
)}
)} */}
</div>
</div>
</div>