- Contactos selecção: - -
- -

{{user.name}}

- -
- +
+ Contactos selecção: + +
+ +

{{user.name}}

+ +
+ +
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index 2a3800dce..c1fdc3618 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -62,7 +62,13 @@ export class GroupContactsPage implements OnInit { headers: this.headers, }; this.chatService.getAllUsers().subscribe((res:any)=>{ - this.contacts = res.users.filter(f => !this.members.some(item => item._id === f._id)); + if(this.members){ + this.contacts = res.users.filter(f => !this.members.some(item => item._id === f._id)); + } + else{ + this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username); + } + this.users = this.contacts.sort((a,b) => { if(a.name < b.name){ return -1; @@ -151,6 +157,7 @@ export class GroupContactsPage implements OnInit { createGroup(){ if(!this.isGroupCreated){ + /* this.close(); */ let body = { "name":this.groupName, } this.chatService.addGroup(body).subscribe(res=>{ console.log('group created'); @@ -163,7 +170,8 @@ export class GroupContactsPage implements OnInit { } else{ this.addContacts(this.room); - this.openGroupMessages(this.room); + this.close(); + /* this.openGroupMessages(this.room); */ /* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{ console.log(res); diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 207ee50e3..55c5b7413 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -4,7 +4,7 @@
- {{room.name}} + {{roomName}}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 8c521e88b..48adf7fe6 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -21,6 +21,7 @@ export class GroupMessagesPage implements OnInit { room:any; + roomName:any; members:any; contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; @@ -35,6 +36,7 @@ export class GroupMessagesPage implements OnInit { ) { this.isGroupCreated = true; this.room = this.navParams.get('room'); + this.roomName = this.room.name.split('-').join(' '); } ngOnInit() { @@ -42,12 +44,19 @@ export class GroupMessagesPage implements OnInit { this.loggedUser=res; console.log(this.loggedUser); }); - this.getGroupContacts(); - this.loadGroupMessages() + this.doRefresh(); } + close(){ this.modalController.dismiss(); } + + doRefresh(/* event */) { + this.getGroupContacts(); + this.loadGroupMessages() + /* event.target.complete(); */ + } + getGroupContacts(){ //If group is private call getGroupMembers if(this.room.t === 'p'){ @@ -153,8 +162,7 @@ export class GroupMessagesPage implements OnInit { } async addContacts(){ console.log(this.members); - - this.close(); + const modal = await this.modalController.create({ component: GroupContactsPage, componentProps: { @@ -169,7 +177,9 @@ export class GroupMessagesPage implements OnInit { await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(()=>{ + this.doRefresh(); + }); } diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html index 8aa56b1cc..b53fdda69 100644 --- a/src/app/pages/chat/new-group/new-group.page.html +++ b/src/app/pages/chat/new-group/new-group.page.html @@ -8,7 +8,7 @@
Novo Grupo
- +
@@ -19,7 +19,7 @@
-
+
Grupo Ultra-secreto
diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index f68fa0f96..6774503b1 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -39,13 +39,16 @@ export class NewGroupPage implements OnInit { } async addContacts(){ - this.modalController.dismiss(); + this.close(); + let name = this.groupName.split(' ').join('-'); + console.log(name); + const modal = await this.modalController.create({ component: GroupContactsPage, componentProps: { isCreated:this.isGroupCreated, - name:this.groupName, + name: name, duration:'', }, cssClass: 'contacts',