14656 filtering adjust
This commit is contained in:
@@ -888,7 +888,7 @@ const DocumentDetails = (props) => {
|
|||||||
selectedOption,
|
selectedOption,
|
||||||
selectedDocumentType
|
selectedDocumentType
|
||||||
)
|
)
|
||||||
.then((data) => data)
|
// .then((data) => data)
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setDocumentDetails(data);
|
setDocumentDetails(data);
|
||||||
setShowSpinnerState(false);
|
setShowSpinnerState(false);
|
||||||
@@ -1012,7 +1012,7 @@ const DocumentDetails = (props) => {
|
|||||||
return docObj;
|
return docObj;
|
||||||
};
|
};
|
||||||
|
|
||||||
const searchDocumentResultsObj = docDetailsObj();
|
//const searchDocumentResultsObj = docDetailsObj();
|
||||||
}, [
|
}, [
|
||||||
incidentid,
|
incidentid,
|
||||||
setDocumentDetails,
|
setDocumentDetails,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ const EventsDetails = (props) => {
|
|||||||
return obj.hasOwnProperty(property) && obj[property] !== null;
|
return obj.hasOwnProperty(property) && obj[property] !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(eventsArr.length > 0);
|
//console.log(eventsArr.length > 0);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
eventsArr.length > 0 && (
|
eventsArr.length > 0 && (
|
||||||
|
|||||||
@@ -121,7 +121,12 @@ export default async function ApiProxy(req, res) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(docTypeQueryString);
|
// console.log(
|
||||||
|
// "documentType:",
|
||||||
|
// documentType,
|
||||||
|
// "docTypeQueryString:",
|
||||||
|
// docTypeQueryString
|
||||||
|
// );
|
||||||
|
|
||||||
//console.log("has this passed docuemntType:", documentType);
|
//console.log("has this passed docuemntType:", documentType);
|
||||||
//(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + )
|
//(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + )
|
||||||
@@ -140,7 +145,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
|
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
|
||||||
: "");
|
: "");
|
||||||
|
|
||||||
console.log("docu paged: ", queryUrl);
|
//console.log("docu paged 1: ", queryUrl);
|
||||||
|
|
||||||
return axios
|
return axios
|
||||||
.get(
|
.get(
|
||||||
|
|||||||
Reference in New Issue
Block a user