diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 2070e4e8..7b47aad2 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -330,7 +330,6 @@ export class HomeComponent implements OnInit { if (filter.key === this.itemType) { filter.disable = false; filter.active = true; - filter.value = 0; this.selectedFilter = filter.name; } else if (this.itemType === '') { filter.disable = false; @@ -345,6 +344,7 @@ export class HomeComponent implements OnInit { } } + async openSearchModal() { const modal = await this.modalController.create({ component: WorklistAdvancedSearchComponent, @@ -369,7 +369,12 @@ export class HomeComponent implements OnInit { this.newWorkListResponse = []; this.showFormattedData = []; this.allFormattedData = []; - this.selectedFilter = 'ALL'; + // this.selectedFilter = 'ALL'; + + if (this.itemType !== '') { + this.disableFilters(); + } + this.filters[this.currentActiveIndex].active = false; this.currentActiveIndex = 0; this.previousActiveIndex = 0;