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

Merged PR 1304: details can cases data was showing incorrectly due to order in array... combi...

Browse Source 
details can cases data was showing incorrectly due to order in array... combined arrays and display correctly

Related work items: #12787
This commit is contained in:
Robert Bond
2024-11-22 12:35:05 +00:00
parent c05b0b151c a367cc0c88
commit 654a6c1171
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/myportal/awaitingsubmissionfromblob.js
+37 -27
View File
@@ -43,14 +43,25 @@ const AwaitingSubmissionFromBlob = (props) => {
} }
let topthreeRowArr = []; let topthreeRowArr = [];
let showTopThreeArr = props.awaitingSubmissionFromBlob.value; let showTopThreeArr = props.awaitingSubmissionFromBlob.case;
let showTopThreeArrDets = props.awaitingSubmissionFromBlob.case; let showTopThreeArrDets = props.awaitingSubmissionFromBlob.value;
showTopThreeArr = sortByField(showTopThreeArr, "pinswg_name"); showTopThreeArr = sortByField(showTopThreeArr, "ticketnumber");
showTopThreeArrDets = sortByField(showTopThreeArrDets, "ticketnumber"); showTopThreeArrDets = sortByField(showTopThreeArrDets, "pinswg_name");
showTopThreeArr = sortByISODate(showTopThreeArr, "createdDate"); let mergedArray = showTopThreeArr.map((item1) => {
showTopThreeArrDets = sortByISODate(showTopThreeArrDets, "createdon"); let item2 = showTopThreeArrDets.find(
(item) => item.pinswg_name === item1.ticketnumber
);
return { ...item1, ...item2 };
});
console.log(mergedArray);
showTopThreeArr = mergedArray;
showTopThreeArr = sortByISODate(showTopThreeArr, "createdon");
// showTopThreeArrDets = sortByISODate(showTopThreeArrDets, "createdon");
const raisedDate = (datePart) => { const raisedDate = (datePart) => {
var dateObj = new Date(datePart); var dateObj = new Date(datePart);
@@ -142,7 +153,10 @@ const AwaitingSubmissionFromBlob = (props) => {
}); });
}} }}
> >
{showTopThreeArr[index].pinswg_name} {
showTopThreeArr[index]
.ticketnumber
}
</Link> </Link>
)} )}
</div> </div>
@@ -202,63 +216,60 @@ const AwaitingSubmissionFromBlob = (props) => {
.pinswg_siteaddresstown .pinswg_siteaddresstown
: "")} : "")}
</div> </div>
{showTopThreeArrDets[key] {showTopThreeArr[key].pinswg_appellantagent !=
.pinswg_appellantagent != null && ( null && (
<div> <div>
{showTopThreeArrDets[key] {showTopThreeArr[key]
.pinswg_appellantagent != .pinswg_appellantagent !=
846040000 && ( 846040000 && (
<b> <b>
{t("myportal:raised-by-label")}:{" "} {t("myportal:raised-by-label")}:{" "}
</b> </b>
)} )}
{showTopThreeArrDets[key] {showTopThreeArr[key]
.pinswg_appellantagent != .pinswg_appellantagent !=
846040000 && 846040000 &&
(showTopThreeArrDets[key] (showTopThreeArr[key]
.pinswg_agentcompanyname != .pinswg_agentcompanyname !=
null && null &&
showTopThreeArrDets[key] showTopThreeArr[key]
.pinswg_agentcompanyname + .pinswg_agentcompanyname +
", ") + ", ") +
showTopThreeArrDets[key] showTopThreeArr[key]
.pinswg_agentfirstname + .pinswg_agentfirstname +
" " + " " +
showTopThreeArrDets[key] showTopThreeArr[key]
.pinswg_agentlastname} .pinswg_agentlastname}
</div> </div>
)} )}
{showTopThreeArrDets[key] {showTopThreeArr[key].pinswg_appellantagent !=
.pinswg_appellantfirstname != null && ( 846040000 && (
<div> <div>
<b> <b>
{t("myportal:on-behalf-of-label")}:{" "} {t("myportal:on-behalf-of-label")}:{" "}
</b> </b>
{showTopThreeArrDets[key] {showTopThreeArr[key]
.pinswg_appellantfirstname + .pinswg_appellantfirstname +
" " + " " +
showTopThreeArrDets[key] showTopThreeArr[key]
.pinswg_appellantlastname} .pinswg_appellantlastname}
</div> </div>
)} )}
{router.locale == "cy" {router.locale == "cy"
? jsonpath( ? jsonpath(
'$..[?(@.value=="' + '$..[?(@.value=="' +
showTopThreeArrDets[key][ showTopThreeArr[key][
"pinswg_lpaname" "pinswg_lpaname"
] + ] +
'")].value_cy', '")].value_cy',
transLookup transLookup
) )
: showTopThreeArrDets[key][ : showTopThreeArr[key]["pinswg_lpaname"] ||
"pinswg_lpaname" ""}
] || ""}
<div className="cardModuleReference"> <div className="cardModuleReference">
<b>{t("myportal:date-raised")}:</b> <b>{t("myportal:date-raised")}:</b>
{" "} {" "}
{raisedDate( {raisedDate(showTopThreeArr[key].createdon)}
showTopThreeArrDets[key].createdon
)}
</div>{" "} </div>{" "}
{showTopThreeArr[key].hasOwnProperty( {showTopThreeArr[key].hasOwnProperty(
"appealComplete" "appealComplete"
@@ -325,7 +336,6 @@ const AwaitingSubmissionFromBlob = (props) => {
</h3> </h3>
<TopThreeRow /> <TopThreeRow />
{props.awaitingSubmissionFromBlob["@odata.count"] > 1 && ( {props.awaitingSubmissionFromBlob["@odata.count"] > 1 && (
<div className="cardVieAll"> <div className="cardVieAll">
<Link <Link