From efeff87e502c3167da259bc90692e8a0873cabef Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 7 Dec 2021 11:59:33 +0000 Subject: [PATCH] updated mapping --- .env.local | 20 +++++----- components/case/summaryTypes/pinswg_dnsid.js | 16 ++++---- data/lookuptranslations.json | 39 ++++++++++++++++++++ 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/.env.local b/.env.local index e89f45b1..9124fd15 100644 --- a/.env.local +++ b/.env.local @@ -17,11 +17,11 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459 //Test Oauth -CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa -CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- -RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ -RELAYURI = "test-pedw-ns.servicebus.windows.net" -RELAYPATH = "test-pedw-hc" +//CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa +//CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- +//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ +//RELAYURI = "test-pedw-ns.servicebus.windows.net" +//RELAYPATH = "test-pedw-hc" //Preprod Oauth @@ -34,11 +34,11 @@ RELAYPATH = "test-pedw-hc" //Prod Oauth -//CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2 -//CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk -//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ -//RELAYURI = "prod-pedw-ns.servicebus.windows.net" -//RELAYPATH = "prod-pedw-hc" +CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2 +CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk +RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +RELAYURI = "prod-pedw-ns.servicebus.windows.net" +RELAYPATH = "prod-pedw-hc" GOOGLE_TAG_MANAGER = GTM-T78CBC3 diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index 2602ff9b..81ff0802 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -128,12 +128,12 @@ const Pinswg_dnsid = (props) => { transLookup, '$..[?(@.value=="' + detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy' ) : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue" ] || ""} @@ -245,10 +245,7 @@ const Pinswg_dnsid = (props) => { detailsObj.pinswg_recommendation + '")].value_cy' ) - : detailsObj.pinswg_recommendation || - t( - "case:summary-no-date-entered-label" - )} + : detailsObj.pinswg_recommendation}
@@ -270,7 +267,12 @@ const Pinswg_dnsid = (props) => { target="_blank" rel="noreferrer" href={ - detailsObj.pinswg_webaddress + detailsObj.pinswg_webaddress.indexOf( + "https://" + ) + ? "https://" + + detailsObj.pinswg_webaddress + : detailsObj.pinswg_webaddress } > { diff --git a/data/lookuptranslations.json b/data/lookuptranslations.json index 45d969b7..401644b2 100644 --- a/data/lookuptranslations.json +++ b/data/lookuptranslations.json @@ -228,6 +228,23 @@ "value": "Planning permission granted", "value_cy": "Rhoddwyd caniatâd cynllunio", "pinswg_decision": 846040002 + }, + { + "value": "Approved with Conditions", + "value_cy": "Cymeradwywyd gydag Amodau", + "pinswg_decision": 846040002 + } + ], + "pinswg_recommendation": [ + { + "value": "Approved with Conditions", + "value_cy": "Cymeradwywyd gydag Amodau", + "pinswg_recommendation": 846040002 + }, + { + "value": "Dismissed", + "value_cy": "Gwrthodwyd", + "pinswg_recommendation": 846040001 } ], "pinswg_lpa": [ @@ -394,6 +411,28 @@ "pinswg_procedure": 0 } ], + "pinswg_choiceofprocedure": [ + { + "value": "Written representations only with no hearing or inquiry session(s)", + "value_cy": "Sylwadau ysgrifenedig yn unig heb unrhyw sesiwn (sesiynau) gwrandawiad nac ymholiad", + "pinswg_choiceofprocedure": 0 + }, + { + "value": "Written representations with topic specific hearing session(s)", + "value_cy": "Sylwadau ysgrifenedig gyda sesiwn (sesiynau) gwrandawiad pwnc-benodol", + "pinswg_choiceofprocedure": 0 + }, + { + "value": "Written representations with topic specific inquiry session(s)", + "value_cy": "Sylwadau ysgrifenedig gyda sesiwn (sesiynau) ymholiad pwnc-benodol", + "pinswg_choiceofprocedure": 0 + }, + { + "value": "Written representations with topic specific hearing and inquiry session(s)", + "value_cy": "Sylwadau ysgrifenedig gyda sesiwn (sesiynau) gwrandawiad ac ymholi pwnc-benodol", + "pinswg_choiceofprocedure": 0 + } + ], "pinswg_isharedocumentlocations": [ { "value": "Main Party - Pre-Submission Docs",