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

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

@@ -209,14 +209,16 @@
 <ion-footer>
   <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div> -->
 
-  <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
+  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
+    {{ wsChatMethodsService.getGroupRoom(roomId).otherUserType }}
+
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
     [width]="30"
     [circular]="true"
     fontFamily="Roboto"></ngx-letters-avatar>
     {{ wsChatMethodsService.getGroupRoom(roomId).userThatIsTyping }} está a escrever...
-  </div> -->
+  </div>
 
   <div class="width-100 pl-20 pr-20">
     <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>

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

@@ -45,20 +45,25 @@
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
           </fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
-            <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
+            <button (click)="deleteMessage(msg._id, msg)" class="menuButton">Apagar mensagem</button>
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label (click)="testEditMessage(msg)">{{msg.u.name}}</ion-label>
+          <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
         </div>
         <div class="d-flex justify-space-between">
-          <ion-label class="flex-0">{{msg.msg}}</ion-label>
-          <!-- <ion-label class="float-status-all float-status" >
-            <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
-            <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
-            <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
-          </ion-label> -->
+          
+          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}}</ion-label> 
+          <ion-label *ngIf="msg.delate == true" class="flex-0">Apagou a mensagem</ion-label>
+
+          <ion-label class="float-status-all float-status" >
+            
+            <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+            <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+          </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -70,11 +75,11 @@
             <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
             </fa-icon>
             <mat-menu #beforeMenu="matMenu" xPosition="before">
-              <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
+              <button (click)="deleteMessage(msg._id, msg)" class="menuButton">Apagar mensagem</button>
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}} </ion-label>
+            <ion-label>{{msg.u.name}}</ion-label>
             <span class="time">{{msg.duration}}</span>
           </div>
           <div>
@@ -82,11 +87,13 @@
               <div *ngFor="let file of msg.attachments">
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
                   <img src={{msg.attachments[0].image_url}} alt="image">
-                  <!-- <ion-label class="float-status-image float-status-all">
-                    <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
-                    <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
-                    <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
-                  </ion-label> -->
+                  <ion-label class="float-status-all float-status" >
+            
+                    <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                    <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                    <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                    <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                  </ion-label>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
                   <div *ngIf="msg.file.type != 'application/audio'" class="file add-attachment-bg-color">
@@ -123,11 +130,13 @@
                       <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
                       <span *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                     </ion-label>
-                    <!-- <ion-label class="float-status-webtrix float-status-all">
-                      <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
-                      <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
-                      <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
-                    </ion-label> -->
+                    <ion-label class="float-status-all float-status" >
+            
+                      <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                    </ion-label>
                   </div>
                 </div>
               </div>
@@ -150,55 +159,6 @@
           </ion-label><br />
         </div>
       </div>
-
-      <!-- <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg ==''">
-        <div *ngIf="msg.file">
-          <div *ngIf="msg.file.type == 'application/img'">
-            <div class="message-item-options d-flex justify-content-end">
-              <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
-              </fa-icon>
-              <mat-menu #beforeMenu="matMenu" xPosition="before">
-                <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
-              </mat-menu>
-            </div>
-            <div class="title">
-              <ion-label>{{msg.u.name}}</ion-label>
-              <span class="time">{{msg.duration}}</span>
-            </div>
-            <div>
-              <ion-label>{{msg.msg}}</ion-label>
-              <div *ngIf="msg.file" class="message-attachments">
-                <div>
-                  <div (click)="openPreview(msg)">
-                    File
-                    <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
-                  </div>
-                </div>
-              </div>
-              {{last ? scrollToBottom() : ''}}
-            </div>
-          </div>
-        </div>
-      </div> -->
-
-
-      <!-- <div *ngIf="msg.file">
-        <div class="info-meeting" *ngIf="msg.file.type == 'application/meeting'">
-          <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
-            <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
-          </button><br />
-          <ion-label class="info-meeting-medium">
-            <ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a
-            {{showDateDuration(msg.file.end_date)}}
-          </ion-label><br />
-          <ion-label class="info-meeting-medium">
-            <ion-icon></ion-icon>
-            <ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}
-          </ion-label><br />
-        </div>
-        {{last ? scrollToBottom() : ''}}
-      </div> -->
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
@@ -210,8 +170,8 @@
 </ion-content>
 
 
-<ion-footer>
-
+<ion-footer (click)="wsChatMethodsService.getDmRoom(roomId).sendReadMessage()">
+  
   <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getDmRoom(roomId).name"

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

@@ -120,10 +120,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private fileToBase64Service: FileToBase64Service,
     private sanitiser: DomSanitizer,
   ) {
-
     this.loggedUser = authService.ValidatedUserChat['data'];
-
   }
+
   ngOnChanges(changes: SimpleChanges): void {
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
 
@@ -192,7 +191,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   scrollToBottomClicked = () => {
-    console.log('scroll')
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
       //this.scrollingOnce = false;
@@ -424,9 +422,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   }
 
-  deleteMessage(msgId: string) {
-    const room = this.wsChatMethodsService.getDmRoom(this.roomId)
-    this.alertService.confirmDeleteMessage(msgId, room);
+  deleteMessage(msgId: string, msg:MessageService) {
+
+    msg.delateStatusFalse()
+    this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId)
+
   }
 
   async viewDocument(msg: any, url?: string) {
@@ -507,14 +507,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   getChatMembers() {
-    console.log(this.roomId);
+    // console.log(this.roomId);
 
     //this.showLoader = true;
     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;
     });
   }
@@ -645,6 +643,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       temporaryData: formData,
       attachments: [{
         "title": file.path,
+        // "image_url": "",
         //"image_url": 'data:image/jpeg;base64,' + file.base64String,
         "text": "description",
         "title_link_download": false,
@@ -774,6 +773,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
+    
     console.log('Add file', file)
     /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
       console.log('Add file', filee)
@@ -938,9 +938,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           ts: msg.attachments[0].ts
         }
 
-        await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
-          console.log('IMAGE SAVED')
-        });
+        // save the changes to the storage
+        msg.save()
+
+        
       }
 
     });
@@ -1007,7 +1008,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
   testEditMessage(msg: MessageService) {
-    msg.receptorReceive()
+    // msg.receptorReceive()
     // alert('cool!')
   }
 }