add progress bar

This commit is contained in:
tiago.kayaya
2021-01-27 16:01:49 +01:00
parent 585f5a1fb0
commit 942eeb2bde
44 changed files with 448 additions and 510 deletions
@@ -14,6 +14,7 @@ import { GroupContactsPage } from './group-contacts/group-contacts.page';
styleUrls: ['./group-messages.page.scss'],
})
export class GroupMessagesPage implements OnInit {
showLoader: boolean;
isGroupCreated:boolean;
loggedUser: any;
message:any;
@@ -44,25 +45,30 @@ export class GroupMessagesPage implements OnInit {
this.loggedUser=res;
console.log(this.loggedUser);
});
this.doRefresh();
this.load();
}
load(){
this.getGroupContacts();
this.loadGroupMessages();
}
close(){
this.modalController.dismiss();
}
doRefresh(/* event */) {
this.getGroupContacts();
this.loadGroupMessages()
/* event.target.complete(); */
doRefresh(ev:any){
this.load();
ev.target.complete();
}
getGroupContacts(){
this.showLoader = true;
//If group is private call getGroupMembers
if(this.room.t === 'p'){
this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
console.log(res);
this.members = res['members'];
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
@@ -70,17 +76,19 @@ export class GroupMessagesPage implements OnInit {
this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
console.log(res);
this.members = res['members'];
this.showLoader = false;
});
}
}
loadGroupMessages(){
this.showLoader = true;
//If group is private call getGroupMembers
if(this.room.t === 'p'){
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res=>{
console.log(res);
let msgOnly = res['messages'].filter(data => data.t != 'au');
this.messages = msgOnly.reverse();
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
@@ -118,9 +126,13 @@ export class GroupMessagesPage implements OnInit {
});
await popover.present();
popover.onDidDismiss().then(res=>{
console.log(res);
if(res.data){
this.doRefresh();
this.modalController.dismiss();
this.roomName = res.data.name.split('-').join(' ');
console.log(this.roomName);
this.load();
/* this.modalController.dismiss(); */
};
});
@@ -155,7 +167,7 @@ export class GroupMessagesPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(()=>{
this.doRefresh();
this.load();
});
}