diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index ed4cb11a..c0c03d2e 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -273,7 +273,9 @@ const DNSSearchResults = (props) => {
-
+
+ Type
+
{showSpinnerState == true ? (
@@ -301,6 +303,28 @@ const DNSSearchResults = (props) => {
);
detailsObj = detailsObj[0];
+ var appType =
+ router.locale == "cy"
+ ? jsonpath(
+ '$..[?(@.value=="' +
+ item[
+ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+ ] +
+ '")].value_cy',
+ transLookup
+ )
+ : item[
+ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+ ] || "N/A";
+
+ appType =
+ appType ==
+ "Datblygiadau o Arwyddocâd Cenedlaethol" ||
+ appType ==
+ "Developments of National Significance"
+ ? "DNS"
+ : "SIPs";
+
return (
{
)}
:
-
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
@@ -486,6 +509,15 @@ const DNSSearchResults = (props) => {
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
+
+
+ {t(
+ "search:searchresults-status-label"
+ )}
+ :
+
+ {appType}
+
{myportal == true && (
{isWatchedCase(item.incidentid)
diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js
index 10daaed3..cae27932 100644
--- a/pages/api/endpoint/getbasicdnssearch_api.js
+++ b/pages/api/endpoint/getbasicdnssearch_api.js
@@ -43,7 +43,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+ "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002)and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
//console.log(queryUrl);
diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js
index 60c321b4..8359b65a 100644
--- a/pages/api/endpoint/getbasicdnssearchpaged_api.js
+++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js
@@ -78,7 +78,7 @@ export default async function ApiProxy(req, res) {
var showNumberOfRecords = req.query.showNumberOfRecords;
var queryUrl =
- "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=" +
+ "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002) and pinswg_publishtoweb eq true&$orderby=" +
orderby +
" " +
fieldSort +
diff --git a/pages/api/endpoint/getbasicdnsurlsearch_api.js b/pages/api/endpoint/getbasicdnsurlsearch_api.js
index e7c6996e..083a97ce 100644
--- a/pages/api/endpoint/getbasicdnsurlsearch_api.js
+++ b/pages/api/endpoint/getbasicdnsurlsearch_api.js
@@ -50,9 +50,9 @@ export default async function ApiProxy(req, res) {
searchString +
"') or contains(ticketnumber, '" +
searchString +
- "')) and pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+ "')) and (pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002 ) and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
- //console.log("basic search ", queryUrl);
+ console.log("basic search ", queryUrl);
var apiResponse = _.isEmpty(req.query)
? res.status(400).json()
diff --git a/pages/api/endpoint/getdnslist_api.js b/pages/api/endpoint/getdnslist_api.js
index fa598c6f..66872103 100644
--- a/pages/api/endpoint/getdnslist_api.js
+++ b/pages/api/endpoint/getdnslist_api.js
@@ -25,7 +25,7 @@ export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
- "incidents?$select=pinswg_appealcasetype,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,statuscode,ticketnumber,title &$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+ "incidents?$select=pinswg_appealcasetype,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,statuscode,ticketnumber,title &$filter=(pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002) and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
console.log(queryUrl);