diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index 78875b50..c0f20eb8 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -43,14 +43,25 @@ const AwaitingSubmissionFromBlob = (props) => { } let topthreeRowArr = []; - let showTopThreeArr = props.awaitingSubmissionFromBlob.value; - let showTopThreeArrDets = props.awaitingSubmissionFromBlob.case; + let showTopThreeArr = props.awaitingSubmissionFromBlob.case; + let showTopThreeArrDets = props.awaitingSubmissionFromBlob.value; - showTopThreeArr = sortByField(showTopThreeArr, "pinswg_name"); - showTopThreeArrDets = sortByField(showTopThreeArrDets, "ticketnumber"); + showTopThreeArr = sortByField(showTopThreeArr, "ticketnumber"); + showTopThreeArrDets = sortByField(showTopThreeArrDets, "pinswg_name"); - showTopThreeArr = sortByISODate(showTopThreeArr, "createdDate"); - showTopThreeArrDets = sortByISODate(showTopThreeArrDets, "createdon"); + let mergedArray = showTopThreeArr.map((item1) => { + 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) => { var dateObj = new Date(datePart); @@ -142,7 +153,10 @@ const AwaitingSubmissionFromBlob = (props) => { }); }} > - {showTopThreeArr[index].pinswg_name} + { + showTopThreeArr[index] + .ticketnumber + } )} @@ -202,63 +216,60 @@ const AwaitingSubmissionFromBlob = (props) => { .pinswg_siteaddresstown : "")} - {showTopThreeArrDets[key] - .pinswg_appellantagent != null && ( + {showTopThreeArr[key].pinswg_appellantagent != + null && (
- {showTopThreeArrDets[key] + {showTopThreeArr[key] .pinswg_appellantagent != 846040000 && ( {t("myportal:raised-by-label")}:{" "} )} - {showTopThreeArrDets[key] + {showTopThreeArr[key] .pinswg_appellantagent != 846040000 && - (showTopThreeArrDets[key] + (showTopThreeArr[key] .pinswg_agentcompanyname != null && - showTopThreeArrDets[key] + showTopThreeArr[key] .pinswg_agentcompanyname + ", ") + - showTopThreeArrDets[key] + showTopThreeArr[key] .pinswg_agentfirstname + " " + - showTopThreeArrDets[key] + showTopThreeArr[key] .pinswg_agentlastname}
)} - {showTopThreeArrDets[key] - .pinswg_appellantfirstname != null && ( + {showTopThreeArr[key].pinswg_appellantagent != + 846040000 && (
{t("myportal:on-behalf-of-label")}:{" "} - {showTopThreeArrDets[key] + {showTopThreeArr[key] .pinswg_appellantfirstname + " " + - showTopThreeArrDets[key] + showTopThreeArr[key] .pinswg_appellantlastname}
)} {router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + - showTopThreeArrDets[key][ + showTopThreeArr[key][ "pinswg_lpaname" ] + '")].value_cy', transLookup ) - : showTopThreeArrDets[key][ - "pinswg_lpaname" - ] || ""} + : showTopThreeArr[key]["pinswg_lpaname"] || + ""}
{t("myportal:date-raised")}: {" "} - {raisedDate( - showTopThreeArrDets[key].createdon - )} + {raisedDate(showTopThreeArr[key].createdon)}
{" "} {showTopThreeArr[key].hasOwnProperty( "appealComplete" @@ -325,7 +336,6 @@ const AwaitingSubmissionFromBlob = (props) => { - {props.awaitingSubmissionFromBlob["@odata.count"] > 1 && (