"acept"

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

@@ -3,14 +3,15 @@
     <div class="main-header">
       <div class="title-content width-100">
         <div class="back-icon">
-          <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color cursor-pointer" (click)="close()">
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
           </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
         </div>
-        <app-btn-seguinte (click)="createGroup()"></app-btn-seguinte>
+        <app-btn-seguinte (click)="updateGroup()"></app-btn-seguinte>
       </div>
     </div>
   </ion-toolbar>

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

@@ -68,7 +68,7 @@
      --border-radius: 5px;
      --box-shadow: none;
      overflow: auto;
-     --icon-color:#0d89d1;
+     --icon-color: var(--font-awesome);
    }
  
  }
@@ -120,14 +120,14 @@
      }
 
      .members-checkbox ion-checkbox{
-      --border-color: #0d89d1;
-      --background-checked:#0d89d1;
+      --border-color: var(--title-text-color);
+      --background-checked:var(--title-text-color);
       float: left;
   }
  
      .item-checkbox ion-checkbox{
-         --border-color: #0d89d1;
-         --background-checked:#0d89d1;
+         --border-color: var(--title-text-color);
+         --background-checked:var(--title-text-color);
          float: left;  
      }
  
@@ -137,7 +137,7 @@
          width: 330px;
          padding-left: 10px;
          font-size: 15px;
-         color: #0d89d1;
+         color: var(--title-text-color);
          float: left;
      }
      .item-checkbox ion-icon, .members-checkbox ion-icon{

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

@@ -6,6 +6,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { NewGroupPage } from '../../new-group/new-group.page';
 import { GroupMessagesPage } from '../group-messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-group-contacts',
@@ -37,6 +38,7 @@ export class GroupContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     private navParams: NavParams,
+    public ThemeService: ThemeService
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -57,42 +59,6 @@ export class GroupContactsPage implements OnInit {
     console.log(this.isGroupCreated);
   }
 
-  deleteMember(data:any){
-    let body = {
-      "roomId": this.room._id,
-      "userId": data._id,
-    }
-    console.log(body);
-    if(this.room.t == "p"){
-      this.chatService.removeGroupMember(body).subscribe(res=>{
-        console.log(res);
-        this.getMembers();
-      });
-    }
-    else if(this.room.t == "c"){
-      this.chatService.removeChannelMember(body).subscribe(res=>{
-        console.log(res);
-        this.getMembers();
-      });
-    }
-  }
-
-  getMembers(){
-    if(this.room.t == "p"){
-      this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
-        this.members = res['members'];
-        this.loadUsers();
-      });
-    }
-    else if(this.room.t == "c"){
-      this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
-        this.members = res['members'];
-        this.loadUsers();
-      });
-    }
-  }
-
-
   loadUsers(){
     this.options = {
       headers: this.headers,
@@ -119,6 +85,21 @@ export class GroupContactsPage implements OnInit {
     });
   }
 
+  getMembers(){
+    if(this.room.t == "p"){
+      this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
+        this.members = res['members'];
+        this.loadUsers();
+      });
+    }
+    else if(this.room.t == "c"){
+      this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
+        this.members = res['members'];
+        this.loadUsers();
+      });
+    }
+  }
+
   separateLetter(record, recordIndex, records){
     if(recordIndex == 0){
       return record.name[0];
@@ -133,6 +114,27 @@ export class GroupContactsPage implements OnInit {
     return null;
   }
 
+  deleteMember(data:any){
+    let body = {
+      "roomId": this.room._id,
+      "userId": data._id,
+    }
+    console.log(body);
+    if(this.room.t == "p"){
+      this.chatService.removeGroupMember(body).subscribe(res=>{
+        console.log(res);
+        this.getMembers();
+      });
+    }
+    else if(this.room.t == "c"){
+      this.chatService.removeChannelMember(body).subscribe(res=>{
+        console.log(res);
+        this.getMembers();
+      });
+    }
+  }
+
+
   doRefresh(ev){
     this.loadUsers();
     this.getMembers();
@@ -141,26 +143,8 @@ export class GroupContactsPage implements OnInit {
 
   async close(){
     this.modalController.dismiss();
-    if(this.isGroupCreated){
-      console.log('go to conversa');
-    }
-    else{
-      this.modalController.dismiss();
-      console.log('go to new group page');
-      const modal = await this.modalController.create({
-        component: NewGroupPage,
-        componentProps: {
-          name:this.groupName,
-          duration:'',
-        },
-        cssClass: 'new-group',
-        backdropDismiss: false,
-      });
-      await modal.present();
-
-    }
-
   }
+
   onChange(event){
     this.textSearch = event.detail.value;
   }
@@ -192,50 +176,21 @@ 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');
-        console.log(res['group']);
-        this.addContacts(res['group']);
-        this.openGroupMessages(res['group']);
-
-      });
-
-    }
-    else{
+  updateGroup(){
+    this.chatService.getRoomInfo(this.room._id).subscribe(room=>{
+      this.room = room['room'];
       this.addContacts(this.room);
-      this.close();
-      /* this.openGroupMessages(this.room); */
-      /* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
-        console.log(res);
-
-        this.addContacts(res['group']);
-        this.openGroupMessages(res['group']);
-      }) */
-
-    }
-  }
-
-  async newGroup(){
-    this.close();
-    const modal = await this.modalController.create({
-      component: NewGroupPage,
-      cssClass: 'new-group',
-      backdropDismiss: false,
+      this.openGroupMessages(room['room']._id);
     });
-    await modal.present();
-    modal.onDidDismiss();
   }
 
-  async openGroupMessages(room:any){
+  async openGroupMessages(roomId:any){
     this.close();
+    console.log(roomId);
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
       componentProps: {
-        room: room,
+        roomId: roomId,
       },
       cssClass: 'group-messages',
       backdropDismiss: false