diff --git a/actions/azurestorage.js b/actions/azurestorage.js index 0fa715b0..5db5aa22 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -673,49 +673,77 @@ export const uploadSingleFile = async ( "\n////////////////////////////" ); - let whichLocation = - files[prop][0].fieldName.indexOf("_Statement_of_Case") > 0 || - files[prop][0].fieldName.indexOf("_-_Statement_of_Case") > 0 || - files[prop][0].fieldName.indexOf("_-_Application_Form") > 0 || - files[prop][0].fieldName.indexOf("_-_Site_Ownership_Certificate") > - 0 || - files[prop][0].fieldName.indexOf("_-_Decision_Notice") > 0 || - files[prop][0].fieldName.indexOf("_-_Site_Location_Plan") > 0 || - files[prop][0].fieldName.indexOf("_-_Plans_Drawing_Documents") > - 0 || - files[prop][0].fieldName.indexOf( - "_-_Additional_Plans_Drawings_Documents" - ) > 0 || - files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") > - 0 || - files[prop][0].fieldName.indexOf( - "_-_NSB_LPA_Additional_Documents" - ) > 0 || - files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 || - files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") > - 0 || - files[prop][0].fieldName.indexOf("_-_LPA's_Registration_Letter") > - 0 || - files[prop][0].fieldName.indexOf("_-_Environmental_Statement") > - 0 || - files[prop][0].fieldName.indexOf("_-_Cost_of_Application") > 0 || - files[prop][0].fieldName.indexOf("_-_Other_Relevant_Material") > - 0 || - files[prop][0].fieldName.indexOf( - "_-_S106_Agreement_or_Unilateral_Undertaking" > 0 - ) - ? "846040000" - : files[prop][0].fieldName.indexOf("_IP_") > 0 - ? "846040005" - : files[prop][0].fieldName.indexOf("_Statement_") > 0 - ? "846040002" - : files[prop][0].fieldName.indexOf("_Questionnaire_") > 0 - ? "846040001" - : files[prop][0].fieldName.indexOf("_Comments_") > 0 - ? "846040003" - : files[prop][0].fieldName.indexOf("_Impact_") > 0 - ? "846040001" - : "846040000"; + // let whichLocation = + // files[prop][0].fieldName.indexOf("_Statement_of_Case") > 0 || + // files[prop][0].fieldName.indexOf("_-_Statement_of_Case") > 0 || + // files[prop][0].fieldName.indexOf("_-_Application_Form") > 0 || + // files[prop][0].fieldName.indexOf("_-_Site_Ownership_Certificate") > + // 0 || + // files[prop][0].fieldName.indexOf("_-_Decision_Notice") > 0 || + // files[prop][0].fieldName.indexOf("_-_Site_Location_Plan") > 0 || + // files[prop][0].fieldName.indexOf("_-_Plans_Drawing_Documents") > + // 0 || + // files[prop][0].fieldName.indexOf( + // "_-_Additional_Plans_Drawings_Documents" + // ) > 0 || + // files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") > + // 0 || + // files[prop][0].fieldName.indexOf( + // "_-_NSB_LPA_Additional_Documents" + // ) > 0 || + // files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 || + // files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") > + // 0 || + // files[prop][0].fieldName.indexOf("_-_LPA's_Registration_Letter") > + // 0 || + // files[prop][0].fieldName.indexOf("_-_Environmental_Statement") > + // 0 || + // files[prop][0].fieldName.indexOf("_-_Cost_of_Application") > 0 || + // files[prop][0].fieldName.indexOf("_-_Other_Relevant_Material") > + // 0 || + // files[prop][0].fieldName.indexOf( + // "_-_S106_Agreement_or_Unilateral_Undertaking" > 0 + // ) + // ? "846040000" + // : files[prop][0].fieldName.indexOf("_IP_") > 0 + // ? "846040005" + // : files[prop][0].fieldName.indexOf("_Statement_") > 0 + // ? "846040002" + // : files[prop][0].fieldName.indexOf("_Questionnaire_") > 0 + // ? "846040001" + // : files[prop][0].fieldName.indexOf("_Comments_") > 0 + // ? "846040003" + // : files[prop][0].fieldName.indexOf("_Impact_") > 0 + // ? "846040001" + // : "846040000"; + + const fieldName = files[prop][0].fieldName; + + // Define the patterns and corresponding values + const patternMapping = [ + { + pattern: + /_Statement_of_Case|_-_Statement_of_Case|_-_Application_Form|_-_Site_Ownership_Certificate|_-_Decision_Notice|_-_Site_Location_Plan|_-_Plans_Drawing_Documents|_-_Additional_Plans_Drawings_Documents|_-_Design_and_Access_Statement|_-_NSB_LPA_Additional_Documents|_-_LPA_Correspondence|_-_LPA_Original_Permission|_-_LPA's_Registration_Letter|_-_Environmental_Statement|_-_Cost_of_Application|_-_Other_Relevant_Material|_-_S106_Agreement_or_Unilateral_Undertaking/, + value: "846040000", + }, + { pattern: /_IP_/, value: "846040005" }, + { pattern: /_Statement_/, value: "846040002" }, + { pattern: /_Questionnaire_/, value: "846040001" }, + { pattern: /_Comments_/, value: "846040003" }, + { pattern: /_Impact_/, value: "846040001" }, + ]; + + // Find a matching pattern or fallback to default + let whichLocation = "846040000"; // Default value + + for (const { pattern, value } of patternMapping) { + if (pattern.test(fieldName)) { + whichLocation = value; + break; + } + } + + // return whichLocation; const tags = { containerid: containerName, @@ -723,6 +751,7 @@ export const uploadSingleFile = async ( documentType: files[prop][0].fieldName.split(".")[1], blobType: "RepresentationFile", ishareLocation: whichLocation, + documentLocationId: whichLocation, }; const withTags = await blockBlobClient.setTags(tags); const withMeta = await blockBlobClient.setMetadata(tags); @@ -1275,8 +1304,7 @@ export const getAllProgressBlobs = async (containerName) => { (value, index, self) => index === self.findIndex( - (t) => - t.name === value.name // Change 'id' to the property you're checking for uniqueness + (t) => t.name === value.name // Change 'id' to the property you're checking for uniqueness ) ); return unique; diff --git a/components/case/representation/index.js b/components/case/representation/index.js index f287a7b6..f4134a93 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -113,7 +113,7 @@ let MakeRepresentation = (props) => { const repDate = new Date(); let day = ("0" + repDate.getDate()).slice(-2); - let month = ("0" + repDate.getMonth() + 1).slice(-2); + let month = ("0" + (repDate.getMonth() + 1)).slice(-2); let year = repDate.getFullYear(); switch (values.representationCapacity) { diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index 9502e638..ad949d1f 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -16,7 +16,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => { let repFormData = formObj.representationForm.values; - repFormData = updateLinks(formObj); + repFormData = updateLinks(repFormData); return ( <> 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;