From 60f04787b661fea204ea2aee1d5c690729807589 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 5 Feb 2025 11:16:48 +0000 Subject: [PATCH] portal ui enhancements --- .../myportal/awaitingsubmissionfromblob.js | 100 +++++++++--------- components/myportal/topthree.js | 95 +++++++++++++---- components/myportal/topthree_reps.js | 60 ++++++----- locales/en/myportal.json | 2 +- locales/en/search.json | 2 +- styles/sass/patterns/_card.scss | 22 +++- styles/sass/welshgov/_application.scss | 4 +- 7 files changed, 187 insertions(+), 98 deletions(-) diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index d7e3629d..f4a26c87 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -159,15 +159,47 @@ const AwaitingSubmissionFromBlob = (props) => { } )} + {!showTopThreeArr[key].hasOwnProperty( + "appealComplete" + ) && ( +
+ +
+ )} -
+
{t("myportal:lpa-reference-label")}:{" "} { showTopThreeArr[key] .pinswg_lpaapplicationreference }
-
+
{t("myportal:appeal-type-label")}:{" "} {router.locale == "cy" ? jsonpath( @@ -184,7 +216,7 @@ const AwaitingSubmissionFromBlob = (props) => { .pinswg_appealcasetype ).value || ""}
-
+
{t("myportal:case-address")}:{" "} {_.isEmpty(showTopThreeArr) ? t("myportal:case-address-not-entered") @@ -218,7 +250,7 @@ const AwaitingSubmissionFromBlob = (props) => {
{showTopThreeArr[key].pinswg_appellantagent != null && ( -
+
{showTopThreeArr[key] .pinswg_appellantagent != 846040000 && ( @@ -244,7 +276,7 @@ const AwaitingSubmissionFromBlob = (props) => { )} {showTopThreeArr[key].pinswg_appellantagent != 846040000 && ( -
+
{t("myportal:on-behalf-of-label")}:{" "} @@ -255,17 +287,21 @@ const AwaitingSubmissionFromBlob = (props) => { .pinswg_appellantlastname}
)} - {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - showTopThreeArr[key][ - "pinswg_lpaname" - ] + - '")].value_cy', - transLookup - ) - : showTopThreeArr[key]["pinswg_lpaname"] || - ""} +
+ LPA: + {router.locale == "cy" + ? jsonpath( + '$..[?(@.value=="' + + showTopThreeArr[key][ + "pinswg_lpaname" + ] + + '")].value_cy', + transLookup + ) + : showTopThreeArr[key][ + "pinswg_lpaname" + ] || ""} +
{t("myportal:date-raised")}: {" "} @@ -285,38 +321,6 @@ const AwaitingSubmissionFromBlob = (props) => {
)}
- {!showTopThreeArr[key].hasOwnProperty( - "appealComplete" - ) && ( -
- -
- )}
); })} diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js index f151fc08..6eb25afe 100644 --- a/components/myportal/topthree.js +++ b/components/myportal/topthree.js @@ -266,8 +266,64 @@ const TopThree = (props) => { ]}{" "} )} + {topThreeType == "watchedCases" && !props.myReps && ( +
+ +
+ )} + {topThreeType == "awaitingSubmission" && ( +
+ +
+ )}
-
+
{t("myportal:appeal-type-label")}:{" "} {router.locale == "cy" ? jsonpath( @@ -284,7 +340,7 @@ const TopThree = (props) => {
{/* )} */} {/* {topThreeType != "awaitingSubmission" ? ( */} -
+
{t("myportal:case-address")}:{" "} {_.isEmpty(showTopThreeArr[key]) ? t("myportal:case-address-not-entered") @@ -311,7 +367,7 @@ const TopThree = (props) => { : "")}
{showTopThreeArr[key].pinswg_appellantagent != null && ( -
+
{showTopThreeArr[key].pinswg_appellantagent != 846040000 && ( {t("myportal:raised-by-label")}: @@ -330,25 +386,28 @@ const TopThree = (props) => {
)} {showTopThreeArr[key].pinswg_appellantfirstname != null && ( -
+
{t("myportal:on-behalf-of-label")}: {showTopThreeArr[key].pinswg_appellantfirstname + " " + showTopThreeArr[key].pinswg_appellantlastname}
)} - {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - showTopThreeArr[key][ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - transLookup - ) - : showTopThreeArr[key][ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} +
+ LPA: + {router.locale == "cy" + ? jsonpath( + '$..[?(@.value=="' + + showTopThreeArr[key][ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy', + transLookup + ) + : showTopThreeArr[key][ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || ""} +
{topThreeType == "awaitingSubmission" ? (
Case Incomplete, not submitted @@ -387,7 +446,7 @@ const TopThree = (props) => {
)}
- {topThreeType == "watchedCases" && !props.myReps && ( + {/* {topThreeType == "watchedCases" && !props.myReps && (
- )} + )} */}
); }); diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js index fe9b3df3..f2249e3b 100644 --- a/components/myportal/topthree_reps.js +++ b/components/myportal/topthree_reps.js @@ -228,6 +228,41 @@ const TopThree = (props) => { {showTopThreeArr[key].pinswg_name} )} + {!showTopThreeArr[key].hasOwnProperty( + "repComplete" + ) && ( +
+ +
+ )}
{t("myportal:representation-type")}: @@ -287,31 +322,6 @@ const TopThree = (props) => {
)}
- {!showTopThreeArr[key].hasOwnProperty("repComplete") && ( -
- -
- )}
); }); diff --git a/locales/en/myportal.json b/locales/en/myportal.json index 498cfa13..9a9fe897 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -43,7 +43,7 @@ "norecords-awaiting-submissions": "You have no awaiting submissions", "on-behalf-of-label": "On behalf of", "appeal-type-label": "Appeal type", - "lpa-reference-label": "LPA reference number", + "lpa-reference-label": "LPA reference", "raised-by-label": "Raised by", "representation-id": "Representation ID", "representation-type": "Representation type", diff --git a/locales/en/search.json b/locales/en/search.json index 067bc5f5..67febd36 100644 --- a/locales/en/search.json +++ b/locales/en/search.json @@ -8,7 +8,7 @@ "county-label": "County", "postcode-label": "Postcode", "lpa-label": "Local Planning Authority", - "lpa-reference-label": "LPA reference number", + "lpa-reference-label": "LPA reference", "appealtype-label": "Select a case type", "case-status-label": "Case Status", "case-type-label": "Case type", diff --git a/styles/sass/patterns/_card.scss b/styles/sass/patterns/_card.scss index dc76952f..11bb1e31 100644 --- a/styles/sass/patterns/_card.scss +++ b/styles/sass/patterns/_card.scss @@ -9,7 +9,7 @@ margin-bottom: 2em; } -@media screen and (min-width: 600px) and (max-width: 900px) { +@media screen and (min-width: 769px) and (max-width: 900px) { .card { flex-basis: 45.99%; @@ -252,21 +252,35 @@ div.cardModuleItem:last-of-type { .cardModuleItem { display: flex; - padding: 10px 10px 10px 0; + padding: 10px 0px 10px 0; border-bottom: 1px solid lightgrey; .cardModuleDetails { - width: 95%; + width: 100%; } .cardModuleReference { display: flex; + justify-content: flex-start; + line-height: 1.5; + b { - min-width: 122px; + @media screen and (max-width: 600px) { + min-width: 120px; + margin-right: 3px; + } + + @media screen and (min-width: 769px) { + min-width: 160px; + } + margin-right: 10px; } + .deleteCase { + margin-left: auto + } } diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 6de95886..d5b997ec 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -379,7 +379,9 @@ a.longLinkBreak { } } - +.govuk-width-container { + max-width: 1000px; +} .wgForm { background: $lightgrey_offwhite;