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

uat defect 124, rep defect 11, questionnaire defect 26

Browse Source
This commit is contained in:
robbond
2025-01-13 18:21:40 +00:00
parent 59ae2db6c5
commit 665c4bbba5
8 changed files with 173 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/index.js
+6 -6
View File
@@ -1566,12 +1566,12 @@ export const uploadRepFiles = async (
// files.forEach((file) => formData.append("files", file)); // files.forEach((file) => formData.append("files", file));
for (let i = 0; i < files.length; i++) { // for (let i = 0; i < files.length; i++) {
for (let j = 0; j < files[i].length; j++) { // for (let j = 0; j < files[i].length; j++) {
//console.log("upload rep files:", files[i][j].name); // //console.log("upload rep files:", files[i][j].name);
formData.append(files[i][j].name, files[i][j]); // formData.append(files[i][j].name, files[i][j]);
} // }
} // }
//console.log(formData); //console.log(formData);
components/case/representation/index.js
+55 -38
View File
@@ -129,6 +129,7 @@ let MakeRepresentation = (props) => {
repCap = "LO"; repCap = "LO";
break; break;
case "lpa": case "lpa":
case "LPA":
repCap = "LPA"; repCap = "LPA";
break; break;
@@ -204,7 +205,7 @@ let MakeRepresentation = (props) => {
return values; return values;
}; };
isLPA && setRepresentationCapacity("lpa"); isLPA && setRepresentationCapacity("LPA");
currentType == "searchResultsObj" currentType == "searchResultsObj"
? (casesObj = jsonpath( ? (casesObj = jsonpath(
@@ -248,8 +249,27 @@ let MakeRepresentation = (props) => {
? props.props.watchedCases.watchedCasesDetails ? props.props.watchedCases.watchedCasesDetails
: props.props.searchResultsObj.searchDetailsObj; : props.props.searchResultsObj.searchDetailsObj;
let setCaseResultsObj = router.query.hasOwnProperty("state")
? router.query.state == "edit"
? props.props.myRepresentations.myRepresentations
: props.props.searchResultsObj.searchResultsObj
: props.currentType == "watchedCases"
? props.props.watchedCases.watchedCasesDetails
: props.props.searchResultsObj.searchResultsObj;
var detailsObj = {}; var detailsObj = {};
var resultsObj = {};
resultsObj = jsonpath(
'$..[?(@.ticketnumber=="' +
currentView.caseReference.currentReference +
'")]',
setCaseResultsObj
);
resultsObj = resultsObj[0];
detailsObj = jsonpath( detailsObj = jsonpath(
'$..[?(@.pinswg_name=="' + '$..[?(@.pinswg_name=="' +
currentView.caseReference.currentReference + currentView.caseReference.currentReference +
@@ -396,7 +416,7 @@ let MakeRepresentation = (props) => {
) )
) { ) {
return ( return (
//setRepresentationCapacity("lpa"), //setRepresentationCapacity("LPA"),
<RepLPACapacitySelection <RepLPACapacitySelection
formObj={formObj} formObj={formObj}
capacityOptionsArr={capacityOptionsArr} capacityOptionsArr={capacityOptionsArr}
@@ -474,10 +494,11 @@ let MakeRepresentation = (props) => {
); );
break; break;
case "lpa": case "lpa":
case "LPA":
//setRepresentationCapacity("appellant"); //setRepresentationCapacity("appellant");
//setRepresentationCapacity("lpa"); //setRepresentationCapacity("LPA");
// useEffect(() => { // useEffect(() => {
// setRepresentationCapacity("lpa"); // setRepresentationCapacity("LPA");
// }, []); // }, []);
// console.log(currentView.caseReference.appealType); // console.log(currentView.caseReference.appealType);
@@ -761,6 +782,7 @@ let MakeRepresentation = (props) => {
"pinswg_siteaddressline2": detailsObj.pinswg_siteaddressline2, "pinswg_siteaddressline2": detailsObj.pinswg_siteaddressline2,
"pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown, "pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown,
"pinswg_siteaddresspostcode": detailsObj.pinswg_siteaddresspostcode, "pinswg_siteaddresspostcode": detailsObj.pinswg_siteaddresspostcode,
"pinswg_lpareference": resultsObj.pinswg_lpareference,
"_pinswg_appellant_value": detailsObj["_pinswg_appellant_value"], "_pinswg_appellant_value": detailsObj["_pinswg_appellant_value"],
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue": "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue":
detailsObj[ detailsObj[
@@ -777,7 +799,7 @@ let MakeRepresentation = (props) => {
? props.props.currentView.representationCapacity ? props.props.currentView.representationCapacity
: values.representationCapacity : values.representationCapacity
: isLPA : isLPA
? "lpa" ? "LPA"
: values.representationCapacity, : values.representationCapacity,
"locale": router.locale, "locale": router.locale,
}); });
@@ -840,23 +862,15 @@ let MakeRepresentation = (props) => {
: "/myportal" : "/myportal"
)) ))
: useSaveStatus : useSaveStatus
? (values.hasOwnProperty("representationDocuments") && ? (Object.assign(values, {
(values.representationDocuments.map((Blob) => "filesList": props.currentView.fileList,
buildFileArray.push({ }),
"name": Blob.name, // commented out as dont need to create pdf on save
"size": Blob.size, // generateRepPDF(
}) // values,
), // props.props.accountDetails.containerID,
(newbuildArr = buildFileArray.concat(values.filesList)), // currentView.caseReference.currentReference
console.log(buildFileArray, newbuildArr), // ),
Object.assign(values, {
"filesList": newbuildArr,
})),
generateRepPDF(
values,
props.props.accountDetails.containerID,
currentView.caseReference.currentReference
),
uploadRepresentationFiles(values), uploadRepresentationFiles(values),
router.replace( router.replace(
router.locale != "en" router.locale != "en"
@@ -874,25 +888,26 @@ let MakeRepresentation = (props) => {
// Object.assign(values, { // Object.assign(values, {
// "filesList": buildFileArray, // "filesList": buildFileArray,
// })), // })),
console.log("updated");
uploadRepresentationFiles(values), uploadRepresentationFiles(values);
generateRepPDF( // generateRepPDF(
values, // values,
props.props.accountDetails.containerID, // props.props.accountDetails.containerID,
currentView.caseReference.currentReference // currentView.caseReference.currentReference
); // );
}; };
const onHandleSubmit = (values) => { const onHandleSubmit = (values) => {
window.scrollTo({ top: 0, behavior: "smooth" }); window.scrollTo({ top: 0, behavior: "smooth" });
values = setRepFileName(values); values = setRepFileName(values);
!values.hasOwnProperty("pinswg_lpareference") && // values.representationType == "Questionnaire" &&
Object.assign(values, { // !values.hasOwnProperty("pinswg_lpareference") &&
"pinswg_lpareference": // Object.assign(values, {
searchResultsObj.searchResultsObj.value[0] // "pinswg_lpareference":
.pinswg_lpareference, // searchResultsObj?.searchResultsObj?.value[0]
}); // ?.pinswg_lpareference,
// });
//console.log("onHandleSubmit form values - ", JSON.stringify(values)); //console.log("onHandleSubmit form values - ", JSON.stringify(values));
@@ -973,6 +988,7 @@ let MakeRepresentation = (props) => {
"pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown, "pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown,
"pinswg_siteaddresspostcode": "pinswg_siteaddresspostcode":
detailsObj.pinswg_siteaddresspostcode, detailsObj.pinswg_siteaddresspostcode,
"pinswg_lpareference": resultsObj.pinswg_lpareference,
"_pinswg_appellant_value": "_pinswg_appellant_value":
detailsObj["_pinswg_appellant_value"], detailsObj["_pinswg_appellant_value"],
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue": "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue":
@@ -990,7 +1006,7 @@ let MakeRepresentation = (props) => {
? props.props.currentView.representationCapacity ? props.props.currentView.representationCapacity
: values.representationCapacity : values.representationCapacity
: isLPA : isLPA
? "lpa" ? "LPA"
: values.representationCapacity, : values.representationCapacity,
"locale": router.locale, "locale": router.locale,
})); }));
@@ -998,7 +1014,7 @@ let MakeRepresentation = (props) => {
if (currentView.representationSubmit != true) { if (currentView.representationSubmit != true) {
if (_.isEmpty(currentView.representationCapacity)) { if (_.isEmpty(currentView.representationCapacity)) {
if (isLPA) { if (isLPA) {
setRepresentationCapacity("lpa"); setRepresentationCapacity("LPA");
} else { } else {
setRepresentationCapacity( setRepresentationCapacity(
values.representationCapacity values.representationCapacity
@@ -1055,6 +1071,7 @@ let MakeRepresentation = (props) => {
currentView.caseReference.currentReference currentView.caseReference.currentReference
); );
uploadRepresentationFiles(values); uploadRepresentationFiles(values);
setRepresentationSubmit(true);
setRepresentationSubmitConfirmation(true); setRepresentationSubmitConfirmation(true);
} else { } else {
console.log("nit updated"); console.log("nit updated");
@@ -1064,7 +1081,7 @@ let MakeRepresentation = (props) => {
// currentView.representationSubmit != true // currentView.representationSubmit != true
// ? _.isEmpty(currentView.representationCapacity) // ? _.isEmpty(currentView.representationCapacity)
// ? isLPA // ? isLPA
// ? setRepresentationCapacity("lpa") // ? setRepresentationCapacity("LPA")
// : setRepresentationCapacity( // : setRepresentationCapacity(
// values.representationCapacity // values.representationCapacity
// .replace(/(\band|[\s\-\+\(\)\,\&])/g, "") // .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
components/case/representation/representationAgent.js
+18 -16
View File
@@ -199,22 +199,24 @@ const RepAgent = (props) => {
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.caseReference.hasOwnProperty( props.currentView.fileList
"repDetails"
) // props.currentView.caseReference.hasOwnProperty(
? props.currentView.caseReference.repDetails.hasOwnProperty( // "repDetails"
"filesList" // )
) && // ? props.currentView.caseReference.repDetails.hasOwnProperty(
props.currentView // "filesList"
.caseReference // ) &&
.repDetails.filesList // props.currentView
.length > 0 // .caseReference
? props.currentView // .repDetails.filesList
.caseReference // .length > 0
.repDetails // ? props.currentView
.filesList // .caseReference
: [] // .repDetails
: [] // .filesList
// : []
// : []
} }
setFilesForRepresentations={ setFilesForRepresentations={
setFilesForRepresentations setFilesForRepresentations
components/case/representation/representationAppellant.js
+15 -14
View File
@@ -191,20 +191,21 @@ const RepAppellant = (props) => {
ticketnumber={props.props.caseReference} ticketnumber={props.props.caseReference}
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.caseReference.hasOwnProperty( props.currentView.fileList
"repDetails" // props.currentView.caseReference.hasOwnProperty(
) // "repDetails"
? props.currentView.caseReference.repDetails.hasOwnProperty( // )
"filesList" // ? props.currentView.caseReference.repDetails.hasOwnProperty(
) && // "filesList"
props.currentView // ) &&
.caseReference.repDetails // props.currentView
.filesList.length > 0 // .caseReference.repDetails
? props.currentView // .filesList.length > 0
.caseReference // ? props.currentView
.repDetails.filesList // .caseReference
: [] // .repDetails.filesList
: [] // : []
// : []
} }
setFilesForRepresentations={ setFilesForRepresentations={
setFilesForRepresentations setFilesForRepresentations
components/case/representation/representationElements.js
+13 -5
View File
@@ -7,7 +7,7 @@ import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css"; import "react-datepicker/dist/react-datepicker.css";
import Dropzone from "react-dropzone"; import Dropzone from "react-dropzone";
import "react-quill-new/dist/quill.snow.css"; import "react-quill-new/dist/quill.snow.css";
import { Field } from "redux-form"; import { Field, change } from "redux-form";
import { import {
uploadSingleFile, uploadSingleFile,
deleteBlob, deleteBlob,
@@ -17,6 +17,7 @@ import {
} from "../../../actions"; } from "../../../actions";
const ReactQuill = dynamic(() => import("react-quill-new"), { ssr: false }); const ReactQuill = dynamic(() => import("react-quill-new"), { ssr: false });
import { useDispatch } from "react-redux"; // Import the useDispatch hook
import { import {
addDays, addDays,
@@ -867,6 +868,8 @@ const rejectStyle = {
export const RenderFileUpload = (field) => { export const RenderFileUpload = (field) => {
const files = field.input.value; const files = field.input.value;
const dispatch = useDispatch(); // Get dispatch using useDispatch hook
let { t } = useTranslation(); let { t } = useTranslation();
const style = useMemo( const style = useMemo(
@@ -929,9 +932,9 @@ export const RenderFileUpload = (field) => {
const filelistObj = field.fileList || {}; const filelistObj = field.fileList || {};
//let blobList = filelistObj; let blobList = filelistObj;
let blobList = field.props.currentView.fileList; //let blobList = field.props.currentView.fileList;
function removeNullObjects(arr) { function removeNullObjects(arr) {
if (arr.length === 0) { if (arr.length === 0) {
@@ -1063,6 +1066,7 @@ export const RenderFileUpload = (field) => {
[".xlsx"], [".xlsx"],
}} }}
onDrop={(filesToUpload, e) => { onDrop={(filesToUpload, e) => {
setCompletedUploadFiles(false);
const renamedAcceptedFiles = filesToUpload.map( const renamedAcceptedFiles = filesToUpload.map(
(file) => (file) =>
new File( new File(
@@ -1150,9 +1154,13 @@ export const RenderFileUpload = (field) => {
)) ))
).then((data) => { ).then((data) => {
data = data.value || {}; data = data.value || {};
field.input.value == null; field.input.value = "";
field.setFilesForRepresentations(data[0]); field.setFilesForRepresentations(data[0]);
setCompletedUploadFiles(true); setCompletedUploadFiles(true);
dispatch(
change("representationForm", field.name, null)
); // Set the field value to null
}); });
}); });
}} }}
@@ -1283,7 +1291,7 @@ export const RenderFileUpload = (field) => {
field.ticketnumber + field.ticketnumber +
"/" + "/" +
field.filenamePrefix.representationForm field.filenamePrefix.representationForm
.values.repfile_name ?.values?.repfile_name
) + ) +
"&blobname=" + "&blobname=" +
blob.name + blob.name +
components/case/representation/representationInterestedPartyPerson.js
+18 -16
View File
@@ -186,22 +186,24 @@ const RepInterestedPartyPerson = (props) => {
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.caseReference.hasOwnProperty( props.currentView.fileList
"repDetails"
) // props.currentView.caseReference.hasOwnProperty(
? props.currentView.caseReference.repDetails.hasOwnProperty( // "repDetails"
"filesList" // )
) && // ? props.currentView.caseReference.repDetails.hasOwnProperty(
props.currentView // "filesList"
.caseReference // ) &&
.repDetails.filesList // props.currentView
.length > 0 // .caseReference
? props.currentView // .repDetails.filesList
.caseReference // .length > 0
.repDetails // ? props.currentView
.filesList // .caseReference
: [] // .repDetails
: [] // .filesList
// : []
// : []
} }
setFilesForRepresentations={ setFilesForRepresentations={
setFilesForRepresentations setFilesForRepresentations
components/case/representation/representationLPA.js
+35 -18
View File
@@ -352,23 +352,24 @@ let RepLPA = (props) => {
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
(props.formObj.hasOwnProperty( props.currentView.fileList
"representationForm" // (props.formObj.hasOwnProperty(
) && // "representationForm"
props.formObj[ // ) &&
"representationForm" // props.formObj[
].hasOwnProperty( // "representationForm"
"values" // ].hasOwnProperty(
) && // "values"
props.formObj[ // ) &&
"representationForm" // props.formObj[
].values.hasOwnProperty( // "representationForm"
"filesList" // ].values.hasOwnProperty(
) && // "filesList"
props.props.props.form[ // ) &&
"representationForm" // props.props.props.form[
].values.filesList) || // "representationForm"
[] // ].values.filesList) ||
// []
} }
setFilesForRepresentations={ setFilesForRepresentations={
setFilesForRepresentations setFilesForRepresentations
@@ -505,6 +506,22 @@ let RepLPA = (props) => {
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
onClick={() => { onClick={() => {
let valuesObj =
props.props.props.form[props.form]
.values || {};
console.log("valuesobj:", valuesObj);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log("on save:", valuesObj);
updateRepresentation(
valuesObj,
false,
false
);
setRepresentationSubmit(true); setRepresentationSubmit(true);
}} }}
> >
@@ -604,7 +621,7 @@ const mapStateToProps = (state, props) => {
? state.currentView.caseReference.repDetails ? state.currentView.caseReference.repDetails
: state.currentView.caseReference, : state.currentView.caseReference,
{ {
"representationCapacity": "lpa", "representationCapacity": "LPA",
"onBehalfOfLPA": "onBehalfOfLPA":
props.props.props.accountDetails.accountDetails[ props.props.props.accountDetails.accountDetails[
"pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+13 -12
View File
@@ -1181,18 +1181,19 @@ let Enforcement_Questionnaire = (props) => {
ticketnumber={props.props.props.caseReference} ticketnumber={props.props.props.caseReference}
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.currentView.caseReference.hasOwnProperty( props.currentView.fileList
"repDetails" // props.currentView.caseReference.hasOwnProperty(
) // "repDetails"
? props.currentView.caseReference.repDetails.hasOwnProperty( // )
"filesList" // ? props.currentView.caseReference.repDetails.hasOwnProperty(
) && // "filesList"
props.currentView.caseReference.repDetails // ) &&
.filesList.length > 0 // props.currentView.caseReference.repDetails
? props.currentView.caseReference // .filesList.length > 0
.repDetails.filesList // ? props.currentView.caseReference
: [] // .repDetails.filesList
: [] // : []
// : []
} }
setFilesForRepresentations={ setFilesForRepresentations={
setFilesForRepresentations setFilesForRepresentations