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

use ticketnumber not ref/title/pinswg_name

Browse Source
This commit is contained in:
robbond
2025-08-12 07:20:17 +01:00
parent b808a34b14
commit 6fa2418b19
13 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+46 -32
View File
@@ -268,7 +268,7 @@ let MakeRepresentation = (props) => {
resultsObj = jsonpath({
path:
'$..[?(@ && @.ticketnumber=="' +
currentView.caseReference.currentReference +
currentView.caseReference.ticketnumber +
'")]',
json: setCaseResultsObj,
eval: true,
@@ -296,8 +296,8 @@ let MakeRepresentation = (props) => {
})
: jsonpath({
path:
'$..[?(@ && @.pinswg_name =="' +
currentView.caseReference.currentReference +
'$..[?(@ && @.ticketnumber =="' +
currentView.caseReference.ticketnumber +
'")]',
json: setCaseDetailsObj,
eval: true,
@@ -767,6 +767,26 @@ let MakeRepresentation = (props) => {
return blobList;
};
const buildAddressStr = (detailsObj) => {
const toTitleCase = (str) =>
str.toLowerCase().replace(/\b\w/g, (char) => char.toUpperCase());
return [
detailsObj?.pinswg_siteaddressline1 ||
detailsObj?.pinswg_addressline1,
detailsObj?.pinswg_siteaddressline2 ||
detailsObj?.pinswg_addressline2,
detailsObj?.pinswg_siteaddresstown ||
detailsObj?.pinswg_addresstown,
detailsObj?.pinswg_siteaddresspostcode ||
detailsObj?.pinswg_postcode,
detailsObj?.pinswg_siteaddresscounty ||
detailsObj?.pinswg_addresscounty,
]
.filter((v) => !!v && v.trim()) // remove empty/whitespace-only values
.map((v) => toTitleCase(v.trim())) // title-case each segment
.join(" ");
};
const updateRepresentation = async (
values,
sendSavedEmail,
@@ -807,14 +827,7 @@ let MakeRepresentation = (props) => {
"lastname": props.props.accountDetails.accountDetails.lastname,
"emailAddress":
props.props.accountDetails.accountDetails.emailaddress1,
"siteAddress":
detailsObj.pinswg_siteaddressline1 +
(detailsObj.pinswg_siteaddressline2 != null
? " " + detailsObj.pinswg_siteaddressline2 + " "
: " ") +
detailsObj.pinswg_siteaddresstown +
" " +
detailsObj.pinswg_siteaddresspostcode,
"siteAddress": buildAddressStr(detailsObj),
"pinswg_siteaddressline1": detailsObj.pinswg_siteaddressline1,
"pinswg_siteaddressline2": detailsObj.pinswg_siteaddressline2,
"pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown,
@@ -945,7 +958,10 @@ let MakeRepresentation = (props) => {
var detailsObj = {};
detailsObj = jsonpath({
path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
path:
'$..[?(@ && @.ticketnumber=="' +
currentView.caseReference.ticketnumber +
'")]',
json: setCaseDetailsObj,
eval: true,
});
@@ -974,16 +990,19 @@ let MakeRepresentation = (props) => {
props.props.currentView.caseReference.currentReference,
"casereference":
props.props.currentView.caseReference.currentReference,
"ticketnumber":
props.props.currentView.caseReference.ticketnumber,
"pinswg_questionnaireduedate":
detailsObj.pinswg_questionnaireduedate,
detailsObj?.pinswg_questionnaireduedate,
"pinswg_endofrepresentationperiod":
detailsObj.pinswg_endofrepresentationperiod,
detailsObj?.pinswg_endofrepresentationperiod,
"pinswg_applicationacceptedasvalid":
detailsObj.pinswg_applicationacceptedasvalid,
"pinswg_statementduedate": detailsObj.pinswg_statementduedate,
"pinswg_statementsduedate": detailsObj.pinswg_statementsduedate,
detailsObj?.pinswg_applicationacceptedasvalid,
"pinswg_statementduedate": detailsObj?.pinswg_statementduedate,
"pinswg_statementsduedate":
detailsObj?.pinswg_statementsduedate,
"pinswg_finalcommentsduedate":
detailsObj.pinswg_finalcommentsduedate,
detailsObj?.pinswg_finalcommentsduedate,
"pinswg_name":
props.props.currentView.caseReference.currentReference,
"firstname":
@@ -991,19 +1010,12 @@ let MakeRepresentation = (props) => {
"lastname": props.props.accountDetails.accountDetails.lastname,
"emailAddress":
props.props.accountDetails.accountDetails.emailaddress1,
"siteAddress":
detailsObj.pinswg_siteaddressline1 +
(detailsObj.pinswg_siteaddressline2 != null
? " " + detailsObj.pinswg_siteaddressline2 + " "
: " ") +
detailsObj.pinswg_siteaddresstown +
" " +
detailsObj.pinswg_siteaddresspostcode,
"pinswg_siteaddressline1": detailsObj.pinswg_siteaddressline1,
"pinswg_siteaddressline2": detailsObj.pinswg_siteaddressline2,
"pinswg_siteaddresstown": detailsObj.pinswg_siteaddresstown,
"siteAddress": buildAddressStr(detailsObj),
"pinswg_siteaddressline1": detailsObj?.pinswg_siteaddressline1,
"pinswg_siteaddressline2": detailsObj?.pinswg_siteaddressline2,
"pinswg_siteaddresstown": detailsObj?.pinswg_siteaddresstown,
"pinswg_siteaddresspostcode":
detailsObj.pinswg_siteaddresspostcode,
detailsObj?.pinswg_siteaddresspostcode,
"pinswg_lpareference": resultsObj?.pinswg_lpareference || "",
"_pinswg_appellant_value":
detailsObj["_pinswg_appellant_value"],
@@ -1068,7 +1080,7 @@ let MakeRepresentation = (props) => {
console.log("has errors:", props.invalid);
Object.assign(values, {
"locale": router.locale,
"repComplete": currentView.caseReference.currentReference,
"repComplete": currentView.caseReference.ticketnumber,
});
props.invalid == false &&
updateRepresentation(values, false, false);
@@ -1169,7 +1181,9 @@ let MakeRepresentation = (props) => {
dataObj,
[{}],
values.containerID,
props.caseReference + "/" + dataObj.repfile_name
props.props.currentView.caseReference.ticketnumber +
"/" +
dataObj.repfile_name
).then((data) => {
return data;
});