Fixe merge

src/app/home/home.page.ts

@@ -4,6 +4,10 @@ import { formatDate } from '@angular/common';
 import { Event } from '../models/event.model';
 import { ProcessesService } from '../services/processes.service';
 
+import { Plugins, PushNotification,PushNotificationToken,PushNotificationActionPerformed} from '@capacitor/core';
+
+const { PushNotifications } = Plugins;
+
 @Component({
   selector: 'app-home',
   templateUrl: './home.page.html',
@@ -39,8 +43,36 @@ export class HomePage implements OnInit {
     this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
       this.totalExpediente = result;
     });
-  }
 
+    (PushNotifications as any).requestPermission().then(result => {
+      PushNotifications.register();
+    });
   
+    PushNotifications.addListener(
+      'registration',
+      (token: PushNotificationToken) => {
+        /* alert('Push registration success, token: ' + token.value); */
+        console.log('FIREBASE: ', token.value)
+      },
+    );
+  
+    PushNotifications.addListener('registrationError', (error: any) => {
+      alert('Error on registration: ' + JSON.stringify(error));
+    });
+  
+    PushNotifications.addListener(
+      'pushNotificationReceived',
+      (notification: PushNotification) => {
+        alert('Push received: ' + JSON.stringify(notification));
+      },
+    );
+  
+    PushNotifications.addListener(
+      'pushNotificationActionPerformed',
+      (notification: PushNotificationActionPerformed) => {
+        alert('Push action performed: ' + JSON.stringify(notification));
+      },
+    );
+  } 
 
 }

src/app/models/chat/contact.model.ts

@@ -0,0 +1,6 @@
+export class Contact{
+    _id: string;
+    username: string;
+    name:string;
+    isChecked: boolean;
+}

src/app/pages/chat/chat-routing.module.ts

@@ -26,6 +26,10 @@ const routes: Routes = [
   },
   {
     path: 'messages',
+    loadChildren: () => import('./messages/messages.module').then( m => m.MessagesPageModule)
+  },
+  {
+    path: 'edit-group',
     loadChildren: () => import('./edit-group/edit-group.module').then( m => m.EditGroupPageModule)
   }
 

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

@@ -18,11 +18,16 @@
 </ion-header>
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
   <div class="main-content">
   <ion-toolbar >
     <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
       <ion-segment-button value="Contactos">
-        Contactos
+        Conversas
       </ion-segment-button>
       <ion-segment-button value="Grupos">
         Grupos
@@ -36,13 +41,6 @@
     <ion-list *ngSwitchCase="'Contactos'">
       <ion-item-group>
         <ion-item-sliding>
-            <!-- <ion-item *ngFor="let user of userConnectedList" (click)="openMessages()"> 
-              <ion-icon slot="start" src="assets/images/icons-chat-chat-40.svg" class="iconschatchat-40"></ion-icon>
-              <div>
-                <h3>{{user.name}}</h3>
-                <p>Podemos marcar reunião para amanha</p>
-              </div>
-            </ion-item> -->
             <div *ngFor="let dm of userDirectMessages" class="item">
               <div class="item-icon">
                 <ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
@@ -56,90 +54,35 @@
                     </span>
                     </ion-label>
                   </div>
-                  <div class="item-date">{{dm.lastMessage._updatedAt | date: 'HH:mm'}}</div>
+                  <div class="item-date">{{dm._updatedAt | date: 'HH:mm'}}</div>
                 </div>
                 <div class="item-description">
-                  <ion-label>{{dm.lastMessage.msg}}</ion-label>
+                  <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
                 </div>
               </div>
             </div>
-            <!-- <div class="item">
-              <div class="item-icon">
-                <ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
-              </div>
-              <div (click)="openMessages()" class="item-content">
-                <div class="item-title-time">
-                  <div class="item-title">
-                    <ion-label>Secretário para o sector Agricola</ion-label>
-                  </div>
-                  <div class="item-date">15:00</div>
-                </div>
-                <div class="item-description">
-                  <p>Podemos marcar reunião para amanha</p>
-                </div>
-              </div>
-            </div>
-            <div class="item">
-              <div class="item-icon">
-                <ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
-              </div>
-              <div (click)="openMessages()" class="item-content">
-                <div class="item-title-time">
-                  <div class="item-title">
-                    <ion-label>Secretário para o sector Adminstrativo</ion-label>
-                  </div>
-                  <div class="item-date">15:00</div>
-                </div>
-                <div class="item-description">
-                  <p>Podemos marcar reunião para amanha</p>
-                </div>
-              </div>
-            </div> -->
         </ion-item-sliding>
       </ion-item-group>
     </ion-list>
     <ion-list *ngSwitchCase="'Grupos'" >
       <ion-item-group>
         <ion-item-sliding>
-            <!-- <ion-item *ngFor="let group of allGroups">
-              <ion-icon slot="start" src="assets/images/icons-chat-group-chat-40.svg" class="iconschatgroup-chat-40"></ion-icon>
-              <div>
-                <h3>{{group.name}}</h3>
-                <p>Grande momento.</p>
-              </div>
-            </ion-item> -->
             <div *ngFor="let group of allGroups" class="item">
               <div class="item-icon">
                 <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
               </div>
-              <div (click)="openGroupMessages()" class="item-content">
+              <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">{{group.lastMessage._updatedAt | date: 'HH:mm'}}</div>
+                  <div class="item-date" *ngIf="group.lastMessage">{{group.lastMessage._updatedAt | date: 'HH:mm'}}</div>
                 </div>
-                <div class="item-description">
+                <div class="item-description" *ngIf="group.lastMessage">
                   <ion-label>{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}</ion-label>
                 </div>
               </div>
-            </div>
-            <!-- <div class="item">
-              <div class="item-icon">
-                <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
-              </div>
-              <div (click)="openGroupMessages()" class="item-content">
-                <div class="item-title-time">
-                  <div class="item-title">
-                    <ion-label>Secretário para o sector Produtivo</ion-label>
-                  </div>
-                  <div class="item-date">15:00</div>
-                </div>
-                <div class="item-description">
-                  <p>Podemos marcar reunião para amanha</p>
-                </div>
-              </div>
-            </div> -->    
+            </div>   
         </ion-item-sliding>
       </ion-item-group>
       

src/app/pages/chat/chat.page.ts

@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
@@ -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,22 +56,55 @@ export class ChatPage implements OnInit {
       console.log(this.loggedUser);
       
     });
-    this.doRefresh();
-    this.loadJoinedRooms();
+    this.load();
   }
-  loadJoinedRooms(){
-    this.chatService.loadJoinedRooms().subscribe(res => {
+  
+  onSegmentChange(){
+    this.load();
+  }
+  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();
+    params = params.set("types", "c");
+    this.chatService.customsRooms(params).subscribe(res=>{
       console.log(res);
     });
   }
-  onSegmentChange(){
-    this.doRefresh();
+  
+  getDirectMessages(){
+    this.showLoader = true;
+    
+    this.chatService.getAllDirectMessages().subscribe((res:any)=>{
+      console.log(res.ims);
+      
+      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);
+    });
   }
-  doRefresh(){
-    setInterval(()=>{
-      this.getDirectMessages();
-      this.getGroups();
-    }, 2000);
+  getChatMembers(){
+    this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> {
+      this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
+    });
   }
   getGroups(){
     this.showLoader = true;
@@ -78,67 +112,18 @@ export class ChatPage implements OnInit {
       this.privateGroups = res.groups;
       this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{
       this.publicGroups = res.channels;
-      this.allGroups = this.privateGroups.concat(this.publicGroups);
-      this.showLoader = false;
+      let all = this.privateGroups.concat(this.publicGroups); 
+      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);
     });
     }); 
   }
-  getDirectMessages(){
-    this.showLoader = true;
-    
-    /* this.result =  */
-    this.chatService.getAllDirectMessages().subscribe((res:any)=>{
-      console.log(res.ims);
-      
-      this.userDirectMessages = res.ims.sort((a,b)=>{
-        var dateA = new Date(a.lastMessage._updatedAt).getTime();
-        var dateB = new Date(b.lastMessage._updatedAt).getTime();
-        return dateB - dateB;
-      });
-      console.log(this.userDirectMessages);
-      
-      this.showLoader = false;
-    });
-  }
-  getChatMembers(){
-    this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> {
-      this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
-      /* console.log(res);
-      console.log(this.dmUsers); */
-    });
-  }
-  /* getConnectedChannels(){
-    this.showLoader = true;
-    
-    this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{
-      this.userChannels = res.channels;
-      console.log(res);
-
-      this.showLoader = false;
-    });
-  } */
-
-  /* getConnectedRooms(){
-    this.showLoader = true;
-    
-    this.result = this.chatService.getAllRooms().subscribe((res:any)=>{
-      this.userRooms = res.update;
-      console.log(res.update);
-
-      this.showLoader = false;
-    });
-  } */
-
-  /* getConnectedUsers(){
-    this.showLoader = true;
-
-    this.result = this.chatService.getAllConnectedUsers().subscribe((res:any)=>{
-      this.userConnectedList = res.users;
-
-      this.showLoader = false;
-    });
-  } */
-
+  
   async startConversation(selectedUser) {
     const modal = await this.modalController.create({
       component: ConversationPage,
@@ -183,13 +168,15 @@ export class ChatPage implements OnInit {
     await modal.present();
     modal.onDidDismiss();
   }
-  async openGroupMessages(user:any){
+  async openGroupMessages(room:any){
+    console.log(room);
+    
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
       cssClass: 'group-messages',
       backdropDismiss: false,
       componentProps: {
-        user: user,
+        room: room,
       },
     });
     await modal.present();

src/app/pages/chat/edit-group/edit-group-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EditGroupPage } from './edit-group.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EditGroupPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EditGroupPageRoutingModule {}

src/app/pages/chat/edit-group/edit-group.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditGroupPageRoutingModule } from './edit-group-routing.module';
+
+import { EditGroupPage } from './edit-group.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SharedModule,
+    EditGroupPageRoutingModule
+  ],
+  declarations: [EditGroupPage]
+})
+export class EditGroupPageModule {}

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

@@ -0,0 +1,40 @@
+<ion-header  class="ion-no-border">
+  <ion-toolbar class="header-toolbar">
+    <div class="main-header">
+      <div class="title-content">
+        <div class="left">
+          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        </div>
+        <div class="middle">
+          <ion-label class="title">Alterar assunto</ion-label>
+        </div>
+        <app-btn-seguinte *ngIf="groupName" (click)="changeGroupName()"></app-btn-seguinte>
+      </div>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <div class="main-content">
+    <div class="item-container">
+      <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
+    </div>
+    <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>
+
+    <div *ngIf="showDuration" class="container-div">
+      <div class="ion-item-class-2">
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-duration.svg"></ion-icon>
+        </div>
+        <div class="ion-input-class">
+          <ion-input (click)="showPicker()" [(ngModel)]="displayDuration" placeholder="Duração"></ion-input>
+        </div>
+      </div>
+    </div>
+    
+  </div>    
+</ion-content>
+

src/app/pages/chat/edit-group/edit-group.page.scss

@@ -0,0 +1,151 @@
+ion-content{
+    --background:transparent;
+}
+.header-toolbar{
+   --background:transparent;
+   --opacity: 1;
+}
+.div-top-header{
+    width: 400px;
+    margin: 0 auto;
+    background-color: #0782c9;
+    overflow: auto;
+    padding-top: 15px;
+    border: 0!important;
+
+    .div-search{
+      font-size: 45px;
+      float: left;
+      margin: 0 0 0 10px
+    }
+    .div-logo{
+      background: transparent;
+      width: 140px;
+      margin: 5px 0 0px 71px;
+      float: left;
+    }
+    .div-logo img{
+      width: 100%;
+    }
+    .div-profile{
+      font-size: 45px;
+      float: right;
+      margin-right: 10px;
+    }
+    
+  }
+  .main-header{
+    width: 100%; /* 400px */
+    height: 100%;
+    font-family: Roboto;
+    border-top-left-radius: 25px;
+    border-top-right-radius: 25px;
+    background-color: #fff;
+    overflow:hidden;
+    padding: 30px 20px 0px 20px;
+    color:#000;
+    transform: translate3d(0, 1px, 0);
+    
+    .title-content{
+      width: 360px;
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+
+      .left{
+        width: 37px;
+        float: left;
+        font-size: 35px;
+        overflow: auto;
+       }
+       .middle{
+        padding: 0!important;
+        float: left;
+        width: 221px;
+        margin: 2.5px 0 0 5px;
+      }
+      .right{
+        padding: 0!important;
+        float: right;
+        font-size: 15px;
+        color: #0782c9;
+        margin: 8px 0 0 5px;
+      }
+    }
+
+    .title{
+      font-size: 25px;
+    }
+    .div-icon{
+      width: 40px;
+      float: right;
+      font-size: 35px;
+      overflow: auto;
+      padding: 1px;
+    }
+    .div-icon ion-icon{
+      float: right;
+      padding-left: 20px;
+    }
+    
+ 
+  }
+  .main-content{
+    width: 100%; /* 400px */
+    height: 100%;
+    font-family: Roboto;
+    margin: 0 auto;
+    background-color: #fff;
+    overflow:auto;
+    padding: 15px 20px 0 20px;
+
+    .item-container{
+        width: 360px;
+        margin: 15px auto;
+        border: 1px solid #ebebeb;
+        border-radius: 5px;
+        padding-left: 10px;
+      }
+
+      .item-container-no-border{
+        display: flex;
+        width: 360px;
+        margin: 25px auto;
+        border-radius: 5px;
+        align-items: center;
+      }
+
+      .item-container-no-border ion-label{
+          padding-left: 10px;
+          font-size: 12px;
+          color: #000;
+      }
+  }
+
+  .container-div{
+    margin-bottom: 15px;
+    overflow: auto;
+
+    .ion-item-class-2{
+        width: 360px;
+        margin: 0px auto;
+
+        .ion-icon-class{
+            width: 45px;
+            height: 45px;
+            float: left;
+            padding: 10px;
+            font-size: 25px;
+          }
+      }
+      .ion-input-class{
+        width: 315px;
+        height: 45px;
+        border: 1px solid #ebebeb;
+        border-radius: 5px;
+        padding-left: 5px;
+        padding-right: 10px;
+        float: left;
+      }
+  }

src/app/pages/chat/edit-group/edit-group.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EditGroupPage } from './edit-group.page';
+
+describe('EditGroupPage', () => {
+  let component: EditGroupPage;
+  let fixture: ComponentFixture<EditGroupPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditGroupPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EditGroupPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/chat/edit-group/edit-group.page.ts

@@ -0,0 +1,169 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PickerController } from '@ionic/angular';
+import { ChatService } from 'src/app/services/chat.service';
+
+@Component({
+  selector: 'app-edit-group',
+  templateUrl: './edit-group.page.html',
+  styleUrls: ['./edit-group.page.scss'],
+})
+export class EditGroupPage implements OnInit {
+  showLoader: boolean;
+  displayDuration: any;
+  showDuration: boolean;
+  selectedDuration = ['','',''];
+  groupName:string;
+  room:any;
+
+  constructor(
+    private modalController: ModalController,
+    private pickerController: PickerController,
+    private chatService: ChatService,
+    private navParams: NavParams,
+  ) {
+    this.room = this.navParams.get('room');
+    this.groupName = this.room.name.split('-').join(' ');
+   }
+
+  ngOnInit() {
+    console.log(this.room);
+  }
+
+  close(){
+    this.modalController.dismiss();
+  }
+
+  changeGroupName(){
+    if(this.groupName.trim().length > 1){
+      let name = this.groupName.split(' ').join('-');
+      let body = {
+        "roomId": this.room._id,
+        "name": name,
+      }
+      this.chatService.renameGroup(body).subscribe(res=>{
+        this.modalController.dismiss(res['group']);
+      });
+    }
+    else{
+      console.log("Invalid name!");
+    }  
+  }
+  _ionChange(event){
+    this.showDuration = event.detail.checked;
+  }
+  async showPicker(){
+    const picker = await this.pickerController.create({
+      cssClass: '',
+      buttons: [
+          { 
+            text: 'Cancelar', role: 'cancel', cssClass: 'btn-cancel'
+          },
+          { 
+            text: 'Ok', 
+            cssClass: 'btn-cancel',
+            handler:(value:any)=>{
+              console.log('button done pressed');
+              this.selectedDuration = [
+                value.days.value,
+                value.hours.value,
+                value.minutes.value,
+              ]
+              console.log(this.selectedDuration);
+              if(value.days.value != null && value.hours.value != null && value.minutes.value != null){
+                if(value.days.value > 0){
+                  if(value.days.value == 1){
+                    if(value.hours.value == 1){
+                      this.displayDuration = value.days.value  + " day " +  
+                      value.hours.value + " hora " +
+                      value.minutes.value + " minutos";
+                    }
+                    else{
+                      this.displayDuration = value.days.value  + " days " + 
+                      value.hours.value + " horas " +
+                      value.minutes.value + " minutos";
+                    }
+                  }
+                  else{
+                    if(value.hours.value == 1){
+                      this.displayDuration = value.days.value  + " days " +  
+                      value.hours.value + " hora " +
+                      value.minutes.value + " minutos";
+                    }
+                    else{
+                      this.displayDuration = value.days.value  + " days " + 
+                      value.hours.value + " horas " +
+                      value.minutes.value + " minutos";
+                    }
+                  }
+                }
+                else{
+                  if(value.hours.value == 1){
+                    this.displayDuration = value.hours.value + " hora " +
+                    value.minutes.value + " minutos";
+                  }
+                  else{
+                    this.displayDuration = value.hours.value + " horas " +
+                    value.minutes.value + " minutos";
+                  }
+                }
+              } 
+            },
+        },
+      ],
+      columns: [
+        {
+          name: 'days',
+          prefix: 'Dias',
+          options: [
+            { text: '0', value: 0 },
+            { text: '1', value: 1 },
+            { text: '2', value: 2 },
+            { text: '3', value: 3 },
+            { text: '4', value: 4 },
+          ]
+        },
+        {
+          name: 'hours',
+          prefix: 'Horas',
+          options: [
+            { text: '0', value: 0 },
+            { text: '1', value: 1 },
+            { text: '2', value: 2 },
+            { text: '3', value: 3 },
+            { text: '4', value: 4 },
+            { text: '5', value: 5 },
+            { text: '6', value: 6 },
+            { text: '7', value: 7 },
+            { text: '8', value: 8 },
+          ]
+        },
+        {
+          name: 'minutes',
+          prefix: 'Minutos',
+          selectedIndex: 3,
+          options: [
+            { text: '0', value: 0 },
+            { text: '5', value: 5 },
+            { text: '10', value: 10 },
+            { text: '15', value: 15 },
+            { text: '20', value: 20 },
+            { text: '25', value: 25 },
+            { text: '30', value: 30 },
+            { text: '35', value: 35 },
+            { text: '45', value: 45 },
+            { text: '50', value: 50 },
+            { text: '55', value: 55 },
+          ]
+        }
+      ]
+    });
+    await picker.present();
+    picker.onDidDismiss().then(async data =>{
+      let day = await picker.getColumn('days');
+      let hour = await picker.getColumn('hours'); 
+      let minutes = await picker.getColumn('minutes');
+    });
+
+  }
+
+}

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

@@ -8,6 +8,7 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
 
 import { GroupContactsPage } from './group-contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
+import { PipesModule } from 'src/app/pipes/pipes.module';
 
 @NgModule({
   imports: [
@@ -15,6 +16,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
     FormsModule,
     IonicModule,
     SharedModule,
+    PipesModule,
     GroupContactsPageRoutingModule
   ],
   declarations: [GroupContactsPage]

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

@@ -8,13 +8,13 @@
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
         </div>
-        <app-btn-seguinte (click)="groupMessages()"></app-btn-seguinte>
+        <app-btn-seguinte (click)="createGroup()"></app-btn-seguinte>
       </div>
     </div>
   </ion-toolbar>
   <ion-toolbar class="toolbar-search">
     <div class="search">
-      <ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar por cantacto" ></ion-searchbar>
+      <ion-searchbar debounce="500" (ionChange)="onChange($event)" placeholder="Pesquisar por cantacto" ></ion-searchbar>
     </div>
   </ion-toolbar>
 </ion-header>
@@ -25,23 +25,31 @@
       <ion-refresher-content>
       </ion-refresher-content>
     </ion-refresher>
-  <div class="main-content">
     
-    <!-- <ion-list>
-      <ion-item *ngFor="let user of searchedItem">
-        {{user.name}}
-      </ion-item>
-    </ion-list> -->
+      
+      
 
-    <ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
+  <div class="main-content">
+    <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">
   
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
       </div>
 
       <div *virtualItem="let user" class="item-checkbox">
-        <ion-checkbox color="primary"></ion-checkbox>
-         <p>{{user.first}} {{user.last}}</p>
+        <ion-checkbox (ionChange)="selectedContact(user)" color="primary"></ion-checkbox>
+         <p>{{user.name}}</p>
         <ion-icon name="ellipse"></ion-icon>
       </div>
       

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

@@ -84,14 +84,28 @@
    background-color: #fff;
    overflow:auto;
    padding: 0 0 0 0;
- 
-     .item-divider{
-       background: #ebebeb;
-       font-size: 15px;
-       margin: 10px 0 10px 0;
-       padding:5px 0 5px 20px;
+
+    .members-label{
+      margin: 10px 20px 10px 20px !important;
+      /* font-size: 15px; */
+      font-weight: bold;
+    }
+
+    .members-checkbox{
+      display: flex;
+      margin: .5px 20px .5px 20px !important;
+      overflow: auto;
+      align-items: center;
+
+    }
+    
+    .item-divider{
+      background: #ebebeb;
+      font-size: 15px;
+      margin: 10px 0 10px 0;
+      padding:5px 0 5px 20px;
   
-     }
+    }
  
      .item-checkbox{
        display: flex;
@@ -101,13 +115,13 @@
  
      }
  
-     .item-checkbox ion-checkbox{
+     .item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
          --border-color: #0d89d1;
          --background-checked:#0d89d1;
          float: left;
      }
  
-     .item-checkbox p{
+     .item-checkbox p, .members-checkbox p{
          display: block;
          margin: 0 !important;
          width: 330px;
@@ -116,7 +130,7 @@
          color: #0d89d1;
          float: left;
      }
-     .item-checkbox ion-icon{
+     .item-checkbox ion-icon, .members-checkbox ion-icon{
        font-size: 10px;
        float: left;
        color:#99e47b;

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

@@ -1,6 +1,10 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
+import * as _ from 'lodash';
+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';
 
 @Component({
@@ -10,112 +14,83 @@ import { GroupMessagesPage } from '../group-messages.page';
 })
 export class GroupContactsPage implements OnInit {
   showLoader: boolean;
+  loggedUser: any;
   users = [];
 
   contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
 
   headers: HttpHeaders;
   options:any;
-
-  contacts: Contact[] = [
-    {
-      first: 'Ana',
-      last: 'Manuel',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Abdullah',
-      last: 'Hill',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Batur',
-      last: 'Oymen',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Bianca',
-      last: 'Costa',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Zaya',
-      last: 'Mary',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    },
-    {
-      first: 'Tiago',
-      last: 'Kayaya',
-      url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
-    }
-];
+  listContacts: any[];
+  contacts: any;
+  textSearch:string;
+  room:any;
+  members:any;
+  dm:any;
+  isGroupCreated:boolean;
+  groupName:string;
+  selectedUserList:any;
 
   constructor(
     private modalController: ModalController,
     private http: HttpClient,
+    private chatService: ChatService,
+    private authService: AuthService,
+    private navParams: NavParams,
   ) 
-  { 
-    this.headers = new HttpHeaders();
-    this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
-    this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
-    this.headers = this.headers.set('Accept','application/json');
-    this.headers = this.headers.set('content-type','application/json');
-        
-    
+  {
+    this.authService.userData$.subscribe((res:any)=>{
+      this.loggedUser=res;
+    });     
+    this.textSearch="";
+    this.dm=null;
+    this.room=null;
+    this.isGroupCreated = this.navParams.get('isCreated');
+    this.groupName = this.navParams.get('name');
+    this.room = this.navParams.get('room');
+    this.members = this.navParams.get('members');
   }
 
   ngOnInit() {
     this.loadUsers();
-
+    console.log(this.groupName);
+    console.log(this.isGroupCreated);
   }
 
   loadUsers(){
     this.options = { 
       headers: this.headers,
     };
-    /* this.http.get('https://randomuser.me/api/?results=100', this.options)
-    .subscribe(res => {
-      this.users = res['results'].sort((a,b) => {
-        if(a.name.first < b.name.first){
+    this.chatService.getAllUsers().subscribe((res:any)=>{
+      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;
         }
-        if(a.name.first > b.name.first){
+        if(a.name > b.name){
           return 1;
         }
         return 0;
       });
-      console.log(res);
       console.log(this.users);
-    }); */
-    this.users = this.contacts.sort((a,b) => {
-      if(a.first < b.first){
-        return -1;
-      }
-      if(a.first > b.first){
-        return 1;
-      }
-      return 0;
+      
+      this.showLoader = false;
     });
   }
 
   separateLetter(record, recordIndex, records){
-    /* if(recordIndex == 0){
-      return record.name.first[0];
-    }
-
-    let first_prev = records[recordIndex - 1].name.first[0];
-    let first_current = record.name.first[0];
-
-    if(first_prev != first_current){
-      return first_current;
-    }
-    return null; */
     if(recordIndex == 0){
-      return record.first[0];
+      return record.name[0];
     }
 
-    let first_prev = records[recordIndex - 1].first[0];
-    let first_current = record.first[0];
+    let first_prev = records[recordIndex - 1].name[0];
+    let first_current = record.name[0];
 
     if(first_prev != first_current){
       return first_current;
@@ -126,26 +101,110 @@ export class GroupContactsPage implements OnInit {
   doRefresh(event){
 
   }
-  close(){
+
+  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;
   }
   clicked(){
     console.log('clicked');
     
   }
-  async groupMessages(){
+  selectedContact(user:any){
+  /*   this.groupName = this.room.name; */
+    user.isChecked = !user.isChecked;
+  
+
+  }
+  addContacts(room:any){
+    console.log(room);
+    this.selectedUserList = this.users.filter(function(contact) {
+      return contact.isChecked == true;
+    });
+    console.log( this.selectedUserList);
+    this.selectedUserList.forEach(user=>{
+      let body ={
+        "roomId":room._id,
+        "userId":user._id,
+        
+      }
+      this.chatService.addUserToGroup(body).subscribe(res=>{
+        console.log(res['success']);
+      }); 
+    });
+  }
+
+  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{
+      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,
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openGroupMessages(room:any){
+    this.close();
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
-      componentProps: {}, 
-      cssClass: 'contacts',
+      componentProps: {
+        room: room,
+      }, 
+      cssClass: 'group-messages',
       backdropDismiss: false
     });
 
     await modal.present();
-
     modal.onDidDismiss();
   }
 

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

@@ -4,19 +4,19 @@
       <div class="header-top">
         <app-btn-modal-dismiss></app-btn-modal-dismiss>
         <div class="middle">
-          <ion-label class="title">Grupo de Trabalho A</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>
         </div>  
       </div>
-      <div class="header-bottom">
+      <div (click)="addContacts()" class="header-bottom">
         <div class="header-bottom-icon">
-          <ion-icon (click)="addContacts()" src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts">
-          <ion-label *ngFor="let contact of contacts" >
-            {{contact}}
+          <ion-label *ngFor="let member of members" >
+            {{member.name}},
           </ion-label>
         </div>
       </div>
@@ -26,65 +26,27 @@
 
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
   <div class="welcome-text">
     <ion-label>Esta conversa passou a grupo</ion-label><br />
     <ion-label>A conversa original mantêm-se como chat individual</ion-label>
   </div>
-  <div class="messages">
-    <div class="incoming">
+  <div *ngFor="let msg of messages" class="messages">
+    <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
       <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
+        <ion-label>{{msg.u.name}}</ion-label>
+        <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
       </div>
       <div>
-        <img src='assets/images/1.jpg' tappable>
-        <ion-label hidden >Investidura Filipe Nyusi</ion-label>
+        <ion-label>{{msg.msg}}</ion-label>
       </div>
     </div>
-    <div class="incoming">
-      <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república</ion-label>
-      </div>
-    </div>
-    <div class="incoming">
-      <div class="title">
-        <ion-label>Presidente da República</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Pois é, momentos históricos</ion-label>
-      </div>
-    </div>
-    <div class="outgoing">
-      <div class="title">
-        <ion-label>Ministro do interior</ion-label>
-        <span class="time">16:23</span>
-      </div>
-      <div>
-        <ion-label>Grande momento</ion-label>
-      </div>
-    </div>
-    <div class="incoming">
-      <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república</ion-label>
-      </div>
-    </div>
-    <div class="outgoing">
-      <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república</ion-label>
-      </div>
+    <div *ngIf="msg.t == 'r'" class="info-text">
+      <ion-label>Alterou o assunto de para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
     </div>
   </div>
 
@@ -106,7 +68,7 @@
       <ion-col size="2">
         <!-- [disabled]="message === ''" -->
         <ion-label>
-          <ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
+          <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
         </ion-label>
       </ion-col>
     </ion-row>

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

@@ -90,25 +90,37 @@
      margin: 20px 39px 25px;
      border-radius: 8px;
    }
+   .info-text{
+    /* width: 322px; */
+    width: em(422px);
+    background: #fef4c5;
+    text-align: center;
+    font-size: 13px;
+    color: #262420;
+    padding: 10px;
+    margin: 10px auto;
+    line-height: 1.2rem;
+    /* margin: 15px 0px 15px 0px; */
+    border-radius: 8px;
+   }
    .messages{
     font-size: 13px;
     font-family: Roboto;
     overflow: auto;
 
-    .incoming, .outgoing{
+    .incoming-true, .incoming-false{
       width: 305px;
        padding: 15px 20px;
        border-radius: 10px;
     }
 
-     .incoming{
+    .incoming-true{
       margin: 10px 75px 10px 20px;
        background: #ebebeb;
        float: left;
-       
        }
      }
-     .outgoing{
+     .incoming-false{
       margin: 10px 20px 10px 75px;
        background: #e4f4fe;
        float: right;

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

@@ -1,9 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AuthService } from 'src/app/services/auth.service';
+import { ChatService } from 'src/app/services/chat.service';
 import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
 import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { NewGroupPage } from '../new-group/new-group.page';
+import { GroupContactsPage } from './group-contacts/group-contacts.page';
 
 @Component({
   selector: 'app-group-messages',
@@ -11,8 +14,16 @@ import { NewGroupPage } from '../new-group/new-group.page';
   styleUrls: ['./group-messages.page.scss'],
 })
 export class GroupMessagesPage implements OnInit {
-
+  showLoader: boolean;
+  isGroupCreated:boolean;
+  loggedUser: any;
   message:any;
+  messages:any;
+  
+
+  room:any;
+  roomName:any;
+  members:any;
   contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
 
   constructor(
@@ -20,12 +31,147 @@ export class GroupMessagesPage implements OnInit {
     private modalController: ModalController,
     private actionSheetController: ActionSheetController,
     public popoverController: PopoverController,
-  ) { }
-
-  ngOnInit() {
+    private chatService: ChatService,
+    private navParams: NavParams,
+    private authService: AuthService,
+  ) {
+    this.isGroupCreated = true;
+    this.room = this.navParams.get('room');
+    this.roomName = this.room.name.split('-').join(' ');
   }
 
-  async actionSheet() {
+  ngOnInit() {
+    this.authService.userData$.subscribe((res:any)=>{
+      this.loggedUser=res;
+      console.log(this.loggedUser); 
+    });
+    this.load();
+  }
+  load(){
+    this.getGroupContacts();
+    this.loadGroupMessages();
+  }
+
+  close(){
+    this.modalController.dismiss();
+  }
+
+  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
+    else{
+      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
+    else{
+      this.chatService.getPublicGroupMessages(this.room._id).subscribe(res=>{
+        console.log(res);
+        this.messages = res['messages'].reverse();
+      });
+    }
+  }
+  sendMessage(){
+
+    let body = {
+      "message": 
+      { 
+        "rid": this.room._id, "msg": this.message 
+      }
+    }
+    
+    this.chatService.sendMessage(body).subscribe(res=> {
+      this.loadGroupMessages(); 
+    });
+    this.message = "";
+  }
+
+  async openOptions(ev: any) {
+    const popover = await this.popoverController.create({
+      component: ChatPopoverPage,
+      cssClass: 'chat-popover',
+      event: ev,
+      componentProps: {
+        room: this.room,
+      },
+      translucent: true
+    });
+    await popover.present();
+    popover.onDidDismiss().then(res=>{
+      console.log(res);
+      if(res.data){
+        this.roomName = res.data.name.split('-').join(' ');
+        console.log(this.roomName);
+        
+        this.load();
+        /* this.modalController.dismiss(); */
+      };
+      
+    });
+  }
+  async openChatOptions(ev: any) {
+    const popover = await this.popoverController.create({
+      component: ChatOptionsPopoverPage,
+      cssClass: 'chat-options-popover',
+      event: ev,
+      componentProps: {
+        room: this.room,
+      },
+      translucent: true
+    });
+    return await popover.present();
+  }
+  async addContacts(){
+    console.log(this.members);
+  
+    const modal = await this.modalController.create({
+      component: GroupContactsPage,
+      componentProps: {
+        isCreated: this.isGroupCreated,
+        room: this.room,
+        members: this.members,
+        name: this.room.name,
+      }, 
+      cssClass: 'contacts',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then(()=>{
+      this.load();
+    });
+  }
+
+  /* async actionSheet() {
     const actionSheet = await this.actionSheetController.create({
       cssClass: 'my-custom-class',
       buttons: [{
@@ -34,9 +180,10 @@ export class GroupMessagesPage implements OnInit {
           console.log('Delete clicked');
         }
       }, {
-        text: 'Alterar nome do grupo',
+        text: 'Alterar nome do grupo1',
         handler: () => {
-          console.log('Share clicked');
+          console.log('Alterar nome do grupo');
+          this.openChangeGroupName()
         }
       }, {
         text: 'Apagar o grupo',
@@ -48,37 +195,6 @@ export class GroupMessagesPage implements OnInit {
     });
     await actionSheet.present();
   }
-
-  async openOptions(ev: any) {
-    const popover = await this.popoverController.create({
-      component: ChatPopoverPage,
-      cssClass: 'chat-popover',
-      event: ev,
-      translucent: true
-    });
-    return await popover.present();
-  }
-  async openChatOptions(ev: any) {
-    const popover = await this.popoverController.create({
-      component: ChatOptionsPopoverPage,
-      cssClass: 'chat-options-popover',
-      event: ev,
-      translucent: true
-    });
-    return await popover.present();
-  }
-  async addContacts(){
-    const modal = await this.modalController.create({
-      component: ContactsPage,
-      componentProps: {}, 
-      cssClass: 'contacts',
-      backdropDismiss: false
-    });
-
-    await modal.present();
-
-    modal.onDidDismiss();
-  }
-
+ */
 
 }

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

@@ -3,9 +3,9 @@
     <div class="main-header">
       <div class="header-top">
         <app-btn-modal-dismiss></app-btn-modal-dismiss>
-        <div class="middle">
-          <ion-label class="title" *ngFor="let users of dmUsers">{{users.name}}</ion-label>
-          <span *ngIf="userPresence =='online'"><ion-icon class="user-status-online" name="ellipse"></ion-icon></span>
+        <div class="middle" *ngFor="let users of dmUsers">
+          <ion-label class="title">{{users.name}}</ion-label>
+          <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div class="right">
           <ion-icon  (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
@@ -24,6 +24,11 @@
 </ion-header>
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
   <div class="messages" #scrollMe>
     <!-- <ion-infinite-scroll position="top" threshold="25%" (ionInfinite)="loadMoreMessages($event)">
       <ion-infinite-scroll-content loadindSpiniter="crescent" loadingText="Carregando...">
@@ -49,42 +54,6 @@
         <ion-label>{{msg.msg}}</ion-label>
       </div>
     </div>
-    <!-- <div class="incoming">
-      <div class="title">
-        <ion-label>Presidente da República</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Pois é, momentos históricos</ion-label>
-      </div>
-    </div>
-    <div class="outgoing">
-      <div class="title">
-        <ion-label>Ministro do interior</ion-label>
-        <span class="time">16:23</span>
-      </div>
-      <div>
-        <ion-label>Grande momento</ion-label>
-      </div>
-    </div>
-    <div class="incoming">
-      <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república</ion-label>
-      </div>
-    </div>
-    <div class="outgoing">
-      <div class="title">
-        <ion-label>Secretário Assuntos sociais</ion-label>
-        <span class="time">14:23</span>
-      </div>
-      <div>
-        <ion-label>Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república</ion-label>
-      </div>
-    </div> -->
   </div>
 
 </ion-content>

src/app/pages/chat/messages/messages.page.scss

@@ -116,14 +116,12 @@
       width: 305px;
        padding: 15px 20px;
        border-radius: 10px;
-
     }
 
      .incoming-true{
       margin: 10px 75px 10px 20px;
        background: #ebebeb;
        float: left;
-       
        }
      }
      .incoming-false{
@@ -177,6 +175,7 @@
       align-self: center;
     }
   }
+  
  }
 
  .text-color-blue{
@@ -191,4 +190,34 @@
     color:#99e47b;
     padding-left: 10px;
  }
+ .online{
+  display: block;
+  float: left;
+  color:#99e47b;
+  padding-left: 10px;
+}
+.offline{
+ color:#cbced1;
+ display: block;
+ float: left;
+ padding-left: 10px;
+}
+.away{
+color:#ffd21f;
+display: block;
+ float: left;
+ padding-left: 10px;
+}
+.invisible{
+  color:#cbced1;
+  display: block;
+ float: left;
+ padding-left: 10px;
+}
+.busy{
+  color:#f5455c;
+  display: block;
+ float: left;
+ padding-left: 10px;
+}
  

src/app/pages/chat/messages/messages.page.ts

@@ -13,6 +13,7 @@ import { ContactsPage } from '../new-group/contacts/contacts.page';
   styleUrls: ['./messages.page.scss'],
 })
 export class MessagesPage implements OnInit, AfterViewChecked {
+  showLoader: boolean;
 
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
@@ -43,22 +44,21 @@ export class MessagesPage implements OnInit, AfterViewChecked {
       this.loggedUser=res;
       console.log(this.loggedUser); 
     });
-
-    /* console.log(this.dm); */
     
-    setInterval(()=>{
-      this.checkUserPresence();
-      this.loadMessages();
-    }, 2000);
-
+    /* setInterval(()=>{ */
+      this.load();
+    /* }, 9000); */
+    
+  }
+  load(){
+    this.loadMessages();
     this.getChatMembers();
-    
-    
   }
-  loadUser(){
-    console.log('working');
-    
+  doRefresh(ev:any){
+    this.load();
+    ev.target.complete();
   }
+  
   ngAfterViewChecked() {        
     this.scrollToBottom();
   } 
@@ -71,11 +71,6 @@ export class MessagesPage implements OnInit, AfterViewChecked {
 
   }
 
-  checkUserPresence(){
-    this.chatService.getUserPresence(this.dm.lastMessage.u._id).subscribe(res=>{
-      this.userPresence = res['presence'];
-    });
-  }
   sendMessage(){
 
     let body = {
@@ -92,16 +87,21 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   }
   
   loadMessages(){
+    this.showLoader = true;
     this.chatService.getRoomMessages(this.dm._id).subscribe(res => {
       /* console.log(res); */
       this.messages = res['messages'].reverse();
+      console.log(this.messages);
+      
     })
   }
   getChatMembers(){
+    this.showLoader = true;
     this.chatService.getMembers(this.dm._id).subscribe(res=> {
       this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
       console.log(res);
       console.log(this.dmUsers);
+      this.showLoader = false;
     });
   }
 

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>
@@ -17,9 +17,9 @@
 <ion-content>
   <div class="main-content">
     <div class="item-container">
-      <ion-input placeholder="Título"></ion-input>
+      <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.scss

@@ -149,6 +149,3 @@ ion-content{
         float: left;
       }
   }
-
-  
-  

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

@@ -1,8 +1,8 @@
 import { analyzeAndValidateNgModules } from '@angular/compiler';
 import { Component, OnInit } from '@angular/core';
-import { ModalController, PickerController, PopoverController } from '@ionic/angular';
+import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
 import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
-import { ContactsPage } from './contacts/contacts.page';
+import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
 
 @Component({
   selector: 'app-new-group',
@@ -10,17 +10,22 @@ import { ContactsPage } from './contacts/contacts.page';
   styleUrls: ['./new-group.page.scss'],
 })
 export class NewGroupPage implements OnInit {
+  isGroupCreated:boolean;
   showLoader: boolean;
   displayDuration: any;
   showDuration: boolean;
   selectedDuration = ['','',''];
+  groupName:string;
 
   constructor(
     private pickerController: PickerController,
     private popoverController: PopoverController,
-    private modalController: ModalController, 
-  ) { 
-
+    private modalController: ModalController,
+    private navParams: NavParams,
+  ) 
+  { 
+    this.isGroupCreated = false;
+    this.groupName = this.navParams.get('name');
   }
 
   ngOnInit() {
@@ -34,15 +39,23 @@ export class NewGroupPage implements OnInit {
   }
 
   async addContacts(){
+    this.close();
+
+    let name = this.groupName.split(' ').join('-');
+    console.log(name);
+    
     const modal = await this.modalController.create({
-      component: ContactsPage,
-      componentProps: {}, 
+      component: GroupContactsPage,
+      componentProps: {
+        isCreated:this.isGroupCreated,
+        name: name,
+        duration:'',
+      }, 
       cssClass: 'contacts',
       backdropDismiss: false
     });
 
     await modal.present();
-
     modal.onDidDismiss();
   }
   

src/app/pages/events/attendee-modal/attendee-modal.page.html

@@ -2,7 +2,7 @@
   <ion-toolbar>
     <ion-title>Adicionar intervenientes</ion-title>
   </ion-toolbar>
-  <ion-searchbar [(ngModel)]="searchCountryString" (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar>
+  <ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 </ion-header>
 
@@ -11,7 +11,7 @@
   <ion-list>
     <ion-item-sliding>
       <ion-item *ngFor="let attendee of contacts">
-        <ion-checkbox slot="end" [disabled]="isCheckboxDisabled" (ionChange)="selectContact(attendee)"></ion-checkbox>
+        <ion-checkbox slot="end" (ionChange)="selectContact(attendee)"></ion-checkbox><!-- [disabled]="isCheckboxDisabled" -->
         <ion-label>
           <h3>{{ attendee.Name }}</h3>
           <p>{{ attendee.EmailAddress }}</p>

src/app/pages/events/attendee-modal/attendee-modal.page.ts

@@ -22,9 +22,11 @@ export class AttendeeModalPage implements OnInit {
   }
 
   save(){
-    this.modalCtrl.dismiss(this.contacts.filter(function(contact) {
+    this.modalCtrl.dismiss(
+      this.contacts.filter(function(contact) {
       return contact.IsRequired == true;
-    }));
+    })
+    );
   }
 
   close(){

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -84,8 +84,7 @@ export class ExpedienteDetailPage implements OnInit {
     }
   }
 
-  viewDocument()
-  {
+  viewDocument(){
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
     const browser = this.iab.create(url,"_blank");
     browser.show();

src/app/pages/login/login.page.ts

@@ -22,9 +22,6 @@ export class LoginPage implements OnInit {
   password: string = environment.defaultuserpwd;
   userattempt: User;
 
-  public body = {"user": this.username,"password": this.password};
-  public postData = {"user": this.username,"password": this.password};
-
   constructor(
     private router: Router, 
     private authService: AuthService,
@@ -55,19 +52,26 @@ export class LoginPage implements OnInit {
     await alert.present();
   }
 
-  /* loginRocketChat(){
-    this.authService.loginChat(this.postData).subscribe((res: any) =>{
+  loginRocketChat(user:any){
+    
+    let postData = {
+      "user": user.username,
+      "password": user.password,
+    }
+    this.authService.loginChat(postData).subscribe((res: any) =>{
+      console.log(res.data);
       this.storageService.store(AuthConnstants.AUTH, res.data);
       console.log('Login to Rocket chat OK');
    },(error:any) =>{
       console.log('Network error');
+      this.presentAlert('Network error '+error);
     });
-  } */
+  }
     
 
  
   async Login(){
-   /*  try { */
+    try {
       //Go to our home in home/feed.
       //this.router.navigate(['/home/events']);
       if(this.validateInput()){
@@ -78,7 +82,9 @@ export class LoginPage implements OnInit {
           BasicAuthKey: ""
         }
         if (await this.authService.login(this.userattempt)){
-          /* this.loginRocketChat(); */
+          console.log(this.userattempt);
+          
+          this.loginRocketChat(this.userattempt);
           this.router.navigate(['/home/events']);
         }
         else
@@ -91,9 +97,9 @@ export class LoginPage implements OnInit {
         //this.toastService.presentToast('Preencha todos campos');
         this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
       }        
-   /*  } catch (error) {
+    } catch (error) {
       error
-      this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error);
-    } */
+      this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. ');
+    }
   }
 }

src/app/pages/search/search.module.ts

@@ -8,14 +8,14 @@ import { SearchPageRoutingModule } from './search-routing.module';
 
 import { SearchPage } from './search.page';
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
-import { TagCloudModule } from 'angular-tag-cloud-module';
+/* import { TagCloudModule } from 'angular-tag-cloud-module'; */
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    TagCloudModule,
+    /* TagCloudModule, */
     /* ComponentsModule, */
     SearchPageRoutingModule
   ],

src/app/pages/search/search.page.html

@@ -76,7 +76,7 @@
           <!-- SLIDE -->
           <ion-slides class="slide" pager="false" [options]="slideOpts">
             <ion-slide *ngFor="let category of searchCategories; index as i;">
-              <div class="button" (click)="filterDocList(category.Name)" (click)="activeCategoty(i)"[ngClass]="{'active-category': category.Active}">
+              <div class="button" (click)="filterDocList(category.Name)" (click)="activeCategoty(i)" ><!-- [ngClass]="{'active-category': category.Active}" -->
                 <p>{{ category.Name }}</p>
                 <ion-label class="label">{{ category.Qtd }}</ion-label>
               </div>

src/app/pages/search/search.page.ts

@@ -18,12 +18,12 @@ import { NgModel } from '@angular/forms';
 export class SearchPage implements OnInit {
 
   // https params
-  private searchSubject: string;
-  private searchDocumentDate: string;
-  private searchSender: string;
-  private searchOrganicEntiry: string;
-  private searchDocTypeId: string;
-  private ordinance: string;
+  searchSubject: string;
+  searchDocumentDate: string;
+  searchSender: string;
+  searchOrganicEntiry: string;
+  searchDocTypeId: string;
+  ordinance: string;
 
   searchCategories: SearchCategory[];
   showSearchDocuments: SearchDocument[];
@@ -169,7 +169,6 @@ export class SearchPage implements OnInit {
 
     await modal.present();
 
-
     modal.onDidDismiss().then((data) => {
       this.searchSender = data.data;
     });

src/app/services/auth.service.ts

@@ -28,7 +28,7 @@ export class AuthService {
     public ValidatedUser:User;
 
     async login(user: User): Promise<boolean> {
-      user.BasicAuthKey = 'Basic ' + btoa(user.domainName + '\\' + user.username + ':' + user.password); //conversão em base64 das credenciais inseridas
+      user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
 
       const options = { headers: {'Authorization': user.BasicAuthKey }};
       this.headers = this.headers.set('Authorization',user.BasicAuthKey);
@@ -41,27 +41,30 @@ export class AuthService {
       let response: any;
 
       result = await this.http.get<boolean>(service, options).toPromise();
-      this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{
+      response = await this.http.post<any>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
+      /* this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{
         this.storageService.store(AuthConnstants.USER, res);
-      });
-
+        this.ValidatedUser = user;
+        response = user;
+        console.log(user);
+      }); */
   
-
       if (result)
         {
           this.ValidatedUser = user;
-
+          this.storageService.store(AuthConnstants.USER, response);
         }
       return result;
     }
 
     logout(){
       this.ValidatedUser = null;
-
     }
 
     //Login to rocketChat server
     loginChat(postData: any):Observable<any> {
+      console.log(postData);
+      
       return this.httpService.post('login', postData);
     }
 

src/app/services/chat.service.ts

@@ -56,9 +56,7 @@ export class ChatService {
 
       });
     } */
-    getAllDirectMessages(){
-      return this.http.get(environment.apiChatUrl+'im.list', this.options);
-    }
+    
     getAllChannels(){
       return this.http.get(environment.apiChatUrl+'channels.list', this.options);
     }
@@ -69,6 +67,13 @@ export class ChatService {
     getAllRooms(){
       return this.http.get(environment.apiChatUrl+'rooms.get', this.options);
     }
+    customsRooms(params:any){
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(environment.apiChatUrl+'rooms.get', opts);
+    }
     getAllPrivateGroups(){
       return this.http.get(environment.apiChatUrl+'groups.list', this.options);
     }
@@ -79,24 +84,11 @@ export class ChatService {
     getAllConnectedUsers(){
       return this.http.get(environment.apiChatUrl+'users.presence', this.options);
     }
-    //Check whether user is online or offline
-    getUserPresence(id:any){
-
-      let params = new HttpParams();
-      params = params.set("userId", id);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
-      }
-      return this.http.get(environment.apiChatUrl+'users.getPresence', opts);
-    }
 
     //Load messages from roomId
-    loadJoinedRooms(){
+    getAllDirectMessages(){
       return this.http.get(environment.apiChatUrl+'im.list', this.options);
     }
-
     //Load messages from roomId
     getRoomMessages(roomId:any){
 
@@ -147,5 +139,82 @@ export class ChatService {
       }
       return this.http.get(environment.apiChatUrl+'im.messages', opts);
     }
+
+    /* GROUPS */
+    addGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.create', body, this.options);
+    }
+    getGroupMembers(roomId:string){
+      let params = new HttpParams();
+      let url=environment.apiChatUrl+'groups.members';
+      params = params.set("roomId", roomId);
     
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(url, opts);
+    }
+    getChannelMembers(roomId:string){
+      let params = new HttpParams();
+      let url=environment.apiChatUrl+'channels.members';
+      params = params.set("roomId", roomId);
+    
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(url, opts);
+    }
+    /* GROUP MESSAGES */
+    getPrivateGroupMessages(roomId:any){
+
+      let params = new HttpParams();
+      params = params.set("roomId", roomId);
+    
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(environment.apiChatUrl+'groups.history', opts);
+    }
+    getPublicGroupMessages(roomId:any){
+      let params = new HttpParams();
+      params = params.set("roomId", roomId);
+    
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(environment.apiChatUrl+'channels.history', opts);
+    }
+    closeGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.close', body, this.options);
+    }
+    closeChannel(body:any){
+      return this.http.post(environment.apiChatUrl+'channels.close', body, this.options);
+    }
+    deleteGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.delete', body, this.options);
+    }
+    deleteChannel(body:any){
+      return this.http.post(environment.apiChatUrl+'channels.delete', body, this.options);
+    }
+    addUserToGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.invite', body, this.options);
+    }
+    getGroupInfo(roomId:any){
+      let params = new HttpParams();
+      params = params.set("roomId", roomId);
+    
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+      return this.http.get(environment.apiChatUrl+'groups.info', opts);
+    }
+    renameGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options);
+    }
+
 }

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -1,10 +1,10 @@
 <ion-content>
   <ion-row>
     <ion-col>
-      <button class="btn-cancel" shape="round" >Sair do Grupo</button>
+      <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
     </ion-col>
     <ion-col>
-      <button class="btn-ok" shape="round" >Alterar nome do grupo</button>
+      <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
     </ion-col>
   </ion-row>
   <ion-row class="border-top">
@@ -12,7 +12,7 @@
       <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
     </ion-col>
     <ion-col>
-      <button  class="btn-delete" shape="round">Apagar grupo</button>
+      <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
     </ion-col>
   </ion-row>
 </ion-content>

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { PopoverController } from '@ionic/angular';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { EditGroupPage } from 'src/app/pages/chat/edit-group/edit-group.page';
+import { ChatService } from 'src/app/services/chat.service';
 
 @Component({
   selector: 'app-chat-popover',
@@ -7,15 +9,71 @@ import { PopoverController } from '@ionic/angular';
   styleUrls: ['./chat-popover.page.scss'],
 })
 export class ChatPopoverPage implements OnInit {
+  room:any;
 
   constructor(
     private popoverController: PopoverController,
-  ) { }
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private chatService: ChatService,
+  ) { 
+    this.room = this.navParams.get('room');
+  }
 
   ngOnInit() {
+    console.log(this.room);
+    
   }
   close(){
     this.popoverController.dismiss();
   }
 
+   //Top menu options
+   //Close
+   leaveGroup(){
+    let body = { "roomId":this.room._id, }
+    if(this.room.t === 'p'){ 
+      this.chatService.closeGroup(body).subscribe(res=>{
+        console.log(res);
+      });
+    }
+    else{ 
+      this.chatService.closeChannel(body).subscribe(res=>{
+        console.log(res);
+      });
+    }
+    this.popoverController.dismiss(true);
+  }
+  //Delete
+  deleteGroup(){
+    let body = { "roomId":this.room._id, }
+    if(this.room.t === 'p'){ 
+      this.chatService.deleteGroup(body).subscribe(res=>{
+        console.log(res);
+      });
+    }
+    else{ 
+      this.chatService.deleteChannel(body).subscribe(res=>{
+        console.log(res);
+      });
+    }
+    this.popoverController.dismiss(true);
+  }
+  async openChangeGroupName(){
+    const modal = await this.modalController.create({
+      component: EditGroupPage,
+      componentProps: {
+        room: this.room,
+      }, 
+      cssClass: 'contacts',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log(res.data);
+      this.popoverController.dismiss(res.data);
+    });
+  }
+
 }

src/environments/environment.ts

@@ -4,10 +4,12 @@
 
 export const environment = {
   production: false,
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/',
-  apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
+  apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+  /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
+  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local',
-  defaultuser: 'paulo.pinto',
+  defaultuser: 'tiago.kayaya',
   defaultuserpwd: 'tabteste@006'
 };