[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() {
|
||||
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;
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
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;
|
||||
}));
|
||||
}
|
||||
|
@ -1245,10 +1245,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
|
|||
if (this.customFilters) {
|
||||
for (let customFilter of this.customFilters) {
|
||||
if (customFilter.isHiddenFilter) {
|
||||
if(customFilter.customQuery){
|
||||
allFqs += "&fq=" + StringUtils.URIEncode(customFilter.customQuery);
|
||||
}else {
|
||||
allFqs += "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId)));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* if (this.quickFilter && this.entityType == "result") {
|
||||
if((URLparams[this.quickFilter.filterId] == undefined && URLparams["qf"] == undefined) || URLparams["qf"] == "true"
|
||||
|
|
|
@ -28,7 +28,8 @@ export class SearchCustomFilter{
|
|||
isHiddenFilter:boolean;
|
||||
selected: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"){
|
||||
valueId = "covid-19";
|
||||
}
|
||||
|
@ -39,6 +40,7 @@ export class SearchCustomFilter{
|
|||
this.valueId = valueId;
|
||||
this.valueName = valueName;
|
||||
this.selected = null;
|
||||
this.customQuery = customQuery;
|
||||
}
|
||||
|
||||
public getParameters(params={}){
|
||||
|
|
Loading…
Reference in New Issue