From fc7b9a5d2c0e457b735d3febcc0106e4c2835309 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 28 Feb 2024 12:59:33 +0000 Subject: [PATCH] added in date raised on myportal cards --- components/elements/index.js | 53 ++- components/myportal.js | 27 +- .../myportal/awaitingsubmissionfromblob.js | 339 ++++++++++-------- components/myportal/topthree.js | 24 +- locales/cy/myportal.json | 1 + locales/en/myportal.json | 1 + pages/api/auth/[...nextauth].js | 4 +- 7 files changed, 267 insertions(+), 182 deletions(-) diff --git a/components/elements/index.js b/components/elements/index.js index cca33efe..b47c45eb 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -1595,7 +1595,17 @@ const RenderFileUpload = (field) => { return ( <> { const renamedAcceptedFiles = filesToUpload.map( (file) => @@ -1645,22 +1655,27 @@ const RenderFileUpload = (field) => { )} {files && Array.isArray(files) && ( )} {blobList.map((blob, i) => ( @@ -1668,7 +1683,7 @@ const RenderFileUpload = (field) => { key={blob.name + "_" + i} className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5" > -
+
{ @@ -1692,7 +1707,7 @@ const RenderFileUpload = (field) => { /> 0 && ( - - )} + {!isLPA && + props.awaitingSubmission + .awaitingSubmissionFromBlob[ + "@odata.count" + ] > 0 && ( + + )} {props.myCases.myCases["@odata.count"] > 0 && ( { const { locale } = router; const { setCurrentView } = props; - let topthreeRow = []; + let topthreeRowArr = []; let showTopThreeArr = props.awaitingSubmissionFromBlob.value; let showTopThreeArrDets = props.awaitingSubmissionFromBlob.case; + Object.keys(showTopThreeArrDets).map((key, index) => { + let createdDate = showTopThreeArrDets[key].createdon; + showTopThreeArr[key].createdDate = createdDate; + }); + + showTopThreeArr.sort(function compare(a, b) { + var dateA = new Date(a.createdDate); + var dateB = new Date(b.createdDate); + return dateB - dateA; + }); + + const raisedDate = (datePart) => { + var dateObj = new Date(datePart); + return dateObj.toLocaleString(); + }; + const deleteCaseItem = (containerID, caseID) => { let cookies = parseCookies(); console.log("sssss", containerID, caseID); @@ -52,170 +68,203 @@ const AwaitingSubmissionFromBlob = (props) => { showTopThreeArr[key].pinswg_appealcasetype ).UrlName; - topthreeRow.push( -
-
-
- {t("myportal:case-reference")}: + topthreeRowArr.push( + <> +
+
+
+ {t("myportal:temp-reference")}: - { - props.setCurrentReference({ - "currentReference": - showTopThreeArr[key].ticketnumber, + { + props.setCurrentReference({ + "currentReference": + showTopThreeArr[key].ticketnumber, - "currentType": "awaitingSubmission", + "currentType": "awaitingSubmission", - "incidentid": - showTopThreeArr[key].incidentid, + "incidentid": + showTopThreeArr[key].incidentid, - "appealType": - showTopThreeArr[key] - .pinswg_appealcasetype, - }); - }} - > - {showTopThreeArr[index].pinswg_name} - -
-
- LPA reference:{" "} - {showTopThreeArr[key].pinswg_lpaapplicationreference} -
-
- {t("myportal:appeal-type-label")}:{" "} - { - getFormCollectionByID( - showTopThreeArr[key].pinswg_appealcasetype - ).value - } -
-
- {t("myportal:case-address")}:{" "} - {_.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 - : "")} -
- {showTopThreeArrDets[key].pinswg_appellantagent != null && ( + "appealType": + showTopThreeArr[key] + .pinswg_appealcasetype, + }); + }} + > + {showTopThreeArr[index].pinswg_name} + +
- {showTopThreeArrDets[key].pinswg_appellantagent != - 846040000 && ( - {t("myportal:raised-by-label")}: - )} - {showTopThreeArrDets[key].pinswg_appellantagent != - 846040000 && - (showTopThreeArrDets[key] - .pinswg_agentcompanyname != null && - showTopThreeArrDets[key] - .pinswg_agentcompanyname + ", ") + - showTopThreeArrDets[key] - .pinswg_agentfirstname + + LPA reference:{" "} + { + showTopThreeArr[key] + .pinswg_lpaapplicationreference + } +
+
+ {t("myportal:appeal-type-label")}:{" "} + { + getFormCollectionByID( + showTopThreeArr[key].pinswg_appealcasetype + ).value + } +
+
+ {t("myportal:case-address")}:{" "} + {_.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 + : "")} +
+ {showTopThreeArrDets[key].pinswg_appellantagent != + null && ( +
+ {showTopThreeArrDets[key] + .pinswg_appellantagent != 846040000 && ( + {t("myportal:raised-by-label")}: + )} + {showTopThreeArrDets[key] + .pinswg_appellantagent != 846040000 && + (showTopThreeArrDets[key] + .pinswg_agentcompanyname != null && + showTopThreeArrDets[key] + .pinswg_agentcompanyname + ", ") + + showTopThreeArrDets[key] + .pinswg_agentfirstname + + " " + + showTopThreeArrDets[key] + .pinswg_agentlastname} +
+ )} + {showTopThreeArrDets[key].pinswg_appellantfirstname != + null && ( +
+ {t("myportal:on-behalf-of-label")}: + {showTopThreeArrDets[key] + .pinswg_appellantfirstname + " " + showTopThreeArrDets[key] - .pinswg_agentlastname} -
- )} - {showTopThreeArrDets[key].pinswg_appellantfirstname != - null && ( -
- {t("myportal:on-behalf-of-label")}: - {showTopThreeArrDets[key] - .pinswg_appellantfirstname + - " " + - showTopThreeArrDets[key] - .pinswg_appellantlastname} -
- )} - {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - showTopThreeArrDets[key]["pinswg_lpaname"] + - '")].value_cy', - transLookup - ) - : showTopThreeArrDets[key]["pinswg_lpaname"] || ""} + .pinswg_appellantlastname} +
+ )} + {router.locale == "cy" + ? jsonpath( + '$..[?(@.value=="' + + showTopThreeArrDets[key][ + "pinswg_lpaname" + ] + + '")].value_cy', + transLookup + ) + : showTopThreeArrDets[key]["pinswg_lpaname"] || ""} +
+ {t("myportal:date-raised")}: + {" "} + {raisedDate(showTopThreeArrDets[key].createdon)} +
{" "} +
+
+ +
-
- -
-
+ ); }); + const TopThreeRow = () => { + return ( +
+ {topthreeRowArr} +
+ ); + }; + return ( -
+

{t("myportal:awatitingsubmission-card-title")}

-
- {topthreeRow} - {/* + {/* */} -
+ {props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
{ let showTopThreeArr = showTopThree.value; + Object.keys(showTopThreeArr).map((key, index) => { + let createdDate = parseInt(showTopThreeArr[key].createdon); + showTopThreeArr[key].createdDate = createdDate; + }); + + showTopThreeArr.sort(function compare(a, b) { + var dateA = new Date(a.createdDate); + var dateB = new Date(b.createdDate); + return dateB - dateA; + }); + + const raisedDate = (datePart) => { + var dateObj = new Date(datePart); + return dateObj.toLocaleString(); + }; + const deleteItem = (caseID, topThreeType) => { let cookies = parseCookies(); //console.log("sssss", caseID, topThreeType); @@ -209,7 +225,6 @@ const TopThree = (props) => { ]}{" "}
- {/* {(topThreeType == "awaitingSubmission" || topThreeType == "watchedCases") && ( */}
@@ -254,7 +269,6 @@ const TopThree = (props) => { .pinswg_siteaddresstown : "")}
- {showTopThreeArr[key].pinswg_appellantagent != null && (
{showTopThreeArr[key].pinswg_appellantagent != @@ -280,7 +294,6 @@ const TopThree = (props) => { showTopThreeArr[key].pinswg_appellantlastname}
)} - {router.locale == "cy" ? jsonpath( '$..[?(@.value=="' + @@ -300,6 +313,11 @@ const TopThree = (props) => { ) : ( "" )} +
+ {t("myportal:date-raised")}: + {" "} + {raisedDate(showTopThreeArr[key].createdon)} +
{" "}
{topThreeType == "watchedCases" && (
diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index c0ddc67e..433e964f 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -19,6 +19,7 @@ "myrepresentations-card-title": "Cyflwyniadau'r achos", "watchedcases-card-title": "Achosion a gwylio", "case-reference": "Cyfeirnod achos", + "temp-reference": "Cyfeirnod Dros Dro", "case-address": "Cyfeiriad", "case-address-not-entered": "heb ei nodi", "yourdetails-card-title": "Eich manylion", diff --git a/locales/en/myportal.json b/locales/en/myportal.json index 4484f71e..907da9a0 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -19,6 +19,7 @@ "myrepresentations-card-title": "My representations", "watchedcases-card-title": "Watched cases", "case-reference": "Case reference", + "temp-reference": "Temporary reference", "case-address": "Address", "case-address-not-entered": "not entered", "yourdetails-card-title": "Your details", diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index c4699831..40bc0fdc 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -249,7 +249,7 @@ const authOptions = (locale, req, res) => { }; }; -export default (req, res) => { +const NextAuthPEDW = (req, res) => { //console.log("----------", authOptions(req.cookies["pedw_locale"])); //console.log("----------", @@ -259,3 +259,5 @@ export default (req, res) => { authOptions(req.cookies["pedw_locale"], req, res) ); }; + +export default NextAuthPEDW;