[angular-16-irish-monitor | DONE | CHANGED] Custom filters: add checks, add custom query
This commit is contained in:
parent
4c55fb252c
commit
70b7e30b70
|
@ -232,14 +232,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
|
||||||
}
|
}
|
||||||
|
|
||||||
private getPageContents() {
|
private getPageContents() {
|
||||||
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
|
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
|
||||||
this.pageContents = contents;
|
this.pageContents = contents;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private getDivContents() {
|
private getDivContents() {
|
||||||
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
|
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
|
||||||
this.divContents = contents;
|
this.divContents = contents;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
@ -1245,7 +1245,11 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
|
||||||
if (this.customFilters) {
|
if (this.customFilters) {
|
||||||
for (let customFilter of this.customFilters) {
|
for (let customFilter of this.customFilters) {
|
||||||
if (customFilter.isHiddenFilter) {
|
if (customFilter.isHiddenFilter) {
|
||||||
allFqs += "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId)));
|
if(customFilter.customQuery){
|
||||||
|
allFqs += "&fq=" + StringUtils.URIEncode(customFilter.customQuery);
|
||||||
|
}else {
|
||||||
|
allFqs += "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,8 @@ export class SearchCustomFilter{
|
||||||
isHiddenFilter:boolean;
|
isHiddenFilter:boolean;
|
||||||
selected:boolean;
|
selected:boolean;
|
||||||
showFilterMessage:boolean;
|
showFilterMessage:boolean;
|
||||||
constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string, showFilterMessage:boolean = true ){
|
customQuery:string;
|
||||||
|
constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string, showFilterMessage:boolean = true, customQuery = null ){
|
||||||
if(valueId == "test" && properties.environment == "development"){
|
if(valueId == "test" && properties.environment == "development"){
|
||||||
valueId = "covid-19";
|
valueId = "covid-19";
|
||||||
}
|
}
|
||||||
|
@ -39,6 +40,7 @@ export class SearchCustomFilter{
|
||||||
this.valueId = valueId;
|
this.valueId = valueId;
|
||||||
this.valueName = valueName;
|
this.valueName = valueName;
|
||||||
this.selected = null;
|
this.selected = null;
|
||||||
|
this.customQuery = customQuery;
|
||||||
}
|
}
|
||||||
|
|
||||||
public getParameters(params={}){
|
public getParameters(params={}){
|
||||||
|
|
Loading…
Reference in New Issue