diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index fbf8ddb3e..c5228c5ae 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -21,10 +21,10 @@ - +
-

Secretario Assuntos Sociais

+

{{user.name}}

Podemos marcar reunião para amanha

@@ -34,10 +34,10 @@ - +
-

Viagem a Maputo

+

{{group.name}}

Grande momento.

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index b87c25260..2a42f4e6e 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; +import { ConversationPage } from './conversation/conversation.page'; @Component({ selector: 'app-chat', @@ -12,10 +14,12 @@ export class ChatPage implements OnInit { /* Set segment variable */ segment:string; groupList: any[]; + userConnectedList: any[]; result:any; constructor( private chatService: ChatService, + private modalController: ModalController, private authService: AuthService) { } ngOnInit() { @@ -23,17 +27,37 @@ export class ChatPage implements OnInit { this.authService.userData$.subscribe((res:any)=>{ this.loggedUser=res; }); - /* this.getGroups(); */ + this.getGroups(); + this.getConnectedUsers(); } onSegmentChange(){ this.RefreshEvents(); } RefreshEvents(){} - /* getGroups(){ - this.result = this.chatService.getPrivateGroups().subscribe((res:any)=>{ - this.groupList = res.users; - console.log(this.groupList); + getGroups(){ + this.result = this.chatService.getAllPrivateGroups().subscribe((res:any)=>{ + this.groupList = res.groups; + /* console.log(this.groupList); */ + }); + } + getConnectedUsers(){ + this.result = this.chatService.getAllConnectedUsers().subscribe((res:any)=>{ + this.userConnectedList = res.users; + console.log(this.userConnectedList); + + }); + } + async starConversation(selectedUser) { + const modal = await this.modalController.create({ + component: ConversationPage, + cssClass: 'conversation', + backdropDismiss: false, + componentProps: { + user: selectedUser, + } }); - } */ + await modal.present(); + modal.onDidDismiss(); + } } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 668e1ad19..fcec14651 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -25,17 +25,19 @@ export class ChatService { this.headers = this.headers.set('X-User-Id', res.userId); this.headers = this.headers.set('X-Auth-Token', res.authToken); }); - } - - getAllUsers(){ this.options = { headers: this.headers, }; - console.log(this.headers); - + } + + getAllUsers(){ + /* console.log(this.headers); */ return this.http.get(environment.apiChatUrl+'users.list', this.options); } - getPrivateGroups(){ - this.http.get(environment.apiChatUrl+'groups.list', this.options); + getAllConnectedUsers(){ + return this.http.get(environment.apiChatUrl+'users.presence', this.options); + } + getAllPrivateGroups(){ + return this.http.get(environment.apiChatUrl+'groups.list', this.options); } }