save

src/app/pages/chat/chat.page.html

@@ -69,7 +69,7 @@
               <div (click)="openGroupMessages(group)" class="item-content">
                 <div class="item-title-time">
                   <div class="item-title">
-                    <ion-label>{{group.name}}</ion-label>
+                    <ion-label>{{group.name.split('-').join(' ')}}</ion-label>
                   </div>
                   <div class="item-date" *ngIf="group.lastMessage">{{group.lastMessage._updatedAt | date: 'HH:mm'}}</div>
                 </div>

src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html

@@ -30,14 +30,16 @@
       
 
   <div class="main-content">
-    <ion-label class="members-label">Contactos selecção:</ion-label>
-    <ion-list class="members-list" *ngFor="let user of members">
-      <div class="members-checkbox">
-        <ion-checkbox checked color="primary"></ion-checkbox>
-         <p>{{user.name}}</p>
-        <ion-icon name="ellipse"></ion-icon>
-      </div>
-    </ion-list>
+    <div *ngIf="members">
+      <ion-label class="members-label">Contactos selecção:</ion-label>
+      <ion-list class="members-list" *ngFor="let user of members">
+        <div class="members-checkbox">
+          <ion-checkbox checked color="primary"></ion-checkbox>
+          <p>{{user.name}}</p>
+          <ion-icon name="ellipse"></ion-icon>
+        </div>
+      </ion-list>
+    </div>
 
     <ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
   

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);
         

src/app/pages/chat/group-messages/group-messages.page.html

@@ -4,7 +4,7 @@
       <div class="header-top">
         <app-btn-modal-dismiss></app-btn-modal-dismiss>
         <div class="middle">
-          <ion-label class="title">{{room.name}}</ion-label>
+          <ion-label class="title">{{roomName}}</ion-label>
         </div>
         <div class="right">
           <ion-icon  (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>

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();
+    });
   }
 
 

src/app/pages/chat/new-group/new-group.page.html

@@ -8,7 +8,7 @@
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>
         </div>
-        <app-btn-seguinte (click)="addContacts()"></app-btn-seguinte>
+        <app-btn-seguinte *ngIf="groupName" (click)="addContacts()"></app-btn-seguinte>
       </div>
     </div>
   </ion-toolbar>
@@ -19,7 +19,7 @@
     <div class="item-container">
       <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
     </div>
-    <div class="item-container-no-border">
+    <div *ngIf="false" class="item-container-no-border">
       <ion-checkbox (ionChange)="_ionChange($event)" color="primary"></ion-checkbox>
       <ion-label>Grupo Ultra-secreto</ion-label>
     </div>

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',