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

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

@@ -20,7 +20,6 @@ import { NewGroupPage } from './new-group/new-group.page';
 import { Storage } from '@ionic/storage';
 import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
 import * as Rx from "rxjs/Rx";
-import { Message } from 'src/app/models/message.model';
 import { Observable, Subject } from "rxjs/Rx";
 import { NavigationStart, NavigationEnd, Router } from '@angular/router';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -143,10 +142,6 @@ export class ChatPage implements OnInit {
 
   ngOnInit() {
 
-    console.log('Rooms INDIVIDUAIS',this.wsChatMethodsService._dm);
-    console.log(' ROOMS GROUP',this.wsChatMethodsService._group);
-
-
     this.segment = "Contactos";
 
     this.authService.userData$.subscribe((res: any) => {

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

@@ -190,8 +190,9 @@
 </ion-content>
 
 <ion-footer>
-  <div class="typing" >
-    <ngx-letters-avatar
+  
+  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
+    <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
     [width]="30"
     [circular]="true"

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

@@ -85,6 +85,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   audioDownloaded:any = "";
   durationDisplay = '';
   duration = 0;
+  showAvatar = true;
 
   constructor(
     private menu: MenuController,
@@ -129,6 +130,14 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       this.scrollToBottomClicked()
     }, 50)
 
+
+    this.showAvatar = false
+
+    setTimeout(() => {
+      this.scrollToBottomClicked()
+      this.showAvatar = true
+    }, 150)
+
   }
 
   ngOnInit() {

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

@@ -195,7 +195,7 @@
   </ion-toolbar>
 </ion-footer> -->
 
-<ion-footer>
+<ion-footer >
 
 
   <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true">

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

@@ -517,8 +517,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.chatService.getMembers(this.roomId).subscribe(res => {
       this.members = res['members'];
       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/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -39,7 +39,6 @@
           <div class="content-location">
             <p>
               <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
-
               <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
                 {{loadedEvent.workflowInstanceDataFields.Agenda}}
               </span>
@@ -54,7 +53,6 @@
               <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;">
                 {{loadedEvent.workflowInstanceDataFields.Agenda}}
               </span>
-
             </p>
           </div>
           <div class="content-details">
@@ -68,7 +66,6 @@
           </div>
         </div>
         <div class="line"></div>
-
         <div class="overflow-y-auto">
           <div class="middle-content">
             <div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
@@ -86,7 +83,6 @@
               <div class="line"></div>
             </div>
           </div>
-
           <div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
             <ion-list>
               <h5>Documentos Anexados</h5>