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

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

@@ -48,7 +48,7 @@
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-sliding>
               <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
-                *ngFor="let room of ChatServiceGPR.individual | keyvalue"
+                *ngFor="let room of wsChatService.individual | keyvalue"
                 [class.item-active]="room.value.id == idSelected">
                   <div class="item-icon">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
@@ -89,7 +89,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf=" ChatServiceGPR.individualCount < 1">
+            <ion-item-sliding *ngIf=" wsChatService.individualCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">

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

@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -127,8 +127,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public ChatServiceGPR: ChatServiceGPR,
-    private wsService: WebsocketService,
+    public wsChatService: wsChatService
 
   ) {
 
@@ -144,9 +143,9 @@ export class ChatPage implements OnInit {
 
     console.log("CHAT PAGE");
 
-    wsService.messages.subscribe(msg => {
+    /* wsService.messages.subscribe(msg => {
       console.log("Response from Websocket server: "+msg);
-    });
+    }); */
 
     this.load()
   }
@@ -243,7 +242,7 @@ export class ChatPage implements OnInit {
   } */
 
 
-  loadMessage(){
+/*   loadMessage(){
     this.wsService.messages.subscribe(msg => {
       console.log("Response from websocket: " + msg);
     });
@@ -253,7 +252,7 @@ export class ChatPage implements OnInit {
     this.wsService.messages.next(this.message);
     this.message.msg = "";
     this.loadMessage();
-  }
+  } */
 
 
   /* Fim websockets functions */

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

@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).massages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">

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

@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -108,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
-    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+    this.wsChatService.getRoom(this.roomId).loadHistory()
 
   }
 
@@ -335,8 +335,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
-
-
   sendMessage() {
     let body = {
       "message":