diff --git a/searchPages/searchDataProviders.component.ts b/searchPages/searchDataProviders.component.ts index 51150238..a706e5e6 100644 --- a/searchPages/searchDataProviders.component.ts +++ b/searchPages/searchDataProviders.component.ts @@ -368,7 +368,7 @@ export class SearchDataProvidersComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, diff --git a/searchPages/searchOrganizations.component.ts b/searchPages/searchOrganizations.component.ts index f28b9f76..6ea539d4 100644 --- a/searchPages/searchOrganizations.component.ts +++ b/searchPages/searchOrganizations.component.ts @@ -347,7 +347,7 @@ export class SearchOrganizationsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, diff --git a/searchPages/searchProjects.component.ts b/searchPages/searchProjects.component.ts index 38f5f68f..0b394601 100644 --- a/searchPages/searchProjects.component.ts +++ b/searchPages/searchProjects.component.ts @@ -376,7 +376,7 @@ export class SearchProjectsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts index 11bc5b22..b3eddab7 100644 --- a/searchPages/searchResearchResults.component.ts +++ b/searchPages/searchResearchResults.component.ts @@ -535,7 +535,7 @@ export class SearchResearchResultsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; filter.countSelectedValues = oldFilter.countSelectedValues; filter.radioValue = oldFilter.radioValue; this.filters[index] = filter; diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index c797bb2c..22575dc3 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -12,10 +12,10 @@
- View all - View less + View all + View less -
+
@@ -65,7 +65,7 @@ {{value.name=='true'?'Yes':'No'}} - {{_formatName(value)}} + {{_formatName(value)}} ({{value.number|number}}) diff --git a/searchPages/searchUtils/searchFilter.component.ts b/searchPages/searchUtils/searchFilter.component.ts index 896cc360..9f33aa92 100644 --- a/searchPages/searchUtils/searchFilter.component.ts +++ b/searchPages/searchUtils/searchFilter.component.ts @@ -43,7 +43,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { @Input() actionRoute: boolean = false; @Input() quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string }; sub; - @Input() isOpen: boolean = false; + // @Input() isViewAllOpen: boolean = false; sortedValues; hasMatch: boolean = false; @@ -60,11 +60,11 @@ export class SearchFilterComponent implements OnInit, OnChanges { ngOnInit() { if(this.filterValuesNum == 0){ - this.filter.isOpen = true; + this.filter.isViewAllOpen = true; this.sortBy = "num"; } // else{ - // this.filter.isOpen = false; + // this.filter.isViewAllOpen = false; // } this.sub = this.route.queryParams.subscribe(params => { this.queryParams = Object.assign({}, params); @@ -272,7 +272,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { } toggle(event) { - this.filter.isOpen = !this.filter.isOpen; + this.filter.isViewAllOpen = !this.filter.isViewAllOpen; event.stopPropagation(); this.toggleWithoutUpdate(); } @@ -281,7 +281,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { if(this.filter.countAllValues == 0) { this.filter.countAllValues = -1; // if request failed, try again automatically if toggled again } - if(this.filter.isOpen && this.filter.countAllValues < 0) { + if(this.filter.isViewAllOpen && this.filter.countAllValues < 0) { this.onFilterToggle.emit(this.filter); } } diff --git a/searchPages/searchUtils/searchHelperClasses.class.ts b/searchPages/searchUtils/searchHelperClasses.class.ts index 01a68404..8276d0b7 100644 --- a/searchPages/searchUtils/searchHelperClasses.class.ts +++ b/searchPages/searchUtils/searchHelperClasses.class.ts @@ -12,7 +12,8 @@ export class Filter{ public radioValue?: string = ""; // public uniqueValueIdSelected: string; public countAllValues?: number = -1; // -1: not yet requested, 0: request failed, >0 OK - public isOpen?: boolean = false; + // public isOpen?: boolean = false; + public isViewAllOpen?: boolean = false; } export class Value{