diff --git a/components/case/representation/index.js b/components/case/representation/index.js index 72cb6c73..06faf301 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -865,50 +865,23 @@ let MakeRepresentation = (props) => { ? (Object.assign(values, { "filesList": props.currentView.fileList, }), - // commented out as dont need to create pdf on save - // generateRepPDF( - // values, - // props.props.accountDetails.containerID, - // currentView.caseReference.currentReference - // ), uploadRepresentationFiles(values), router.replace( router.locale != "en" ? router.locale + "/myportal" : "/myportal" )) - : //values.hasOwnProperty("representationDocuments") && - // sortFileObj() - // (values.representationDocuments.map((Blob) => - // buildFileArray.push({ - // "name": Blob.name, - // "size": Blob.size, - // }) - // ), - // Object.assign(values, { - // "filesList": buildFileArray, - // })), - console.log("updated"); - uploadRepresentationFiles(values); - // generateRepPDF( - // values, - // props.props.accountDetails.containerID, - // currentView.caseReference.currentReference - // ); + : Object.assign(values, { + "filesList": props.currentView.fileList, + }), + console.log("Rep Updated - props.caseReference"), + uploadRepresentationFiles(values); }; const onHandleSubmit = (values) => { window.scrollTo({ top: 0, behavior: "smooth" }); values = setRepFileName(values); - // values.representationType == "Questionnaire" && - // !values.hasOwnProperty("pinswg_lpareference") && - // Object.assign(values, { - // "pinswg_lpareference": - // searchResultsObj?.searchResultsObj?.value[0] - // ?.pinswg_lpareference, - // }); - //console.log("onHandleSubmit form values - ", JSON.stringify(values)); const buildFileArray = []; @@ -1074,55 +1047,9 @@ let MakeRepresentation = (props) => { setRepresentationSubmit(true); setRepresentationSubmitConfirmation(true); } else { - console.log("nit updated"); + console.log("not updated"); } } - - // currentView.representationSubmit != true - // ? _.isEmpty(currentView.representationCapacity) - // ? isLPA - // ? setRepresentationCapacity("LPA") - // : setRepresentationCapacity( - // values.representationCapacity - // .replace(/(\band|[\s\-\+\(\)\,\&])/g, "") - // .toLowerCase() - // ) - // : questionnaireCount != 0 && - // showQuestionnaireSection < questionnaireCount - // ? (setShowQuestionnaireSection(showQuestionnaireSection + 1), - // updateRepresentation(values, false, false)) - // : (updateRepresentation(values, false, false), - // setRepresentationSubmit(true)) - // : currentView.representationSubmit == true - // ? (console.log("capacity", currentView.representationCapacity), - // console.log("has errors:", props.invalid), - // Object.assign(values, { "locale": router.locale }), - // props.invalid == false && - // updateRepresentation(values, false, false), - // // values.hasOwnProperty("representationDocuments") && - // // (values.representationDocuments.map((Blob) => - // // buildFileArray.push({ - // // "name": Blob.name, - // // "size": Blob.size, - // // }) - // // ), - // // Object.assign(values, { - // // "filesList": buildFileArray, - // // })), - // console.log( - // "====================== rep lpa payload:\n", - // JSON.stringify(values) - // ), - // generateRepPDF( - // values, - // props.props.accountDetails.containerID, - // currentView.caseReference.currentReference - // ), - // uploadRepresentationFiles(values), - // setRepresentationSubmitConfirmation(true)) - // : console.log("nit updated"); - - //window.alert(`You submitted:\n\n${JSON.stringify(values, null, 2)}`); }; const cleanFilesList = (blobList) => { @@ -1184,22 +1111,14 @@ let MakeRepresentation = (props) => { var dataObj = values; - // for (let key in dataObj) { - // _.includes(key, "representationDocuments") == true && - // delete dataObj[key]; - // } - - // may need to delete - // No sure if this is needed anymore,...... - - // uploadRepFiles( - // dataObj, - // [{}], - // values.containerID, - // props.caseReference + "/" + dataObj.repfile_name - // ).then((data) => { - // return data; - // }); + uploadRepFiles( + dataObj, + [{}], + values.containerID, + props.caseReference + "/" + dataObj.repfile_name + ).then((data) => { + return data; + }); }; const repForm = props.props.form; @@ -1232,140 +1151,103 @@ let MakeRepresentation = (props) => { /> ) : ( <> - {/* {!session ? ( - <> -
-

- {t( - "myrepresentations:sign-in-to-raise-rep-label" - )}{" "} - - {t( - "myrepresentations:login-contact-email" - )} - -

-
- - - ) : ( */} - <> -

- {t( - "myrepresentations:make-a-representation-on-label" - )}{" "} - {currentView.caseReference.currentReference}{" "} -

-
-
- {whichControl()} -
+

+ {t( + "myrepresentations:make-a-representation-on-label" + )}{" "} + {currentView.caseReference.currentReference}{" "} +

+
+
+ {whichControl()} +
-
- {" "} -
-
-

- {t( - "myrepresentations:timetable-title" - )}{" "} -

-
-
- {currentView.caseReference - .appealType == 846040011 - ? t( - "myrepresentations:local-impact-report" +
+ {" "} +
+
+

+ {t( + "myrepresentations:timetable-title" + )}{" "} +

+
+
+ {currentView.caseReference + .appealType == 846040011 + ? t( + "myrepresentations:local-impact-report" + ) + : t( + "myrepresentations:questionnaire-due-label" + )} + : + + {" "} + {detailsObj.hasOwnProperty( + "pinswg_questionnaireduedate" + ) || + detailsObj.hasOwnProperty( + "pinswg_endofrepresentationperiod" + ) + ? formatDates( + detailsObj.pinswg_questionnaireduedate || + detailsObj.pinswg_endofrepresentationperiod ) - : t( - "myrepresentations:questionnaire-due-label" - )} - : - - {" "} - {detailsObj.hasOwnProperty( - "pinswg_questionnaireduedate" - ) || - detailsObj.hasOwnProperty( - "pinswg_endofrepresentationperiod" - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate || - detailsObj.pinswg_endofrepresentationperiod - ) - : "N/A"} - -
+ : "N/A"} + +
+
+ {t( + "myrepresentations:statements-due-label" + )} + : + + {" "} + {formatDates( + detailsObj.pinswg_statementduedate || + detailsObj.pinswg_statementsduedate || + detailsObj.pinswg_endofrepresentationperiod + )} + +
+ {currentView.caseReference + .appealType != 846040011 && (
{t( - "myrepresentations:statements-due-label" + "myrepresentations:final-comments-due-label" )} : {" "} {formatDates( - detailsObj.pinswg_statementduedate || - detailsObj.pinswg_statementsduedate || - detailsObj.pinswg_endofrepresentationperiod + detailsObj.pinswg_finalcommentsduedate )}
- {currentView.caseReference - .appealType != - 846040011 && ( -
- {t( - "myrepresentations:final-comments-due-label" - )} - : - - {" "} - {formatDates( - detailsObj.pinswg_finalcommentsduedate - )} - -
- )} -
+ )}
-
- {formObj.hasOwnProperty( +
+
+ {formObj.hasOwnProperty( + "representationForm" + ) && + formObj[ "representationForm" + ].hasOwnProperty("values") && + formObj[ + "representationForm" + ].values.hasOwnProperty( + "representationType" ) && - formObj[ - "representationForm" - ].hasOwnProperty("values") && - formObj[ - "representationForm" - ].values.hasOwnProperty( - "representationType" - ) && - formObj["representationForm"].values - .representationType == - "Questionnaire" && - whichProgress()} -
+ formObj["representationForm"].values + .representationType == + "Questionnaire" && + whichProgress()}
- - {/* )} */} +
)} diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js index 662ec5de..6bba3c15 100644 --- a/components/pdftemplates/appealRow_pdf.js +++ b/components/pdftemplates/appealRow_pdf.js @@ -158,7 +158,10 @@ export const AppealRow_pdf = (props) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; diff --git a/components/pdftemplates/enforcement_pdf.js b/components/pdftemplates/enforcement_pdf.js index ac5722a7..ba2579d2 100644 --- a/components/pdftemplates/enforcement_pdf.js +++ b/components/pdftemplates/enforcement_pdf.js @@ -104,7 +104,10 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; diff --git a/components/pdftemplates/finalComments_pdf.js b/components/pdftemplates/finalComments_pdf.js index 556a4d9f..be300697 100644 --- a/components/pdftemplates/finalComments_pdf.js +++ b/components/pdftemplates/finalComments_pdf.js @@ -21,7 +21,7 @@ const getTrans = (locale, key) => { let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; - console.log(locale, jsonObj[key]); + //console.log(locale, jsonObj[key]); return jsonObj[key]; }; @@ -68,9 +68,8 @@ const styles = StyleSheet.create({ }, questionAnswerWide: { color: "#757575", - width: "95%", + width: "100%", fontSize: 12, - marginLeft: "5%", border: 1, borderColor: "#eee", backgroundColor: "white", @@ -125,7 +124,10 @@ export const finalComments_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; @@ -398,7 +400,10 @@ export const finalComments_pdf = ({ docProps }) => { } > {p.name} -{" "} - {bytesToSize(p.size)}{" "} + {bytesToSize( + p.size || + p.contentLength + )}{" "} {"\n"} diff --git a/components/pdftemplates/lpaQuestionnaire_pdf.js b/components/pdftemplates/lpaQuestionnaire_pdf.js index 2af6be48..0f8b44f5 100644 --- a/components/pdftemplates/lpaQuestionnaire_pdf.js +++ b/components/pdftemplates/lpaQuestionnaire_pdf.js @@ -87,9 +87,8 @@ const styles = StyleSheet.create({ }, questionAnswerWide: { color: "#757575", - width: "95%", + width: "100%", fontSize: 12, - marginLeft: "5%", border: 1, borderColor: "#eee", backgroundColor: "white", @@ -149,7 +148,10 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; @@ -558,7 +560,6 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => { wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} > { let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; - console.log(locale, jsonObj[key]); + //console.log(locale, jsonObj[key]); return jsonObj[key]; }; @@ -129,7 +129,10 @@ export const other_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; diff --git a/components/pdftemplates/statement_pdf.js b/components/pdftemplates/statement_pdf.js index 6e8bcfbd..14ab7249 100644 --- a/components/pdftemplates/statement_pdf.js +++ b/components/pdftemplates/statement_pdf.js @@ -18,7 +18,7 @@ const getTrans = (locale, key) => { let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; - console.log(locale, jsonObj[key]); + //console.log(locale, jsonObj[key]); return jsonObj[key]; }; @@ -65,9 +65,8 @@ const styles = StyleSheet.create({ }, questionAnswerWide: { color: "#757575", - width: "95%", + width: "100%", fontSize: 12, - marginLeft: "5%", border: 1, borderColor: "#eee", backgroundColor: "white", @@ -97,7 +96,7 @@ const styles = StyleSheet.create({ }); export const statement_pdf = ({ docProps }) => { - console.log("----", docProps); + //console.log("----", docProps); function formatDates(dateObj) { var dateObj = new Date(dateObj); var dd = String(dateObj.getDate()).padStart(2, "0"); @@ -122,7 +121,10 @@ export const statement_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; @@ -395,7 +397,10 @@ export const statement_pdf = ({ docProps }) => { } > {p.name} -{" "} - {bytesToSize(p.size)}{" "} + {bytesToSize( + p.size || + p.contentLength + )}{" "} {"\n"} diff --git a/components/pdftemplates/writtenStatement_pdf.js b/components/pdftemplates/writtenStatement_pdf.js index c9d5b8ab..2fdbb6bd 100644 --- a/components/pdftemplates/writtenStatement_pdf.js +++ b/components/pdftemplates/writtenStatement_pdf.js @@ -110,7 +110,10 @@ export const writtenStatement_pdf = ({ docProps }) => { function CleanHTML(htmlStr) { let cleanStr = typeof htmlStr === "string" - ? htmlStr.replace(/


<\/p>/g, "") + ? htmlStr.replace( + /


<\/p>|


<\/p>/g, + "" + ) : ""; return cleanStr; diff --git a/pages/api/file/upload.js b/pages/api/file/upload.js index 6bd36e0e..4219319a 100644 --- a/pages/api/file/upload.js +++ b/pages/api/file/upload.js @@ -35,20 +35,26 @@ ApiProxy.post(async (req, res) => { repOrAppeal ? createRepBlob(appealData, containerID, casefolderID).then((data) => { - Object.keys(req.files).length > 0 && - uploadFile(req.files, containerID, casefolderID).then( - (data) => { - return res.status(200).json({ data }); - } - ); + // Object.keys(req.files).length > 0 && + // uploadFile(req.files, containerID, casefolderID).then( + // (data) => { + // return res.status(200).json({ data }); + // } + // ); + console.log("================================\nRepfile updated"); + return res.status(200).json({ data }); }) : createBlob(appealData, containerID, casefolderID).then((data) => { - Object.keys(req.files).length > 0 && - uploadFile(req.files, containerID, casefolderID).then( - (data) => { - return res.status(200).json({ data }); - } - ); + // Object.keys(req.files).length > 0 && + // uploadFile(req.files, containerID, casefolderID).then( + // (data) => { + // return res.status(200).json({ data }); + // } + // ); + console.log( + "================================\nAppeal file updated" + ); + return res.status(200).json({ data }); }); //});