added key to top three row for appeal sunbmission card
This commit is contained in:
+4
-1
@@ -65,7 +65,10 @@ AZURE_TENANT_ID = $TENANT
|
|||||||
AZURE_CLIENT_SECRET = $CLIENT_SECRET
|
AZURE_CLIENT_SECRET = $CLIENT_SECRET
|
||||||
//AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
|
//AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
|
||||||
AZURE_STORAGE_ACCOUNT_NAME= "pedwtest"
|
AZURE_STORAGE_ACCOUNT_NAME= "pedwtest"
|
||||||
AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
|
// dev key
|
||||||
|
//AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
|
||||||
|
//test key
|
||||||
|
AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw==
|
||||||
|
|
||||||
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
|
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
|
||||||
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
|
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
|
||||||
|
|||||||
+3
-5
@@ -1465,8 +1465,7 @@ export const getFilesFromBlobHashed = (
|
|||||||
) => {
|
) => {
|
||||||
return axios
|
return axios
|
||||||
.get(
|
.get(
|
||||||
BASE_URL +
|
"/api/file/getbloblist?container=" +
|
||||||
"/api/file/getbloblist?container=" +
|
|
||||||
containerName +
|
containerName +
|
||||||
"&casefolderID=" +
|
"&casefolderID=" +
|
||||||
casefolderID +
|
casefolderID +
|
||||||
@@ -1489,8 +1488,7 @@ export const deleteBlob = async (
|
|||||||
) => {
|
) => {
|
||||||
try {
|
try {
|
||||||
const res = await axios.get(
|
const res = await axios.get(
|
||||||
BASE_URL +
|
"/api/file/deleteblob?container=" +
|
||||||
"/api/file/deleteblob?container=" +
|
|
||||||
containerName +
|
containerName +
|
||||||
"&casefolderID=" +
|
"&casefolderID=" +
|
||||||
casefolderID +
|
casefolderID +
|
||||||
@@ -1664,7 +1662,7 @@ export const sendCaseCompleteMessage = async (containerID, caseReference) => {
|
|||||||
return res.data;
|
return res.data;
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
//console.log("API call error", error);
|
consoleLogger(error);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -60,181 +60,6 @@ const AwaitingSubmissionFromBlob = (props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let topThreeOnlyArr = showTopThreeArr.slice(0, 3);
|
let topThreeOnlyArr = showTopThreeArr.slice(0, 3);
|
||||||
//console.log(showTopThreeArr);
|
|
||||||
Object.keys(topThreeOnlyArr).map((key, index) => {
|
|
||||||
//console.log(key, showTopThreeArr[key].pinswg_appealcasetype);
|
|
||||||
//console.log("subsssss:", showTopThreeArr[key]);
|
|
||||||
let urlname = getFormCollectionByID(
|
|
||||||
showTopThreeArr[key].pinswg_appealcasetype
|
|
||||||
).UrlName;
|
|
||||||
|
|
||||||
topthreeRowArr.push(
|
|
||||||
<>
|
|
||||||
<div className="cardModuleItem" key={index}>
|
|
||||||
<div className="cardModuleDetails">
|
|
||||||
<div className="cardModuleReference">
|
|
||||||
<b>{t("myportal:temp-reference")}:</b>
|
|
||||||
|
|
||||||
<Link
|
|
||||||
key={"link" + index}
|
|
||||||
href={
|
|
||||||
(router.locale == "cy"
|
|
||||||
? "/fymhorth"
|
|
||||||
: "/myportal") +
|
|
||||||
"/" +
|
|
||||||
urlname +
|
|
||||||
"?lpa=" +
|
|
||||||
showTopThreeArr[key][
|
|
||||||
"_pinswg_associatedlpa_value"
|
|
||||||
] +
|
|
||||||
"&apt=" +
|
|
||||||
showTopThreeArr[key].pinswg_appealcasetype +
|
|
||||||
"&casereference=" +
|
|
||||||
showTopThreeArr[key].pinswg_name +
|
|
||||||
"&inid=" +
|
|
||||||
showTopThreeArr[key].incidentid
|
|
||||||
}
|
|
||||||
className="govuk-link--no-underline"
|
|
||||||
data-id={index}
|
|
||||||
onClick={() => {
|
|
||||||
props.setCurrentReference({
|
|
||||||
"currentReference":
|
|
||||||
showTopThreeArr[key].ticketnumber,
|
|
||||||
|
|
||||||
"currentType": "awaitingSubmission",
|
|
||||||
|
|
||||||
"incidentid":
|
|
||||||
showTopThreeArr[key].incidentid,
|
|
||||||
|
|
||||||
"appealType":
|
|
||||||
showTopThreeArr[key]
|
|
||||||
.pinswg_appealcasetype,
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{showTopThreeArr[index].pinswg_name}
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<b>LPA reference:</b>{" "}
|
|
||||||
{
|
|
||||||
showTopThreeArr[key]
|
|
||||||
.pinswg_lpaapplicationreference
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<b>{t("myportal:appeal-type-label")}:</b>{" "}
|
|
||||||
{
|
|
||||||
getFormCollectionByID(
|
|
||||||
showTopThreeArr[key].pinswg_appealcasetype
|
|
||||||
).value
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div className="carModuleAddress">
|
|
||||||
<b>{t("myportal:case-address")}:</b>{" "}
|
|
||||||
{_.isEmpty(showTopThreeArr)
|
|
||||||
? t("myportal:case-address-not-entered")
|
|
||||||
: _.isEmpty(showTopThreeArr[index])
|
|
||||||
? t("myportal:case-address-not-entered")
|
|
||||||
: _.isEmpty(showTopThreeArr[index])
|
|
||||||
? t("myportal:case-address-not-entered")
|
|
||||||
: _.isEmpty(
|
|
||||||
showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddressline1
|
|
||||||
)
|
|
||||||
? t("myportal:case-address-not-entered")
|
|
||||||
: showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddressline1 +
|
|
||||||
(!_.isEmpty(
|
|
||||||
showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddressline2
|
|
||||||
)
|
|
||||||
? ", " +
|
|
||||||
showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddressline2
|
|
||||||
: "") +
|
|
||||||
(!_.isEmpty(
|
|
||||||
showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddresstown
|
|
||||||
)
|
|
||||||
? ", " +
|
|
||||||
showTopThreeArr[index]
|
|
||||||
.pinswg_siteaddresstown
|
|
||||||
: "")}
|
|
||||||
</div>
|
|
||||||
{showTopThreeArrDets[key].pinswg_appellantagent !=
|
|
||||||
null && (
|
|
||||||
<div>
|
|
||||||
{showTopThreeArrDets[key]
|
|
||||||
.pinswg_appellantagent != 846040000 && (
|
|
||||||
<b>{t("myportal:raised-by-label")}: </b>
|
|
||||||
)}
|
|
||||||
{showTopThreeArrDets[key]
|
|
||||||
.pinswg_appellantagent != 846040000 &&
|
|
||||||
(showTopThreeArrDets[key]
|
|
||||||
.pinswg_agentcompanyname != null &&
|
|
||||||
showTopThreeArrDets[key]
|
|
||||||
.pinswg_agentcompanyname + ", ") +
|
|
||||||
showTopThreeArrDets[key]
|
|
||||||
.pinswg_agentfirstname +
|
|
||||||
" " +
|
|
||||||
showTopThreeArrDets[key]
|
|
||||||
.pinswg_agentlastname}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{showTopThreeArrDets[key].pinswg_appellantfirstname !=
|
|
||||||
null && (
|
|
||||||
<div>
|
|
||||||
<b>{t("myportal:on-behalf-of-label")}: </b>
|
|
||||||
{showTopThreeArrDets[key]
|
|
||||||
.pinswg_appellantfirstname +
|
|
||||||
" " +
|
|
||||||
showTopThreeArrDets[key]
|
|
||||||
.pinswg_appellantlastname}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{router.locale == "cy"
|
|
||||||
? jsonpath(
|
|
||||||
'$..[?(@.value=="' +
|
|
||||||
showTopThreeArrDets[key][
|
|
||||||
"pinswg_lpaname"
|
|
||||||
] +
|
|
||||||
'")].value_cy',
|
|
||||||
transLookup
|
|
||||||
)
|
|
||||||
: showTopThreeArrDets[key]["pinswg_lpaname"] || ""}
|
|
||||||
<div className="cardModuleReference">
|
|
||||||
<b>{t("myportal:date-raised")}:</b>
|
|
||||||
{" "}
|
|
||||||
{raisedDate(showTopThreeArrDets[key].createdon)}
|
|
||||||
</div>{" "}
|
|
||||||
</div>
|
|
||||||
<div className="">
|
|
||||||
<button
|
|
||||||
title={t("case:do-you-want-to-delete-case-label")}
|
|
||||||
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
|
|
||||||
onClick={() => {
|
|
||||||
confirm(
|
|
||||||
t("case:do-you-want-to-delete-case-label") +
|
|
||||||
showTopThreeArr[key].pinswg_name +
|
|
||||||
"?\n" +
|
|
||||||
t(
|
|
||||||
"case:do-you-want-to-delete-case-disclaimer-label"
|
|
||||||
)
|
|
||||||
) &&
|
|
||||||
deleteCaseItem(
|
|
||||||
props.containerID,
|
|
||||||
showTopThreeArr[key].pinswg_name
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
—
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
const TopThreeRow = () => {
|
const TopThreeRow = () => {
|
||||||
return (
|
return (
|
||||||
@@ -242,7 +67,197 @@ const AwaitingSubmissionFromBlob = (props) => {
|
|||||||
className="cardModuleContainer"
|
className="cardModuleContainer"
|
||||||
key={"cttr_" + Math.floor(Math.random() * 5)}
|
key={"cttr_" + Math.floor(Math.random() * 5)}
|
||||||
>
|
>
|
||||||
{topthreeRowArr}
|
{Object.keys(topThreeOnlyArr).map((key, index) => {
|
||||||
|
let urlname = getFormCollectionByID(
|
||||||
|
showTopThreeArr[key].pinswg_appealcasetype
|
||||||
|
).UrlName;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="cardModuleItem" key={"item_" + index}>
|
||||||
|
<div className="cardModuleDetails">
|
||||||
|
<div className="cardModuleReference">
|
||||||
|
<b>{t("myportal:temp-reference")}:</b>
|
||||||
|
|
||||||
|
<Link
|
||||||
|
href={
|
||||||
|
(router.locale == "cy"
|
||||||
|
? "/fymhorth"
|
||||||
|
: "/myportal") +
|
||||||
|
"/" +
|
||||||
|
urlname +
|
||||||
|
"?lpa=" +
|
||||||
|
showTopThreeArr[key][
|
||||||
|
"_pinswg_associatedlpa_value"
|
||||||
|
] +
|
||||||
|
"&apt=" +
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_appealcasetype +
|
||||||
|
"&casereference=" +
|
||||||
|
showTopThreeArr[key].pinswg_name +
|
||||||
|
"&inid=" +
|
||||||
|
showTopThreeArr[key].incidentid
|
||||||
|
}
|
||||||
|
className="govuk-link--no-underline"
|
||||||
|
data-id={index}
|
||||||
|
onClick={() => {
|
||||||
|
props.setCurrentReference({
|
||||||
|
"currentReference":
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.ticketnumber,
|
||||||
|
|
||||||
|
"currentType":
|
||||||
|
"awaitingSubmission",
|
||||||
|
|
||||||
|
"incidentid":
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.incidentid,
|
||||||
|
|
||||||
|
"appealType":
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_appealcasetype,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{showTopThreeArr[index].pinswg_name}
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<b>LPA reference:</b>{" "}
|
||||||
|
{
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_lpaapplicationreference
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<b>{t("myportal:appeal-type-label")}:</b>{" "}
|
||||||
|
{
|
||||||
|
getFormCollectionByID(
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_appealcasetype
|
||||||
|
).value
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<div className="carModuleAddress">
|
||||||
|
<b>{t("myportal:case-address")}:</b>{" "}
|
||||||
|
{_.isEmpty(showTopThreeArr)
|
||||||
|
? t("myportal:case-address-not-entered")
|
||||||
|
: _.isEmpty(showTopThreeArr[index])
|
||||||
|
? t("myportal:case-address-not-entered")
|
||||||
|
: _.isEmpty(showTopThreeArr[index])
|
||||||
|
? t("myportal:case-address-not-entered")
|
||||||
|
: _.isEmpty(
|
||||||
|
showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddressline1
|
||||||
|
)
|
||||||
|
? t("myportal:case-address-not-entered")
|
||||||
|
: showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddressline1 +
|
||||||
|
(!_.isEmpty(
|
||||||
|
showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddressline2
|
||||||
|
)
|
||||||
|
? ", " +
|
||||||
|
showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddressline2
|
||||||
|
: "") +
|
||||||
|
(!_.isEmpty(
|
||||||
|
showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddresstown
|
||||||
|
)
|
||||||
|
? ", " +
|
||||||
|
showTopThreeArr[index]
|
||||||
|
.pinswg_siteaddresstown
|
||||||
|
: "")}
|
||||||
|
</div>
|
||||||
|
{showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantagent != null && (
|
||||||
|
<div>
|
||||||
|
{showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantagent !=
|
||||||
|
846040000 && (
|
||||||
|
<b>
|
||||||
|
{t("myportal:raised-by-label")}:{" "}
|
||||||
|
</b>
|
||||||
|
)}
|
||||||
|
{showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantagent !=
|
||||||
|
846040000 &&
|
||||||
|
(showTopThreeArrDets[key]
|
||||||
|
.pinswg_agentcompanyname !=
|
||||||
|
null &&
|
||||||
|
showTopThreeArrDets[key]
|
||||||
|
.pinswg_agentcompanyname +
|
||||||
|
", ") +
|
||||||
|
showTopThreeArrDets[key]
|
||||||
|
.pinswg_agentfirstname +
|
||||||
|
" " +
|
||||||
|
showTopThreeArrDets[key]
|
||||||
|
.pinswg_agentlastname}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantfirstname != null && (
|
||||||
|
<div>
|
||||||
|
<b>
|
||||||
|
{t("myportal:on-behalf-of-label")}:{" "}
|
||||||
|
</b>
|
||||||
|
{showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantfirstname +
|
||||||
|
" " +
|
||||||
|
showTopThreeArrDets[key]
|
||||||
|
.pinswg_appellantlastname}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{router.locale == "cy"
|
||||||
|
? jsonpath(
|
||||||
|
'$..[?(@.value=="' +
|
||||||
|
showTopThreeArrDets[key][
|
||||||
|
"pinswg_lpaname"
|
||||||
|
] +
|
||||||
|
'")].value_cy',
|
||||||
|
transLookup
|
||||||
|
)
|
||||||
|
: showTopThreeArrDets[key][
|
||||||
|
"pinswg_lpaname"
|
||||||
|
] || ""}
|
||||||
|
<div className="cardModuleReference">
|
||||||
|
<b>{t("myportal:date-raised")}:</b>
|
||||||
|
{" "}
|
||||||
|
{raisedDate(
|
||||||
|
showTopThreeArrDets[key].createdon
|
||||||
|
)}
|
||||||
|
</div>{" "}
|
||||||
|
</div>
|
||||||
|
<div className="">
|
||||||
|
<button
|
||||||
|
title={t(
|
||||||
|
"case:do-you-want-to-delete-case-label"
|
||||||
|
)}
|
||||||
|
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
|
||||||
|
onClick={() => {
|
||||||
|
confirm(
|
||||||
|
t(
|
||||||
|
"case:do-you-want-to-delete-case-label"
|
||||||
|
) +
|
||||||
|
showTopThreeArr[key]
|
||||||
|
.pinswg_name +
|
||||||
|
"?\n" +
|
||||||
|
t(
|
||||||
|
"case:do-you-want-to-delete-case-disclaimer-label"
|
||||||
|
)
|
||||||
|
) &&
|
||||||
|
deleteCaseItem(
|
||||||
|
props.containerID,
|
||||||
|
showTopThreeArr[key].pinswg_name
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
—
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -258,12 +273,7 @@ const AwaitingSubmissionFromBlob = (props) => {
|
|||||||
{t("myportal:awatitingsubmission-card-title")}
|
{t("myportal:awatitingsubmission-card-title")}
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<TopThreeRow key={"ttr_" + Math.floor(Math.random() * 5)} />
|
<TopThreeRow />
|
||||||
{/* <TopThree
|
|
||||||
showTopThree={props.awaitingSubmissionFromBlob}
|
|
||||||
showDetails={props.awaitingSubmissionFromBlob}
|
|
||||||
topThreeType={"awaitingSubmissionFromBlob"}
|
|
||||||
/> */}
|
|
||||||
|
|
||||||
{props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
|
{props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
|
||||||
<div className="cardVieAll">
|
<div className="cardVieAll">
|
||||||
|
|||||||
@@ -182,7 +182,8 @@ let BuildCheckSection = (props) => {
|
|||||||
props.props.accountDetails.containerID,
|
props.props.accountDetails.containerID,
|
||||||
props.appealType.caseReference.ticketnumber,
|
props.appealType.caseReference.ticketnumber,
|
||||||
router.query.appealtypes,
|
router.query.appealtypes,
|
||||||
props.appealType.fileList
|
pdfObj.filesList
|
||||||
|
// props.appealType.fileList
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user