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

10489 submission fix

Browse Source
This commit is contained in:
robbond
2024-02-27 17:41:28 +00:00
parent 866b085254
commit 4d037ffeb8
8 changed files with 111 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/newappeal/aboutyou.js
-5
View File
@@ -49,11 +49,6 @@ const RenderTextfield = ({
id={id}
type={type}
disabled={disabled ? true : false}
maxLength={
custom.hasOwnProperty("maxFieldLength")
? custom.maxFieldLength
: undefined
}
/>
</div>
</>
components/newappeal/buildcheckrow.js
+1 -1
View File
@@ -63,7 +63,7 @@ let BuildCheckRow = (props) => {
const { locale } = router;
const { appealtypes } = router.query;
let formObj = jsonpath(fieldLookup, "$['" + appealtypes + "']");
let formObj = jsonpath("$['" + appealtypes + "']", fieldLookup);
let labelTrans =
router.locale == "cy"
components/newappeal/buildchecksection.js
+66 -35
View File
@@ -16,6 +16,7 @@ import {
getThumbnailIconByExtension,
bytesToSize,
} from "../utils";
import { generateAppealPDF } from "../../actions";
let BuildCheckSection = (props) => {
useEffect(() => {
@@ -70,6 +71,38 @@ let BuildCheckSection = (props) => {
alert(1);
};
let buildAppealFilesArray = [];
console.log("attached docs: - ", buildAppealFilesArray);
let filesUplaodObj = Object.keys(props.props.form.appealForm.values)
.filter(function (k) {
return k.indexOf("pinswg_fileUpload") == 0;
})
.reduce(function (newData, k) {
newData[k] = props.props.form.appealForm.values[k];
return newData;
}, {});
console.log(filesUplaodObj);
for (let key in filesUplaodObj) {
for (let j in filesUplaodObj[key]) {
buildAppealFilesArray.push({
"name": filesUplaodObj[key][j].name,
"size": filesUplaodObj[key][j].size,
});
}
}
console.log(buildAppealFilesArray);
let pdfObj = props.props.form.appealForm.values;
Object.assign(pdfObj, {
"containerID": props.props.accountDetails.containerID,
"casefolderID": props.appealType.caseReference.ticketnumber,
});
return (
<div className="govuk-grid-row" key={1222}>
<div className="govuk-grid-column-full">
@@ -98,41 +131,30 @@ let BuildCheckSection = (props) => {
<dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list">
<div className="govuk-summary-list__row" key={"9999"}>
<dt className="govuk-summary-list__key">
{props.props.appealType.fileList.value.length >
0
? props.props.appealType.fileList.value.map(
(blob, i) => (
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob[i].name
)}
alt={blob[i].name.slice(
blob[i].name.indexOf(
"_"
) + 1
)}
width="50"
/>
{buildAppealFilesArray.length > 0
? buildAppealFilesArray.map((blob, i) => (
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob.name
)}
alt={blob.name.slice(
blob.name.indexOf("_") + 1
)}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob[i].name.slice(
blob[i].name.indexOf(
"_"
) + 1
)}
(
{bytesToSize(
blob[i].contentLength
)}
)
</span>
</div>
)
)
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name.slice(
blob.name.indexOf("_") + 1
)}
({bytesToSize(blob?.size)})
</span>
</div>
))
: ""}
</dt>
<dd className="govuk-summary-list__actions">
@@ -153,7 +175,16 @@ let BuildCheckSection = (props) => {
<a
className="govuk-button"
data-module="govuk-button"
onClick={() => setCurrentSection(9999)}
onClick={() => {
setCurrentSection(9999),
generateAppealPDF(
pdfObj,
props.props.accountDetails.containerID,
props.appealType.caseReference.ticketnumber,
router.query.appealtypes,
props.appealType.fileList
);
}}
>
{t("newappeal:submit-appeal-button")}
</a>
components/newappeal/buildsection.js
+31 -20
View File
@@ -115,9 +115,9 @@ let BuildSection = (props) => {
var dataObj = values;
for (let key in dataObj) {
_.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
}
// for (let key in dataObj) {
// _.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
// }
uploadFiles(
dataObj,
@@ -177,23 +177,9 @@ let BuildSection = (props) => {
"\n////////////////////////\n"
);
let pdfObj = values;
Object.assign(pdfObj, {
"containerID": props.props.accountDetails.containerID,
"casefolderID": props.appealType.caseReference.ticketnumber,
});
generateAppealPDF(
pdfObj,
props.props.accountDetails.containerID,
props.appealType.caseReference.ticketnumber,
router.query.appealtypes,
props.appealType.fileList
),
props.setNewAppealProgress(
getProgressObj(formXML, titleList, mandatoryFieldsData, props)
);
props.setNewAppealProgress(
getProgressObj(formXML, titleList, mandatoryFieldsData, props)
);
let appTypeCollection = getFormCollectionByID(
props.appealType.appealTypeID
@@ -270,6 +256,31 @@ let BuildSection = (props) => {
const onHandleSubmit = (values) => {
//if (currentSection == sectionCount) {
let valuesObj = values || {};
let buildAppealFilesArray = [];
let filesUplaodObj = Object.keys(values)
.filter(function (k) {
return k.indexOf("pinswg_fileUpload") == 0;
})
.reduce(function (newData, k) {
newData[k] = values[k];
return newData;
}, {});
console.log(filesUplaodObj);
for (let key in filesUplaodObj) {
for (let j in filesUplaodObj[key]) {
buildAppealFilesArray.push({
"name": filesUplaodObj[key][j].name,
"size": filesUplaodObj[key][j].size,
});
}
}
console.log(buildAppealFilesArray);
setFilesForAppeal(buildAppealFilesArray);
// Object.assign(values, { "filesList": buildAppealFilesArray });
delete valuesObj["_pinswg_appellant_value"];
console.log("has errors:", props.invalid);