diff --git a/.env.local b/.env.local index af89d049..566dba97 100644 --- a/.env.local +++ b/.env.local @@ -104,9 +104,12 @@ SECRET=SuperSecret AZURE_CLIENT_ID = $CLIENT_ID AZURE_TENANT_ID = $TENANT 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_CONTAINER = "pedwapplications" +AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net diff --git a/components/case/summary.js b/components/case/summary.js index 2e00fd00..a8a8f37f 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -131,6 +131,10 @@ const CaseSummary = (props) => { {getFormCollectionByID(appealTypeID) .PrimaryIdAttribute == "pinswg_dnsid" ? t("case:summary-applicantonly-label") + : getFormCollectionByID(appealTypeID) + .PrimaryIdAttribute == + "pinswg_nonvalidationid" + ? t("case:summary-appellantonly-label") : t("case:summary-applicant-label")}
diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js index e32f2076..84d515af 100644 --- a/components/case/summaryTypes/pinswg_nonvalidationid.js +++ b/components/case/summaryTypes/pinswg_nonvalidationid.js @@ -77,7 +77,7 @@ const Pinswg_nonvalidationid = (props) => { : ""}
-
+ {/*
{t("case:summary-procedure-label")}
@@ -95,7 +95,7 @@ const Pinswg_nonvalidationid = (props) => { "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] || ""} -
+
*/}
{t("case:summary-status-label")} @@ -128,12 +128,12 @@ const Pinswg_nonvalidationid = (props) => { transLookup, '$..[?(@.value=="' + detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" + "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy' ) : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" + "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" ] || t( "case:summary-no-date-entered-label" @@ -164,12 +164,12 @@ const Pinswg_nonvalidationid = (props) => { {t("case:summary-start-date-label")}
- {_.has(detailsObj, "pinswg_startdate") + {_.has(detailsObj, "pinswg_validdate") ? !_.isEmpty( - detailsObj.pinswg_startdate + detailsObj.pinswg_validdate ) ? formatDates( - detailsObj.pinswg_startdate + detailsObj.pinswg_validdate ) : t( "case:summary-no-date-entered-label" @@ -200,13 +200,13 @@ const Pinswg_nonvalidationid = (props) => {
{_.has( detailsObj, - "pinswg_casedecisiondate" + "pinswg_decisionissueddate" ) ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate + detailsObj.pinswg_decisionissueddate ) ? formatDates( - detailsObj.pinswg_casedecisiondate + detailsObj.pinswg_decisionissueddate ) : t( "case:summary-no-date-entered-label" diff --git a/locales/cy/case.json b/locales/cy/case.json index 331dc964..255a77cc 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -4,6 +4,7 @@ "summary-reference-label": "Cyfeirnod", "summary-applicant-label": "Apelydd/Ymgeisydd", "summary-applicantonly-label": "Ymgeisydd", + "summary-appellantonly-label": "Apelydd", "summary-agent-label": "Asiant", "summary-site-address-label": "Cyfeiriad y Safle", "summary-description-label": "Disgrifiad", diff --git a/locales/en/case.json b/locales/en/case.json index 8cd46f56..9226ee0d 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -4,6 +4,7 @@ "summary-reference-label": "Reference", "summary-applicant-label": "Appellant/Applicant", "summary-applicantonly-label": "Applicant", + "summary-appellantonly-label": "Appellant", "summary-agent-label": "Agent", "summary-site-address-label": "Site Address", "summary-description-label": "Description",