diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 20de2eac..35e94209 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -47,7 +47,14 @@
  • - {{value.name}} + + {{filter.title}}: + {{value.name=='true'?'Yes':'No'}} + + + {{value.name}} + diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 71264777..e8114ed5 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -24,7 +24,6 @@ import {properties} from "../../../../environments/environment"; import {AlertModal} from "../../utils/modal/alert"; import {Subscriber} from "rxjs"; import {IndexInfoService} from "../../utils/indexInfo.service"; -import { Option } from '../../sharedComponents/input/input.component'; export interface SearchForm { class: string, @@ -1508,7 +1507,7 @@ export class NewSearchPageComponent { options = this.serviceTypeOptions; } if (options) { - this.resultTypes = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Type",filterOperator:"or"}; + this.resultTypes = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', type:'checkBox', originalFilterId: "", valueIsExact: true, title: "Type",filterOperator:"or"}; for (let typeOption of Object.keys(options)) { let type = typeOption; if ( URLparams["type"] && URLparams["type"].indexOf(type)==-1 || !URLparams["type"]) { diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 0ffe75d9..a3507caa 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -53,7 +53,13 @@ (ngModelChange)="uniqueFilterChange(value)"/> - {{_formatName(value)}} + + {{value.name=='true'?'Yes':'No'}} + + + {{_formatName(value)}} + + ({{value.number|number}}) diff --git a/searchPages/searchUtils/searchHelperClasses.class.ts b/searchPages/searchUtils/searchHelperClasses.class.ts index b4debfc1..4663be5f 100644 --- a/searchPages/searchUtils/searchHelperClasses.class.ts +++ b/searchPages/searchUtils/searchHelperClasses.class.ts @@ -8,6 +8,7 @@ export class Filter{ public filterOperator: string ='or'; public valueIsExact: boolean = true; // for search table view, if value is contained or is equal with column entry public filterType: string = "checkbox"; + public type?: string = "keyword"; public radioValue?: string = ""; // public uniqueValueIdSelected: string; } diff --git a/services/servicesUtils/refineResults.class.ts b/services/servicesUtils/refineResults.class.ts index 23ff0896..29bc5fbf 100644 --- a/services/servicesUtils/refineResults.class.ts +++ b/services/servicesUtils/refineResults.class.ts @@ -15,10 +15,12 @@ export class RefineResultsUtils { for(let j=0; j