Merge branch 'feature/websocket' of bitbucket.org:equilibriumito/gabinete-digital into feature/websocket

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

@@ -297,31 +297,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } */
   }
 
-  sendMessage(){
-    let body = {
-      "message":
-      {
-        "rid": this.roomId,
-        "msg": this.message,
-        /* "attachments": [{
-          "color": "#ff0000",
-          "text": "Yay for gruggy!",
-          "title": "Attachment Example",
-          "title_link": "https://youtube.com",
-          "title_link_download": false,
-          "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png",
-        }] */
-      }
-    }
-
-    this.chatService.sendMessage(body).subscribe(res=> {
-     /*  this.loadGroupMessages(); */
-     //this.getRoomInfo();
-     this.scrollingOnce = true;
-    });
+  sendMessage() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
+
   deleteMessage(msgId:string){
     let body = {
       "roomId": this.roomId,

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

@@ -2,9 +2,9 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="header-top">
-        <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{ wsChatMethodsService.getRoom(roomId).name }}</ion-label>
-          <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
+        <div class="middle">
+          <ion-label class="title">{{ wsChatMethodsService.getDmRoom(roomId).name }}</ion-label>
+          <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">