diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 5452d3de7..b5cdf3fd8 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -205,6 +205,7 @@ (openMessage)="openMessagesPage($event)" (backToChat)="backToChat($event)" (emptyTextDescriptionOpen)="emptyTextDescriptionOpen()" + (closeAllDesktopComponents)="closeAllDesktopComponents()" *ngIf="showContacts" [roomId]="roomId" [style.display]="showContacts ? 'flex' : 'none'" @@ -234,6 +235,7 @@ *ngIf="showGroupContacts" [style.display]="showGroupContacts ? 'flex' : 'none'" [roomId]="groupRoomId" class=" height-100 flex-column" + (backToChat)="backToChat($event)" > diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 13c3dcadc..5fbf7b24b 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -9,6 +9,7 @@
+ Nova Conversa
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index f9a4d7df1..34cd15c99 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -158,7 +158,7 @@ export class SearchPage implements OnInit { this.searchSubject = search; } - window['searchTriger'] = () =>{ + window['searchTriger'] = () => { this.basicSearch(); } @@ -170,8 +170,6 @@ export class SearchPage implements OnInit { const container = document.querySelector('.seach-wrapper'); - // container.setAttribute('style',`width: ${window.innerWidth}px`); - const highest= res[0].Hits; const lowest = res[res.length-1].Hits; const range = highest - lowest; @@ -263,6 +261,7 @@ export class SearchPage implements OnInit { this.showLoader = true; + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{ @@ -292,7 +291,7 @@ export class SearchPage implements OnInit { console.log(error) }); } - else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){ + else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect") { this.showLoader = true; @@ -336,7 +335,12 @@ export class SearchPage implements OnInit { this.loadWordCloud(); },error => { this.searchResult = "Registo não encontrado" - console.log(error) + + counter++; + console.log('application 8 failed', error) + if(counter ==2) { + this.showLoader = false; + } }); this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender @@ -369,8 +373,14 @@ export class SearchPage implements OnInit { this.showLoader = false; } },error => { + counter++; + + if(counter ==2) { + this.showLoader = false; + } this.searchResult = "Registo não encontrado" - console.log(error) + + console.log('application 361 failed', error); }); } else { @@ -378,7 +388,6 @@ export class SearchPage implements OnInit { this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ - res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) @@ -408,8 +417,13 @@ export class SearchPage implements OnInit { this.loadWordCloud(); },error => { + console.log('application 8 failed', error) this.searchResult = "Registo não encontrado" - console.log(error) + counter++; + + if(counter ==2){ + this.showLoader = false; + } }); this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender @@ -444,7 +458,12 @@ export class SearchPage implements OnInit { this.loadWordCloud(); },error => { this.searchResult = "Registo não encontrado" - console.log(error) + counter++; + + console.log('application 361 faield', error); + if(counter ==2){ + this.showLoader = false; + } }); } } diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 61c16a9e4..d7e662f65 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -101,6 +101,7 @@ export class ChatSystemService { async ReLoadChat() { await this.chatService.refreshtoken(); + await this.restoreUsers(); await this.getUser(); await this.restoreRooms(); await this.getAllRooms(); @@ -123,6 +124,7 @@ export class ChatSystemService { this.currentRoom = null this.users = [] + this.storage.remove('Users'); } openRoom(roomId) { @@ -152,16 +154,13 @@ export class ChatSystemService { async restoreRooms() { try { - const rooms = await this.storage.get('Rooms'); + const rooms = await this.storage.remove('Rooms'); - if(rooms) { for (let roomData of rooms.result.update) { await this.prepareRoom(roomData); } - } - } catch(e){} setTimeout(() => { @@ -170,6 +169,15 @@ export class ChatSystemService { } + async restoreUsers () { + const users = await this.storage.get('Users'); + + if(users) { + this.users = users + + } + } + async getAllRooms () { this.loadingWholeList = true const rooms = await this.RochetChatConnectorService.getRooms(); @@ -632,6 +640,7 @@ export class ChatSystemService { return 0; }); + await this.storage.set('Users',this.users); this.loadingUsers = false } diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index bb59156f7..f5e7824f7 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -7,7 +7,8 @@
- Nova Conversa + + Nova Conversas
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index a29f69254..1cf48b0bb 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -25,7 +25,8 @@ export class ContactsPage implements OnInit { @Output() openMessage:EventEmitter = new EventEmitter(); @Output() emptyTextDescriptionOpen:EventEmitter = new EventEmitter(); - @Output() backToChat:EventEmitter = new EventEmitter(); + @Output() backToChat:EventEmitter = new EventEmitter(); + @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); constructor( private modalController: ModalController, @@ -86,7 +87,12 @@ export class ContactsPage implements OnInit { } close() { - this.backToChat.emit({roomId: this.roomId}); + if(this.roomId) { + this.backToChat.emit({roomId: this.roomId}); + } else { + this.closeAllDesktopComponents.emit(); + } + } clicked() { diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index e1b8bbfa2..e5a14f2ee 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -82,7 +82,12 @@ export class NewGroupPage implements OnInit{ this.RouteService.goBack(); this.dataService.set("link", false); } else { - this.backToChat.emit({roomId: this.roomId}); + if(this.roomId) { + this.backToChat.emit({roomId: this.roomId}); + } else { + this.closeAllDesktopComponents.emit(); + } + } } diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 04a5e385e..781d71326 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -196,7 +196,14 @@ export class HeaderPage implements OnInit { } async dynamicSearch() { - window['dynamicSearch'](this.searchSubject) + + if(window['dynamicSearch']) { + window['dynamicSearch']() + } else { + setTimeout(()=>{ + this.dynamicSearch() + }, 100) + } } @@ -213,16 +220,15 @@ export class HeaderPage implements OnInit { } async basicSearch() { - window['searchTriger']() + + if(window['searchTriger']) { + window['searchTriger']() + } else { + setTimeout(()=>{ + this.basicSearch() + }, 100) + } + } - profileLabel(text) { - if (text == 'MDGPR') { - return 'MD' - } else if (text == 'PR') { - return text - } else { - return 'UN' - } - } }