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

questionnaire for callins and uploads

Browse Source
This commit is contained in:
robbond
2024-12-03 18:27:51 +00:00
parent c7e13f84e7
commit 49d39e052e
14 changed files with 220 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/representationCompleteSubmit.js
+69 -52
View File
@@ -141,21 +141,21 @@ const RepCompleteSubmit = (props) => {
let buildAppealFilesArray = [];
// let filesUploadObj =
// formObj.representationForm.values.representationDocuments;
let filesUploadObj =
formObj.representationForm.values.representationDocuments;
// for (let key in filesUploadObj) {
// typeof filesUploadObj[key].name != "undefined" &&
// buildAppealFilesArray.push({
// "name": filesUploadObj[key].name,
// "size": filesUploadObj[key].size,
// });
// }
for (let key in filesUploadObj) {
typeof filesUploadObj[key].name != "undefined" &&
buildAppealFilesArray.push({
"name": filesUploadObj[key].name,
"size": filesUploadObj[key].size,
});
}
// console.log(
// buildAppealFilesArray,
// formObj.representationForm.values.filesList
// );
console.log(
buildAppealFilesArray,
formObj.representationForm.values.filesList
);
buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty(
"filesList"
@@ -165,23 +165,43 @@ const RepCompleteSubmit = (props) => {
console.log(buildAppealFilesArray);
// const arrUniq = [
// ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
// ];
let arrUniq = [
...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
];
// buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
// return el != null;
// });
buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
return el != null;
});
// const arrUniq = buildAppealFilesArray.filter(
// (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
// );
// console.log(arrUniq);
console.log(arrUniq, buildAppealFilesArray);
// Object.assign(formObj.representationForm.values, {
// "filesList": arrUniq,
// });
arrUniq = arrUniq.concat(filesUploadObj);
function removeNullObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj !== null);
}
function removeEmptyObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter(
(obj) =>
obj && typeof obj === "object" && Object.keys(obj).length > 0
);
}
arrUniq = removeNullObjects(arrUniq);
arrUniq = removeEmptyObjects(arrUniq);
Object.assign(formObj.representationForm.values, {
"filesList": arrUniq,
});
let filterFiles = [];
return (
@@ -363,35 +383,29 @@ const RepCompleteSubmit = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{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}
width="50"
/>
{arrUniq.length > 0
? arrUniq.map((blob, i) => (
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob.name
)}
alt={blob.name}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name} (
{bytesToSize(
blob.size
)}
)
</span>
</div>
)
)
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name} (
{bytesToSize(
blob.size
)}
)
</span>
</div>
))
: ""}
</dd>
@@ -413,7 +427,10 @@ const RepCompleteSubmit = (props) => {
</a>
</dd>
</div>
{whichQuestionnaireCheck()}
{repFormData.representationType ==
"Questionnaire"
? whichQuestionnaireCheck()
: ""}
</dl>
<p>
{t(