merge

2026-04-19 21:06:06 +00:00 · 2022-02-07 13:41:27 +01:00
parent 1d0913cd50 a3f1da77b9
commit fe2bd52be3
17 changed files with 1120 additions and 1107 deletions
@@ -20,12 +20,18 @@ import { NewEventPage } from '../../agenda/new-event/new-event.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
-import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { HttpEventType } from '@angular/common/http';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { FileType } from 'src/app/models/fileType';
+import { Storage } from '@ionic/storage';
+
+import { CameraService } from 'src/app/services/camera.service';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { ProcessesService } from 'src/app/services/processes.service';

@Component({
  selector: 'app-group-messages',
@@ -87,7 +93,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    private changeDetectorRef: ChangeDetectorRef,
    private sqlservice: SqliteService,
    private platform: Platform,
-    public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
+    private AttachmentsService: AttachmentsService,
+    private storage: Storage,
+    private processesService: ProcessesService,
+    
+    private CameraService: CameraService,
  ) {
    this.loggedUserChat = authService.ValidatedUserChat['data'];
    this.isGroupCreated = true;
@@ -240,7 +251,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
        this.roomCountDownDate = this.timeService.countDownDateTimer(this.room.customFields.countDownDate, this.room._id);
      }
      this.getGroupContacts(this.room);
-      this.loadGroupMessages(this.room);
      this.showLoader = false;
    });
  }
@@ -289,27 +299,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    }
  }

-  loadGroupMessages(room:any){
-    this.showLoader = true;
-    //If group is private call getGroupMembers
-    if(this.room.t === 'p'){
-      this.chatService.getPrivateGroupMessages(this.roomId).subscribe(res=>{
-        console.log(res);
-        let msgOnly = res['messages'].filter(data => data.t != 'au');
-        //this.messages = msgOnly.reverse();
-        this.transformDataMSG(msgOnly.reverse());
-      this.getRoomMessageDB(this.roomId);
-        this.showLoader = false;
-      });
-    }
-    //Otherwise call getChannelMembers for públic groups
-    /* else{
-      this.chatService.getPublicGroupMessages(this.roomId).subscribe(res=>{
-        console.log(res);
-        this.messages = res['messages'].reverse();
-      });
-    } */
-  }

  showDateDuration(start:any){
    return this.timeService.showDateDuration(start);
@@ -330,7 +319,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {


  sendMessage() {
-    this.wsChatMethodsService.getGroupRoom(this.roomId).send()
+    this.wsChatMethodsService.getGroupRoom(this.roomId).send({})
  }

  async openOptions() {
@@ -357,42 +346,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    });
  }

-  loadPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png']
-    })
-
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
-
-      console.log(file);
-
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
-
-      let body = {
-        "message":
-        {
-          "rid": this.roomId,
-          "msg": "",
-          "attachments": [{
-            //"title": this.capturedImageTitle ,
-            //"text": "description",
-            "title_link_download": false,
-            "image_url": this.capturedImage,
-          }]
-        }
-      }
-
-      this.chatService.sendMessage(body).subscribe(res=> {
-        console.log(res);
-      },(error) => {
-
-      });
-      //console.log(this.capturedImage)
-    };
-  }

  viewDocument(file:any, url?:string){

@@ -484,8 +437,183 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
    }
  }

+  
+
+  async takePicture() {
+    const roomId = this.roomId
+    
+    const image = await this.CameraService.takePicture();
+    await this.fileService.saveImage(image)
+    const lastphoto: any = await this.fileService.loadFiles();
+    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+
+    const { message, updateMessage} = this.wsChatMethodsService.getDmRoom(this.roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": capturedImage
+      },
+      attachments: [{
+        "title": capturedImageTitle ,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+
+    const base64 = await fetch(capturedImage);
+    const blob = await base64.blob();
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+    console.log('ALL IMAGE', formData)
+
+
+    let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
+    updateMessage({
+      file: {
+        type: "application/img",
+        guid: guid.path,
+        image_url: capturedImage
+      }
+    })
+
+    this.AttachmentsService.downloadFile(guid.path).subscribe(async (event) => {
+
+      if (event.type === HttpEventType.DownloadProgress) {
+        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        //console.log('FILE TYPE 33', msg.file.type)
+      } else if (event.type === HttpEventType.Response) {
+        var fileImage = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
+        console.log('add picture to chat', capturedImage);
+        await this.storage.set(guid.path, capturedImage).then(() => {
+          console.log('add picture to chat IMAGE SAVED')
+          message.getFileFromDb()
+        });
+
+      }
+
+    });
+
+  }
+  
+  async addImage() {
+    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
+  }
+  
+  async addFile() {
+    this.addFileToChat(['.doc', '.docx', '.pdf'])
+  }
+
+  async addFileWebtrix() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true,
+        showSearchInput: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async res=>{
+      const data = res.data;
+
+      if(data.selected) {
+        const loader = this.toastService.loading();
+
+        const { message, updateMessage} = this.wsChatMethodsService.getDmRoom(this.roomId).send({
+          file:{
+            "name": res.data.selected.Assunto,
+            "type": "application/webtrix",
+            "ApplicationId": res.data.selected.ApplicationType,
+            "DocId": res.data.selected.Id,
+            "Assunto": res.data.selected.Assunto,
+          },
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            // "title_link": url_no_options,
+            "title_link_download": true,
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            // "message_link": url_no_options,
+            "type": "webtrix"
+          }]
+        })
+
+        let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise();
+        let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+        console.log(url_no_options);
+
+        updateMessage({
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            "title_link": url_no_options,
+            "title_link_download": true,
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            "message_link": url_no_options,
+            "type": "webtrix",
+            "text": res.data.selected.DocTypeDesc,
+            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+          }]
+        })
+
+        loader.remove();
+
+      }
+    });
+  }
+
+
+  async addFileToChat(types: typeof FileType[] ) {
+    const file: any = await this.fileService.getFileFromDevice(types);
+    const imageData =  await this.fileToBase64Service.convert(file)
+
+    const formData = new FormData();
+    formData.append("blobFile", file);
+    
+    const { message, updateMessage} = this.wsChatMethodsService.getDmRoom(this.roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": imageData
+      },
+      attachments: [{
+        "title": file.name ,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+    let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
+    updateMessage({
+      file: {
+        type: "application/img",
+        guid: guid.path,
+        image_url: imageData
+      }
+    })
+
+    this.AttachmentsService.downloadFile(guid.path).subscribe(async (event) => {
+
+      if (event.type === HttpEventType.DownloadProgress) {
+        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        //console.log('FILE TYPE 33', msg.file.type)
+      } else if (event.type === HttpEventType.Response) {
+        var fileImage = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
+        console.log('add picture to chat',fileImage);
+        await this.storage.set(guid.path, fileImage).then(() => {
+          console.log('add picture to chat IMAGE SAVED')
+          message.getFileFromDb()
+        });
+      }
+
+    });
+  }
+  
  async openChatOptions(ev?: any) {
    console.log(this.members);
+    const roomId = this.roomId;

    const popover = await this.popoverController.create({
      component: ChatOptionsPopoverPage,
@@ -499,29 +627,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
      translucent: true
    });
    await popover.present();
-    await popover.onDidDismiss().then((res)=>{
+    await popover.onDidDismiss().then( async(res)=>{
      console.log(res['data']);
-      if(res['data'] == 'meeting'){
+      if (res['data'] == 'meeting') {
        this.bookMeeting();
      }
-      else if(res['data'] == 'take-picture'){
-        this.fileService.addCameraPictureToChat(this.roomId);
-        //this.loadPicture();
+      else if (res['data'] == 'take-picture') {
+        this.takePicture()
      }
-      else if(res['data'] == 'add-picture'){
-        this.fileService.addPictureToChatMobile(this.roomId);
-        //this.loadPicture();
-      }
-      else if(res['data'] == 'add-document'){
-        this.fileService.addDocumentToChat(this.roomId);
-        //this.loadDocument();
-      }
-      else if(res['data'] == 'documentoGestaoDocumental'){
+      else if (res['data'] == 'add-picture') {
+        this.addImage()

-        this.fileService.addDocGestaoDocumentalToChat(this.roomId);
-        //this.addDocGestaoDocumental();
      }
-      this.loadGroupMessages(this.roomId);
+      else if (res['data'] == 'add-document') {
+        this.addFile()
+      }
+      else if (res['data'] == 'documentoGestaoDocumental') {
+
+        this.addFileWebtrix()
+      }
    });
  }

@@ -745,7 +869,7 @@ downloadFileMsg(msg) {
  console.log('FILE TYPE', msg.file.type)
  this.downloadFile = "";
  if (msg.file.type == "application/img") {
-    this.fileService.downloadFile(msg.file.guid).subscribe(async (event) => {
+    this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
      console.log('FILE TYPE 22', msg.file.guid)
      var name = msg.file.guid;