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

questionnaire defect 60.55,59,57

Browse Source
This commit is contained in:
robbond
2025-01-15 11:30:58 +00:00
parent 49418becf2
commit 33ab93643d
9 changed files with 154 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+93 -211
View File
@@ -865,50 +865,23 @@ let MakeRepresentation = (props) => {
? (Object.assign(values, { ? (Object.assign(values, {
"filesList": props.currentView.fileList, "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), uploadRepresentationFiles(values),
router.replace( router.replace(
router.locale != "en" router.locale != "en"
? router.locale + "/myportal" ? router.locale + "/myportal"
: "/myportal" : "/myportal"
)) ))
: //values.hasOwnProperty("representationDocuments") && : Object.assign(values, {
// sortFileObj() "filesList": props.currentView.fileList,
// (values.representationDocuments.map((Blob) => }),
// buildFileArray.push({ console.log("Rep Updated - props.caseReference"),
// "name": Blob.name, uploadRepresentationFiles(values);
// "size": Blob.size,
// })
// ),
// Object.assign(values, {
// "filesList": buildFileArray,
// })),
console.log("updated");
uploadRepresentationFiles(values);
// generateRepPDF(
// values,
// props.props.accountDetails.containerID,
// 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.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)); //console.log("onHandleSubmit form values - ", JSON.stringify(values));
const buildFileArray = []; const buildFileArray = [];
@@ -1074,55 +1047,9 @@ let MakeRepresentation = (props) => {
setRepresentationSubmit(true); setRepresentationSubmit(true);
setRepresentationSubmitConfirmation(true); setRepresentationSubmitConfirmation(true);
} else { } 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) => { const cleanFilesList = (blobList) => {
@@ -1184,22 +1111,14 @@ let MakeRepresentation = (props) => {
var dataObj = values; var dataObj = values;
// for (let key in dataObj) { uploadRepFiles(
// _.includes(key, "representationDocuments") == true && dataObj,
// delete dataObj[key]; [{}],
// } values.containerID,
props.caseReference + "/" + dataObj.repfile_name
// may need to delete ).then((data) => {
// No sure if this is needed anymore,...... return data;
});
// uploadRepFiles(
// dataObj,
// [{}],
// values.containerID,
// props.caseReference + "/" + dataObj.repfile_name
// ).then((data) => {
// return data;
// });
}; };
const repForm = props.props.form; const repForm = props.props.form;
@@ -1232,140 +1151,103 @@ let MakeRepresentation = (props) => {
/> />
) : ( ) : (
<> <>
{/* {!session ? ( <h1 className="govuk-heading-l">
<> {t(
<div> "myrepresentations:make-a-representation-on-label"
<p className="govuk-body"> )}{" "}
{t( {currentView.caseReference.currentReference}{" "}
"myrepresentations:sign-in-to-raise-rep-label" </h1>
)}{" "} <div id="rep-form">
<a <div className="govuk-grid-column-three-quarters wgForm">
href={ {whichControl()}
"mailto:" + </div>
t(
"myrepresentations:login-contact-email"
)
}
className="govuk-link--no-underline"
>
{t(
"myrepresentations:login-contact-email"
)}
</a>
</p>
</div>
<button
className="govuk-button withChevron govuk-button-cta"
type="button"
onClick={() => signIn()}
>
{t(
"myrepresentations:sign-in-to-raise-rep-button"
)}
</button>
</>
) : ( */}
<>
<h1 className="govuk-heading-l">
{t(
"myrepresentations:make-a-representation-on-label"
)}{" "}
{currentView.caseReference.currentReference}{" "}
</h1>
<div id="rep-form">
<div className="govuk-grid-column-three-quarters wgForm">
{whichControl()}
</div>
<div className="govuk-grid-column-one-quarter"> <div className="govuk-grid-column-one-quarter">
{" "} {" "}
<div className="card"> <div className="card">
<div className="card-body"> <div className="card-body">
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
{t( {t(
"myrepresentations:timetable-title" "myrepresentations:timetable-title"
)}{" "} )}{" "}
</h2> </h2>
<div className="govuk-summary-list"> <div className="govuk-summary-list">
<div className="govuk-body-s"> <div className="govuk-body-s">
{currentView.caseReference {currentView.caseReference
.appealType == 846040011 .appealType == 846040011
? t( ? t(
"myrepresentations:local-impact-report" "myrepresentations:local-impact-report"
)
: t(
"myrepresentations:questionnaire-due-label"
)}
:
<span className="govuk-body-s">
{" "}
{detailsObj.hasOwnProperty(
"pinswg_questionnaireduedate"
) ||
detailsObj.hasOwnProperty(
"pinswg_endofrepresentationperiod"
)
? formatDates(
detailsObj.pinswg_questionnaireduedate ||
detailsObj.pinswg_endofrepresentationperiod
) )
: t( : "N/A"}
"myrepresentations:questionnaire-due-label" </span>
)} </div>
: <div className="govuk-body-s">
<span className="govuk-body-s"> {t(
{" "} "myrepresentations:statements-due-label"
{detailsObj.hasOwnProperty( )}
"pinswg_questionnaireduedate" :
) || <span className="govuk-body-s">
detailsObj.hasOwnProperty( {" "}
"pinswg_endofrepresentationperiod" {formatDates(
) detailsObj.pinswg_statementduedate ||
? formatDates( detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_questionnaireduedate || detailsObj.pinswg_endofrepresentationperiod
detailsObj.pinswg_endofrepresentationperiod )}
) </span>
: "N/A"} </div>
</span> {currentView.caseReference
</div> .appealType != 846040011 && (
<div className="govuk-body-s"> <div className="govuk-body-s">
{t( {t(
"myrepresentations:statements-due-label" "myrepresentations:final-comments-due-label"
)} )}
: :
<span className="govuk-body-s"> <span className="govuk-body-s">
{" "} {" "}
{formatDates( {formatDates(
detailsObj.pinswg_statementduedate || detailsObj.pinswg_finalcommentsduedate
detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_endofrepresentationperiod
)} )}
</span> </span>
</div> </div>
{currentView.caseReference )}
.appealType !=
846040011 && (
<div className="govuk-body-s">
{t(
"myrepresentations:final-comments-due-label"
)}
:
<span className="govuk-body-s">
{" "}
{formatDates(
detailsObj.pinswg_finalcommentsduedate
)}
</span>
</div>
)}
</div>
</div> </div>
</div> </div>
<div> </div>
{formObj.hasOwnProperty( <div>
{formObj.hasOwnProperty(
"representationForm"
) &&
formObj[
"representationForm" "representationForm"
].hasOwnProperty("values") &&
formObj[
"representationForm"
].values.hasOwnProperty(
"representationType"
) && ) &&
formObj[ formObj["representationForm"].values
"representationForm" .representationType ==
].hasOwnProperty("values") && "Questionnaire" &&
formObj[ whichProgress()}
"representationForm"
].values.hasOwnProperty(
"representationType"
) &&
formObj["representationForm"].values
.representationType ==
"Questionnaire" &&
whichProgress()}
</div>
</div> </div>
</div> </div>
</> </div>
{/* )} */}
</> </>
)} )}
</form> </form>
components/pdftemplates/appealRow_pdf.js
+4 -1
View File
@@ -158,7 +158,10 @@ export const AppealRow_pdf = (props) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
components/pdftemplates/enforcement_pdf.js
+4 -1
View File
@@ -104,7 +104,10 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
components/pdftemplates/finalComments_pdf.js
+10 -5
View File
@@ -21,7 +21,7 @@ const getTrans = (locale, key) => {
let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; let jsonObj = locale == "cy" ? transLookupCY : transLookupEN;
console.log(locale, jsonObj[key]); //console.log(locale, jsonObj[key]);
return jsonObj[key]; return jsonObj[key];
}; };
@@ -68,9 +68,8 @@ const styles = StyleSheet.create({
}, },
questionAnswerWide: { questionAnswerWide: {
color: "#757575", color: "#757575",
width: "95%", width: "100%",
fontSize: 12, fontSize: 12,
marginLeft: "5%",
border: 1, border: 1,
borderColor: "#eee", borderColor: "#eee",
backgroundColor: "white", backgroundColor: "white",
@@ -125,7 +124,10 @@ export const finalComments_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
@@ -398,7 +400,10 @@ export const finalComments_pdf = ({ docProps }) => {
} }
> >
{p.name} -{" "} {p.name} -{" "}
{bytesToSize(p.size)}{" "} {bytesToSize(
p.size ||
p.contentLength
)}{" "}
{"\n"} {"\n"}
</Text> </Text>
</View> </View>
components/pdftemplates/lpaQuestionnaire_pdf.js
+5 -6
View File
@@ -87,9 +87,8 @@ const styles = StyleSheet.create({
}, },
questionAnswerWide: { questionAnswerWide: {
color: "#757575", color: "#757575",
width: "95%", width: "100%",
fontSize: 12, fontSize: 12,
marginLeft: "5%",
border: 1, border: 1,
borderColor: "#eee", borderColor: "#eee",
backgroundColor: "white", backgroundColor: "white",
@@ -149,7 +148,10 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
@@ -558,7 +560,6 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
wrap={false} wrap={false}
> >
<View <View
wrap={false}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 10, marginBottom: 10,
@@ -585,10 +586,8 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
flexDirection: "column", flexDirection: "column",
marginBottom: 10, marginBottom: 10,
}} }}
wrap={false}
> >
<View <View
wrap={false}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 10, marginBottom: 10,
components/pdftemplates/other_pdf.js
+5 -2
View File
@@ -21,7 +21,7 @@ const getTrans = (locale, key) => {
let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; let jsonObj = locale == "cy" ? transLookupCY : transLookupEN;
console.log(locale, jsonObj[key]); //console.log(locale, jsonObj[key]);
return jsonObj[key]; return jsonObj[key];
}; };
@@ -129,7 +129,10 @@ export const other_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
components/pdftemplates/statement_pdf.js
+11 -6
View File
@@ -18,7 +18,7 @@ const getTrans = (locale, key) => {
let jsonObj = locale == "cy" ? transLookupCY : transLookupEN; let jsonObj = locale == "cy" ? transLookupCY : transLookupEN;
console.log(locale, jsonObj[key]); //console.log(locale, jsonObj[key]);
return jsonObj[key]; return jsonObj[key];
}; };
@@ -65,9 +65,8 @@ const styles = StyleSheet.create({
}, },
questionAnswerWide: { questionAnswerWide: {
color: "#757575", color: "#757575",
width: "95%", width: "100%",
fontSize: 12, fontSize: 12,
marginLeft: "5%",
border: 1, border: 1,
borderColor: "#eee", borderColor: "#eee",
backgroundColor: "white", backgroundColor: "white",
@@ -97,7 +96,7 @@ const styles = StyleSheet.create({
}); });
export const statement_pdf = ({ docProps }) => { export const statement_pdf = ({ docProps }) => {
console.log("----", docProps); //console.log("----", docProps);
function formatDates(dateObj) { function formatDates(dateObj) {
var dateObj = new Date(dateObj); var dateObj = new Date(dateObj);
var dd = String(dateObj.getDate()).padStart(2, "0"); var dd = String(dateObj.getDate()).padStart(2, "0");
@@ -122,7 +121,10 @@ export const statement_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
@@ -395,7 +397,10 @@ export const statement_pdf = ({ docProps }) => {
} }
> >
{p.name} -{" "} {p.name} -{" "}
{bytesToSize(p.size)}{" "} {bytesToSize(
p.size ||
p.contentLength
)}{" "}
{"\n"} {"\n"}
</Text> </Text>
</View> </View>
components/pdftemplates/writtenStatement_pdf.js
+4 -1
View File
@@ -110,7 +110,10 @@ export const writtenStatement_pdf = ({ docProps }) => {
function CleanHTML(htmlStr) { function CleanHTML(htmlStr) {
let cleanStr = let cleanStr =
typeof htmlStr === "string" typeof htmlStr === "string"
? htmlStr.replace(/<p><br><\/p>/g, "") ? htmlStr.replace(
/<p><br><\/p>|<p class=\"ql-align-justify\"><br><\/p>/g,
""
)
: ""; : "";
return cleanStr; return cleanStr;
pages/api/file/upload.js
+18 -12
View File
@@ -35,20 +35,26 @@ ApiProxy.post(async (req, res) => {
repOrAppeal repOrAppeal
? createRepBlob(appealData, containerID, casefolderID).then((data) => { ? createRepBlob(appealData, containerID, casefolderID).then((data) => {
Object.keys(req.files).length > 0 && // Object.keys(req.files).length > 0 &&
uploadFile(req.files, containerID, casefolderID).then( // uploadFile(req.files, containerID, casefolderID).then(
(data) => { // (data) => {
return res.status(200).json({ data }); // return res.status(200).json({ data });
} // }
); // );
console.log("================================\nRepfile updated");
return res.status(200).json({ data });
}) })
: createBlob(appealData, containerID, casefolderID).then((data) => { : createBlob(appealData, containerID, casefolderID).then((data) => {
Object.keys(req.files).length > 0 && // Object.keys(req.files).length > 0 &&
uploadFile(req.files, containerID, casefolderID).then( // uploadFile(req.files, containerID, casefolderID).then(
(data) => { // (data) => {
return res.status(200).json({ data }); // return res.status(200).json({ data });
} // }
); // );
console.log(
"================================\nAppeal file updated"
);
return res.status(200).json({ data });
}); });
//}); //});