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

Merged PR 1093: added key to top three row for appeal sunbmission card

Browse Source 
added key to top three row for appeal sunbmission card

Related work items: #10521
This commit is contained in:
Robert Bond
2024-03-05 10:50:36 +00:00
parent 3ede3985b4 e99a0263af
commit 25d611b3e4
4 changed files with 201 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+4 -1
View File
@@ -65,7 +65,10 @@ AZURE_TENANT_ID = $TENANT
AZURE_CLIENT_SECRET = $CLIENT_SECRET
//AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
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://pedwtest.blob.core.windows.net
actions/index.js
+1 -3
View File
@@ -1465,7 +1465,6 @@ export const getFilesFromBlobHashed = (
) => {
return axios
.get(
BASE_URL +
"/api/file/getbloblist?container=" +
containerName +
"&casefolderID=" +
@@ -1489,7 +1488,6 @@ export const deleteBlob = async (
) => {
try {
const res = await axios.get(
BASE_URL +
"/api/file/deleteblob?container=" +
containerName +
"&casefolderID=" +
@@ -1664,7 +1662,7 @@ export const sendCaseCompleteMessage = async (containerID, caseReference) => {
return res.data;
})
.catch((error) => {
//console.log("API call error", error);
consoleLogger(error);
});
};
components/myportal/awaitingsubmissionfromblob.js
+54 -44
View File
@@ -60,23 +60,25 @@ const AwaitingSubmissionFromBlob = (props) => {
};
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]);
const TopThreeRow = () => {
return (
<div
className="cardModuleContainer"
key={"cttr_" + Math.floor(Math.random() * 5)}
>
{Object.keys(topThreeOnlyArr).map((key, index) => {
let urlname = getFormCollectionByID(
showTopThreeArr[key].pinswg_appealcasetype
).UrlName;
topthreeRowArr.push(
<>
<div className="cardModuleItem" key={index}>
return (
<div className="cardModuleItem" key={"item_" + index}>
<div className="cardModuleDetails">
<div className="cardModuleReference">
<b>{t("myportal:temp-reference")}:</b>
<Link
key={"link" + index}
href={
(router.locale == "cy"
? "/fymhorth"
@@ -88,7 +90,8 @@ const AwaitingSubmissionFromBlob = (props) => {
"_pinswg_associatedlpa_value"
] +
"&apt=" +
showTopThreeArr[key].pinswg_appealcasetype +
showTopThreeArr[key]
.pinswg_appealcasetype +
"&casereference=" +
showTopThreeArr[key].pinswg_name +
"&inid=" +
@@ -99,12 +102,15 @@ const AwaitingSubmissionFromBlob = (props) => {
onClick={() => {
props.setCurrentReference({
"currentReference":
showTopThreeArr[key].ticketnumber,
showTopThreeArr[key]
.ticketnumber,
"currentType": "awaitingSubmission",
"currentType":
"awaitingSubmission",
"incidentid":
showTopThreeArr[key].incidentid,
showTopThreeArr[key]
.incidentid,
"appealType":
showTopThreeArr[key]
@@ -126,7 +132,8 @@ const AwaitingSubmissionFromBlob = (props) => {
<b>{t("myportal:appeal-type-label")}:</b>{" "}
{
getFormCollectionByID(
showTopThreeArr[key].pinswg_appealcasetype
showTopThreeArr[key]
.pinswg_appealcasetype
).value
}
</div>
@@ -162,19 +169,25 @@ const AwaitingSubmissionFromBlob = (props) => {
.pinswg_siteaddresstown
: "")}
</div>
{showTopThreeArrDets[key].pinswg_appellantagent !=
null && (
{showTopThreeArrDets[key]
.pinswg_appellantagent != null && (
<div>
{showTopThreeArrDets[key]
.pinswg_appellantagent != 846040000 && (
<b>{t("myportal:raised-by-label")}: </b>
.pinswg_appellantagent !=
846040000 && (
<b>
{t("myportal:raised-by-label")}:{" "}
</b>
)}
{showTopThreeArrDets[key]
.pinswg_appellantagent != 846040000 &&
.pinswg_appellantagent !=
846040000 &&
(showTopThreeArrDets[key]
.pinswg_agentcompanyname != null &&
.pinswg_agentcompanyname !=
null &&
showTopThreeArrDets[key]
.pinswg_agentcompanyname + ", ") +
.pinswg_agentcompanyname +
", ") +
showTopThreeArrDets[key]
.pinswg_agentfirstname +
" " +
@@ -182,10 +195,12 @@ const AwaitingSubmissionFromBlob = (props) => {
.pinswg_agentlastname}
</div>
)}
{showTopThreeArrDets[key].pinswg_appellantfirstname !=
null && (
{showTopThreeArrDets[key]
.pinswg_appellantfirstname != null && (
<div>
<b>{t("myportal:on-behalf-of-label")}: </b>
<b>
{t("myportal:on-behalf-of-label")}:{" "}
</b>
{showTopThreeArrDets[key]
.pinswg_appellantfirstname +
" " +
@@ -202,21 +217,30 @@ const AwaitingSubmissionFromBlob = (props) => {
'")].value_cy',
transLookup
)
: showTopThreeArrDets[key]["pinswg_lpaname"] || ""}
: showTopThreeArrDets[key][
"pinswg_lpaname"
] || ""}
<div className="cardModuleReference">
<b>{t("myportal:date-raised")}:</b>
{" "}
{raisedDate(showTopThreeArrDets[key].createdon)}
{raisedDate(
showTopThreeArrDets[key].createdon
)}
</div>{" "}
</div>
<div className="">
<button
title={t("case:do-you-want-to-delete-case-label")}
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 +
t(
"case:do-you-want-to-delete-case-label"
) +
showTopThreeArr[key]
.pinswg_name +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
@@ -232,17 +256,8 @@ const AwaitingSubmissionFromBlob = (props) => {
</button>
</div>
</div>
</>
);
});
const TopThreeRow = () => {
return (
<div
className="cardModuleContainer"
key={"cttr_" + Math.floor(Math.random() * 5)}
>
{topthreeRowArr}
})}
</div>
);
};
@@ -258,12 +273,7 @@ const AwaitingSubmissionFromBlob = (props) => {
{t("myportal:awatitingsubmission-card-title")}
</h3>
<TopThreeRow key={"ttr_" + Math.floor(Math.random() * 5)} />
{/* <TopThree
showTopThree={props.awaitingSubmissionFromBlob}
showDetails={props.awaitingSubmissionFromBlob}
topThreeType={"awaitingSubmissionFromBlob"}
/> */}
<TopThreeRow />
{props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
<div className="cardVieAll">
components/newappeal/buildchecksection.js
+2 -1
View File
@@ -182,7 +182,8 @@ let BuildCheckSection = (props) => {
props.props.accountDetails.containerID,
props.appealType.caseReference.ticketnumber,
router.query.appealtypes,
props.appealType.fileList
pdfObj.filesList
// props.appealType.fileList
);
}}
>