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

Merged PR 963: update non val case details

Browse Source 
update non val case details

Related work items: #8044
This commit is contained in:
Robert Bond
2023-01-30 13:39:26 +00:00
parent f6d934d951 3e89c25832
commit eedc908a1b
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+3
View File
@@ -104,9 +104,12 @@ SECRET=SuperSecret
AZURE_CLIENT_ID = $CLIENT_ID AZURE_CLIENT_ID = $CLIENT_ID
AZURE_TENANT_ID = $TENANT AZURE_TENANT_ID = $TENANT
AZURE_CLIENT_SECRET = $CLIENT_SECRET AZURE_CLIENT_SECRET = $CLIENT_SECRET
AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
AZURE_PEDW_CONTAINER = "pedwapplications" AZURE_PEDW_CONTAINER = "pedwapplications"
AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net
components/case/summary.js
+4
View File
@@ -131,6 +131,10 @@ const CaseSummary = (props) => {
{getFormCollectionByID(appealTypeID) {getFormCollectionByID(appealTypeID)
.PrimaryIdAttribute == "pinswg_dnsid" .PrimaryIdAttribute == "pinswg_dnsid"
? t("case:summary-applicantonly-label") ? t("case:summary-applicantonly-label")
: getFormCollectionByID(appealTypeID)
.PrimaryIdAttribute ==
"pinswg_nonvalidationid"
? t("case:summary-appellantonly-label")
: t("case:summary-applicant-label")} : t("case:summary-applicant-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
components/case/summaryTypes/pinswg_nonvalidationid.js
+10 -10
View File
@@ -77,7 +77,7 @@ const Pinswg_nonvalidationid = (props) => {
: ""} : ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-procedure-label")} {t("case:summary-procedure-label")}
</dt> </dt>
@@ -95,7 +95,7 @@ const Pinswg_nonvalidationid = (props) => {
"pinswg_procedure@OData.Community.Display.V1.FormattedValue" "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
] || ""} ] || ""}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-status-label")} {t("case:summary-status-label")}
@@ -128,12 +128,12 @@ const Pinswg_nonvalidationid = (props) => {
transLookup, transLookup,
'$..[?(@.value=="' + '$..[?(@.value=="' +
detailsObj[ detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
] + ] +
'")].value_cy' '")].value_cy'
) )
: detailsObj[ : detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
@@ -164,12 +164,12 @@ const Pinswg_nonvalidationid = (props) => {
{t("case:summary-start-date-label")} {t("case:summary-start-date-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has(detailsObj, "pinswg_startdate") {_.has(detailsObj, "pinswg_validdate")
? !_.isEmpty( ? !_.isEmpty(
detailsObj.pinswg_startdate detailsObj.pinswg_validdate
) )
? formatDates( ? formatDates(
detailsObj.pinswg_startdate detailsObj.pinswg_validdate
) )
: t( : t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
@@ -200,13 +200,13 @@ const Pinswg_nonvalidationid = (props) => {
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has( {_.has(
detailsObj, detailsObj,
"pinswg_casedecisiondate" "pinswg_decisionissueddate"
) )
? !_.isEmpty( ? !_.isEmpty(
detailsObj.pinswg_casedecisiondate detailsObj.pinswg_decisionissueddate
) )
? formatDates( ? formatDates(
detailsObj.pinswg_casedecisiondate detailsObj.pinswg_decisionissueddate
) )
: t( : t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
locales/cy/case.json
+1
View File
@@ -4,6 +4,7 @@
"summary-reference-label": "Cyfeirnod", "summary-reference-label": "Cyfeirnod",
"summary-applicant-label": "Apelydd/Ymgeisydd", "summary-applicant-label": "Apelydd/Ymgeisydd",
"summary-applicantonly-label": "Ymgeisydd", "summary-applicantonly-label": "Ymgeisydd",
"summary-appellantonly-label": "Apelydd",
"summary-agent-label": "Asiant", "summary-agent-label": "Asiant",
"summary-site-address-label": "Cyfeiriad y Safle", "summary-site-address-label": "Cyfeiriad y Safle",
"summary-description-label": "Disgrifiad", "summary-description-label": "Disgrifiad",
locales/en/case.json
+1
View File
@@ -4,6 +4,7 @@
"summary-reference-label": "Reference", "summary-reference-label": "Reference",
"summary-applicant-label": "Appellant/Applicant", "summary-applicant-label": "Appellant/Applicant",
"summary-applicantonly-label": "Applicant", "summary-applicantonly-label": "Applicant",
"summary-appellantonly-label": "Appellant",
"summary-agent-label": "Agent", "summary-agent-label": "Agent",
"summary-site-address-label": "Site Address", "summary-site-address-label": "Site Address",
"summary-description-label": "Description", "summary-description-label": "Description",