From 76422f01df4e17d4f8d514e288084cce67bcfb74 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 8 Oct 2021 11:56:12 +0100 Subject: [PATCH] defects for mappin of date fields --- .env.local | 20 ++++++++++---------- actions/index.js | 3 ++- components/case/summary.js | 6 +++--- data/collections.json | 2 +- pages/searchresults.js | 15 +++++++++++++++ 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.env.local b/.env.local index 74e6fb27..4600c635 100644 --- a/.env.local +++ b/.env.local @@ -1,8 +1,8 @@ -RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ -RELAYURI = "dev-pedw-ns.servicebus.windows.net" -RELAYPATH = "dev-pedw-hc" -SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=" -SASKEYNAME = "devpedwnspolicy" +//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ +//RELAYURI = "dev-pedw-ns.servicebus.windows.net" +//RELAYPATH = "dev-pedw-hc" +//SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=" +//SASKEYNAME = "devpedwnspolicy" PORT= "3000" @@ -14,8 +14,8 @@ I18N_DOMAIN = "cymru.local" //I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" -//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ -//RELAYURI = "test-pedw-ns.servicebus.windows.net" -//RELAYPATH = "test-pedw-hc" -//SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4=" -//SASKEYNAME = "testpedwhcpolicy" +RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ +RELAYURI = "test-pedw-ns.servicebus.windows.net" +RELAYPATH = "test-pedw-hc" +SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4=" +SASKEYNAME = "testpedwhcpolicy" diff --git a/actions/index.js b/actions/index.js index 6925cf69..6343eb0d 100644 --- a/actions/index.js +++ b/actions/index.js @@ -223,6 +223,7 @@ export const getAdvancedSearch = (token, searchString) => { }; export const getBasicSearchDetails = (token, appealType, caseReference) => { + //console.log("check appealtype:", appealType, caseReference); return axios .get( WEBAPI_URL + @@ -234,7 +235,7 @@ export const getBasicSearchDetails = (token, appealType, caseReference) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("this error", error); }); }; diff --git a/components/case/summary.js b/components/case/summary.js index 27de4e8e..b5421159 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -541,13 +541,13 @@ const CaseSummary = (props) => {
{_.has( detailsObj, - "pinswg_dateoflpadecision" + "pinswg_casedecisiondate" ) ? !_.isEmpty( - detailsObj.pinswg_dateoflpadecision + detailsObj.pinswg_casedecisiondate ) ? formatDates( - detailsObj.pinswg_dateoflpadecision + detailsObj.pinswg_casedecisiondate ) : t( "case:summary-no-date-entered-label" diff --git a/data/collections.json b/data/collections.json index d4059743..4ce9e8ea 100644 --- a/data/collections.json +++ b/data/collections.json @@ -352,7 +352,7 @@ }, { "LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens", - "LogicalName": "pinswg_listedbuildingconservationareaconsents7", + "LogicalName": "pinswg_listedbuildingconservationareaconsent", "PrimaryIdAttribute": "pinswg_listedbuildingandconservationareaconsenid", "UrlName": "listedbuildingandconservationareaconsen", "MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c" diff --git a/pages/searchresults.js b/pages/searchresults.js index ef0cd531..dcf34598 100644 --- a/pages/searchresults.js +++ b/pages/searchresults.js @@ -123,9 +123,24 @@ const getSearchDetails = (token, searchResultsObj) => { //console.log("search results", searchResultsObj); searchResultsObj = searchResultsObj.value; const detailsObj = searchResultsObj.map((searchDetail, index) => { + //console.log(searchDetail); if (searchDetail.pinswg_appealcasetype == null) { console.log(searchDetail.ticketnumber); } else { + // console.log( + // "appealtype collection name", + // searchDetail[ + // "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + // ], + // "pinswg_" + + // searchDetail[ + // "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + // ] + // .replace(/(\band|[\s\-\+\(\)\,\&])/g, "") + // .toLowerCase() + // .slice(0, 39), + // searchDetail.ticketnumber + // ); detailsArr.push( getBasicSearchDetails( token,