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

defects for mappin of date fields

Browse Source
This commit is contained in:
robbond
2021-10-08 11:56:12 +01:00
parent fc6abd978a
commit 76422f01df
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+10 -10
View File
@@ -1,8 +1,8 @@
RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ //RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
RELAYURI = "dev-pedw-ns.servicebus.windows.net" //RELAYURI = "dev-pedw-ns.servicebus.windows.net"
RELAYPATH = "dev-pedw-hc" //RELAYPATH = "dev-pedw-hc"
SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=" //SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
SASKEYNAME = "devpedwnspolicy" //SASKEYNAME = "devpedwnspolicy"
PORT= "3000" PORT= "3000"
@@ -14,8 +14,8 @@ I18N_DOMAIN = "cymru.local"
//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru"
//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
//RELAYURI = "test-pedw-ns.servicebus.windows.net" RELAYURI = "test-pedw-ns.servicebus.windows.net"
//RELAYPATH = "test-pedw-hc" RELAYPATH = "test-pedw-hc"
//SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4=" SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4="
//SASKEYNAME = "testpedwhcpolicy" SASKEYNAME = "testpedwhcpolicy"
actions/index.js
+2 -1
View File
@@ -223,6 +223,7 @@ export const getAdvancedSearch = (token, searchString) => {
}; };
export const getBasicSearchDetails = (token, appealType, caseReference) => { export const getBasicSearchDetails = (token, appealType, caseReference) => {
//console.log("check appealtype:", appealType, caseReference);
return axios return axios
.get( .get(
WEBAPI_URL + WEBAPI_URL +
@@ -234,7 +235,7 @@ export const getBasicSearchDetails = (token, appealType, caseReference) => {
) )
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
console.log("thiserror", error); console.log("this error", error);
}); });
}; };
components/case/summary.js
+3 -3
View File
@@ -541,13 +541,13 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has( {_.has(
detailsObj, detailsObj,
"pinswg_dateoflpadecision" "pinswg_casedecisiondate"
) )
? !_.isEmpty( ? !_.isEmpty(
detailsObj.pinswg_dateoflpadecision detailsObj.pinswg_casedecisiondate
) )
? formatDates( ? formatDates(
detailsObj.pinswg_dateoflpadecision detailsObj.pinswg_casedecisiondate
) )
: t( : t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
data/collections.json
+1 -1
View File
@@ -352,7 +352,7 @@
}, },
{ {
"LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens", "LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens",
"LogicalName": "pinswg_listedbuildingconservationareaconsents7", "LogicalName": "pinswg_listedbuildingconservationareaconsent",
"PrimaryIdAttribute": "pinswg_listedbuildingandconservationareaconsenid", "PrimaryIdAttribute": "pinswg_listedbuildingandconservationareaconsenid",
"UrlName": "listedbuildingandconservationareaconsen", "UrlName": "listedbuildingandconservationareaconsen",
"MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c" "MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c"
pages/searchresults.js
+15
View File
@@ -123,9 +123,24 @@ const getSearchDetails = (token, searchResultsObj) => {
//console.log("search results", searchResultsObj); //console.log("search results", searchResultsObj);
searchResultsObj = searchResultsObj.value; searchResultsObj = searchResultsObj.value;
const detailsObj = searchResultsObj.map((searchDetail, index) => { const detailsObj = searchResultsObj.map((searchDetail, index) => {
//console.log(searchDetail);
if (searchDetail.pinswg_appealcasetype == null) { if (searchDetail.pinswg_appealcasetype == null) {
console.log(searchDetail.ticketnumber); console.log(searchDetail.ticketnumber);
} else { } 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( detailsArr.push(
getBasicSearchDetails( getBasicSearchDetails(
token, token,