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

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!')
   }
 }