From a8a96c5a0460968687363176c20d2162e089b004 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 13 Apr 2021 10:35:43 +0100 Subject: [PATCH] Fixe search --- src/app/pages/agenda/agenda.page.ts | 1 - src/app/pages/search/search.page.ts | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index afa638ba0..11f7f0844 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -613,7 +613,6 @@ export class AgendaPage implements OnInit { this.eventSource=[]; this.eventsListPessoal= []; - this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); // loop diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index dd8f6f8cf..c4d902356 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -168,7 +168,7 @@ export class SearchPage implements OnInit { /** * @description Basic search */ - basicSearch(){ + basicSearch(){ if(window.location.pathname == '/home/agenda'){ @@ -205,9 +205,12 @@ export class SearchPage implements OnInit { this.showLoader = true; + this.searchCategories = []; + this.searchDocuments = []; + this.showSearchDocuments = []; + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ - console.log(res); res.Categories.forEach( e => { e['Active'] = false; @@ -234,14 +237,12 @@ export class SearchPage implements OnInit { this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ - console.log(res); res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - // bind respose this.sortArrayISODate(res.Documents).forEach(e => { this.searchDocuments.push(e) @@ -259,6 +260,7 @@ export class SearchPage implements OnInit { this.showLoader = false; this.loadWordCloud(); }); + } else if (window.location.pathname == '/home/publications'){ this.showLoader = true;