diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 916c56720..072a646cb 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -17,12 +17,13 @@ import { NewchatPage } from './newchat/newchat.page'; }) export class ChatPage implements OnInit { + showLoader: boolean; + headers: HttpHeaders; options:any; X_User_Id:any; X_Auth_Token:any; - showLoader: boolean; loggedUser: any; /* Set segment variable */ segment:string; @@ -55,18 +56,27 @@ export class ChatPage implements OnInit { console.log(this.loggedUser); }); - this.doRefresh(); + this.load(); } onSegmentChange(){ - this.doRefresh(); + this.load(); } - doRefresh(){ - /* setInterval(()=>{ */ - this.getDirectMessages(); - this.getGroups(); - /* this.customRoom(); */ - /* }, 2000); */ + doRefresh(ev:any){ + this.load(); + ev.target.complete(); + } + load(){ + switch (this.segment) + { + case "Contactos": + this.getDirectMessages(); + break; + + case "Grupos": + this.getGroups(); + break; + } } customRoom(){ let params = new HttpParams(); @@ -85,11 +95,10 @@ export class ChatPage implements OnInit { this.userDirectMessages = res.ims.sort((a,b)=>{ var dateA = new Date(a._updatedAt).getTime(); var dateB = new Date(b._updatedAt).getTime(); + this.showLoader = false; return dateB - dateA; }); console.log(this.userDirectMessages); - - this.showLoader = false; }); } getChatMembers(){ @@ -107,11 +116,10 @@ export class ChatPage implements OnInit { this.allGroups = all.sort((a,b)=>{ var dateA = new Date(a._updatedAt).getTime(); var dateB = new Date(b._updatedAt).getTime(); + this.showLoader = false; return dateB - dateA; }); console.log(this.allGroups); - - this.showLoader = false; }); }); } diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/pages/chat/edit-group/edit-group.page.html index aeb1e2f1e..70ef13159 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.html +++ b/src/app/pages/chat/edit-group/edit-group.page.html @@ -6,7 +6,7 @@