Git pull with conflits

2026-04-20 13:26:08 +00:00 · 2022-03-27 21:03:49 +01:00
parent fa062c2cf5 35d685fc1a
commit 8b31822229
80 changed files with 2615 additions and 1341 deletions
@@ -17,6 +17,8 @@
            <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
          </div>
        </div>
+
+        <!-- <div (click)="wsChatMethodsService.getDmRoom(roomId).deleteAll()" >delete all</div> -->
        <div class="middle-container-options" *ngIf="showMessageOptions">
          <fa-icon (click)="deleteMessage(selectedMsgId)" icon="trash" class="middle-container-options-icons"></fa-icon>
          <!-- <ion-icon name="trash"></ion-icon> -->
@@ -56,24 +58,14 @@
          <span class="time">{{msg.duration}}</span>
        </div>
        <div>
-          <ion-label>{{msg.msg}}</ion-label>
-          {{last ? scrollToBottom() : ''}}
-        </div>
-      </div>
-
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
-        <div class="title">
-          <ion-label>{{msg.u.name}}</ion-label>
-          <span class="time">{{msg.duration}}</span>
-        </div>
-        <div>
-          <ion-label>{{msg.msg}}</ion-label>
+          <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
+          <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
          {{last ? scrollToBottom() : ''}}
        </div>
      </div>


-      <div *ngIf="msg.file">
+      <div *ngIf="msg.file && msg.delate == false">
      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.file.type != 'application/meeting'">
        <div class="title">
          <ion-label>{{msg.u.name}}</ion-label>
@@ -87,8 +79,8 @@
                <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
              </div>
              <div *ngIf="msg.file.type != 'application/img'">
-                  <div class="file">
-                    <div (click)="docIndex(i); openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                  <div class="file add-attachment-bg-color" *ngIf="msg.file.type != 'application/audio'">
+                    <div (click)="docIndex(i); viewDocument(msg, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                      <span *ngIf="msg.file.type">
                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
@@ -98,11 +90,14 @@
                      <ion-label class="file-title">{{file.title}}</ion-label>
                    </div>
                  </div>
-                  <div class="file-details-optional">
+                  <div *ngIf="msg.file.type == 'application/audio'">
+                    <audio [src]="file.title_link|safehtml" preload="metadata" class="d-flex width-100" controls controlsList="nodownload noplaybackrate"></audio>
+                  </div>
+                  <div class="file-details-optional add-attachment-bg-color">
                    <ion-label *ngIf="msg.file && msg.file != ''">
                      <span *ngIf="file.description">{{file.description}}</span>
                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
+                      <span *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                    </ion-label>
                  </div>
              </div>
@@ -120,7 +115,7 @@

      </div>

-      <div *ngIf="msg.file">
+      <div *ngIf="msg.file && msg.delate == false">
        <div *ngIf="msg.file.type == 'application/meeting'" class="info-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 />
@@ -129,6 +124,10 @@
        </div>
        {{last ? scrollToBottom() : ''}}
      </div>
+
+      <div *ngIf="msg.file && msg.delate == true">
+        Apagou a mensagem
+      </div>
    </div>
  </div>
  <ion-fab horizontal="end" vertical="bottom" slot="fixed">
@@ -162,44 +161,52 @@
  </ion-toolbar>
 </ion-footer> -->

-<ion-footer>
-  <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >A escrever...</div>
-  <ion-list hidden>
-    <ion-item (click)="playFile(storedFileNames)">
-      {{storedFileNames}}
-    </ion-item>
-    <ion-item (click)="playFile(storedFileNames)">
-      {{storedFileNames}}
-    </ion-item>
-  </ion-list>
-  <audio hidden controls>
-    <!-- <source src="https://www.tabularium.pt/file-upload/5g6DkyMC4MHcuaDyp/Audio%20record.mp3" type="audio/mpeg"> -->
-  </audio>
-  <!-- <button (click)="startRecording()">Start Recording</button>
-  <button (click)="stopRecording()">Stop Recording</button> -->
+<ion-footer >
+
+
+  <div class="typing"  *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true">
+    <ngx-letters-avatar
+    [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
+    [width]="30"
+    [circular]="true"
+    fontFamily="Roboto"></ngx-letters-avatar>
+    está a escrever ...
+  </div>
+  <div class="width-100 pl-20 pr-20">
+    <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>
+    <audio [src]="audioRecorded" class="d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded" controls controlsList="nodownload noplaybackrate"></audio>
+  </div>
+
  <div class="container width-100 d-flex">
    <div>
-
-      <button class="btn-no-color" (click)="openChatOptions()">
+      <button *ngIf="!recording && !lastAudioRecorded && allowTyping" class="btn-no-color" (click)="openChatOptions()">
        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
      </button>
+      <button *ngIf="recording || lastAudioRecorded || !allowTyping" class="btn-no-color" (click)="deleteRecording()">
+        <fa-icon class="icon-size-27" icon="trash"></fa-icon>
+      </button>
    </div>
-    <div class="width-70">
-      <ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
-        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" *ngIf="!recording" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
-        <ion-textarea autocomplete="on" spellcheck="true" *ngIf="recording" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="durationDisplay"></ion-textarea>
-        <button hidden #recordbtn class="btn-no-color" (click)="notImplemented()">
-          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+    <div class="width-70 message-container">
+      <div *ngIf="!recording && !lastAudioRecorded" class="type-message">
+        <ion-textarea *ngIf="allowTyping" autocomplete="on" autocorrect="on" spellcheck="true" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
+      </div>
+      <div *ngIf="recording" class="d-flex align-items-center justify-content-center">
+        <button (click)="stopRecording()" class="btn-no-color d-flex align-items-center justify-content-center">
+        <ion-icon class="icon-size-45" name="stop-circle-outline" color="danger"></ion-icon>
        </button>
-      </ion-item>
+      </div>
    </div>
    <div>
-      <button *ngIf="wsChatMethodsService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage()">
+      <button #recordbtn *ngIf="!wsChatMethodsService.getDmRoom(roomId).message && !lastAudioRecorded" (click)="startRecording()" class="btn-no-color">
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/default/icons-chat-record-audio.svg"></ion-icon>
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
+      </button>
+      <button *ngIf="wsChatMethodsService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage()" class="btn-no-color">
        <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
        <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
      </button>
-      <button *ngIf="!wsChatMethodsService.getDmRoom(roomId).message" class="btn-no-color">
+      <button *ngIf="!wsChatMethodsService.getDmRoom(roomId).message && lastAudioRecorded" (click)="sendAudio(lastAudioRecorded)" class="btn-no-color">
        <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
        <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
      </button>
@@ -56,9 +56,6 @@
            width: calc(100% - 25px);
            text-align: right;

-            /* ion-icon{
-              font-size: 25px;
-            } */
            .middle-container-options-icons{
              color: #0782c9;
              font-size: 23px;
@@ -117,6 +114,7 @@
        }
    }
 }
+
 ion-content{
   .welcome-text{
    /* width: 322px; */
@@ -148,7 +146,7 @@
    -webkit-overflow-scrolling: touch;

    .messages-list-item-wrapper{
-      overflow: auto;
+      overflow: hidden;
    }
    .messages-list-item-wrapper-active{
      background: #e6f6ff75 !important;
@@ -228,7 +226,6 @@
   justify-content: center;
   justify-content: space-evenly;
   align-items: center;
-
 }

 .chat-icon-options{
@@ -318,5 +315,16 @@ display: block;


 .typing ngx-letters-avatar {
-  padding-left: 10px;
-}
+  padding-right: 5px;
+}
+
+
+button{
+  padding: 0px;
+  border: 0px;
+}
+
+button::-moz-focus-inner {
+  padding: 0px;
+  border: 0px;
+}
@@ -88,7 +88,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  LoadedDocument: any = null;

  recording = false;
+  allowTyping = true;
  storedFileNames = [];
+  lastAudioRecorded = '';
+  audioRecorded:any = "";
+  audioDownloaded:any = "";
  durationDisplay = '';
  duration = 0;
  @ViewChild('recordbtn', { read: ElementRef }) recordBtn: ElementRef;
@@ -101,6 +105,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  fileSelected?: Blob;
  pdfUrl?:string;
  base64File: string;
+  downloadProgess: number;

  constructor(
    public popoverController: PopoverController,
@@ -129,6 +134,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    private multipleDocumentsPicker: MultipleDocumentsPicker,
    private sant: DomSanitizer,
    //private file: File
+    private sanitiser: DomSanitizer,
  ) {
    this.loggedUser = authService.ValidatedUserChat['data'];
    this.roomId = this.navParams.get('roomId');
@@ -140,6 +146,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
      }
    };

+    console.log(this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({}));
+
    this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
    this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
    this.wsChatMethodsService.openRoom(this.roomId)
@@ -154,15 +162,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
      console.log('MEMBER', value)
    })
-
    //this.loadFiles();
    VoiceRecorder.requestAudioRecordingPermission();
    this.getChatMembers();
-    Filesystem.mkdir({
+    /* Filesystem.mkdir({
      path: IMAGE_DIR,
      directory: Directory.Data,
      recursive: true
-    });
+    }); */
  }

  ngAfterViewInit() {
@@ -176,11 +183,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
      onStart: ev => {
        Haptics.impact({ style: ImpactStyle.Light })
        this.startRecording();
-        this.calculateDuration();
+        //this.calculateDuration();
      },
      onEnd: ev => {
        Haptics.impact({ style: ImpactStyle.Light })
        this.stopRecording();
+        /* setTimeout(() => {
+          this.loadFiles();
+        }, 500); */
      }
    }, true);
    longpress.enable();
@@ -203,61 +213,73 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  async loadFiles() {
-    Filesystem.readdir({
-      path: '',
-      directory: Directory.Data
-    }).then(result => {
-      console.log(result);
-      const temp: any[] = result.files.reverse();
-      this.storedFileNames = temp[0];
-      console.log(this.storedFileNames);
+
+    this.storage.get('fileName').then((fileName) => {
+      this.lastAudioRecorded = fileName;
    })
+
+    this.storage.get('recordData').then((recordData) => {
+      console.log(recordData);
+      if(recordData.value.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+      }
+      else{
+        this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`);
+      }
+    });
  }

  startRecording() {
+    console.log('Recording');
+
    if (this.recording) {
      return;
    }
    this.recording = true;
-    VoiceRecorder.startRecording();
+    VoiceRecorder.startRecording()
+    .then((result: GenericResponse) => console.log(result.value))
+    .catch(error => console.log(error));
+    this.calculateDuration();
  }

  stopRecording() {
+    this.deleteRecording();
+    this.allowTyping = false;
+    console.log('Stop');
    if (!this.recording) {
      return;
    }
    this.recording = false;
    VoiceRecorder.stopRecording().then(async (result: RecordingData) => {
+      console.log(result);
      this.recording = false;
      if (result.value && result.value.recordDataBase64) {
        const recordData = result.value.recordDataBase64;
-        console.log(recordData);
-        this.myAudio = recordData;
-        const fileName = new Date().getTime() + ".wav";
-        await Filesystem.writeFile({
-          path: fileName,
-          directory: Directory.Data,
-          data: recordData,
+        //console.log(recordData);
+        const fileName = new Date().getTime() + ".mp3";
+        //Save file
+        this.storage.set('fileName',fileName);
+        this.storage.set('recordData',result).then(() => {
+          console.log('Audio recorded saved');
        })
      }
    })
-
+    setTimeout(async () => {
+      this.loadFiles();
+    }, 1000);
  }

-  async playFile(fileName?: any) {
-    const audioFile = await Filesystem.readFile({
-      path: fileName,
-      directory: Directory.Data
-    })
-    console.log(audioFile);
-    const base64sound = audioFile.data;
-
-    const audioRef = new Audio(`data:audio/aac;base64,${base64sound}`)
-    audioRef.oncanplaythrough = () => audioRef.play();
-    audioRef.load();
+  async deleteRecording(){
+    this.storage.remove('fileName');
+    this.storage.remove('recordData');

+    this.allowTyping = true;
+    this.lastAudioRecorded = '';
+    this.loadFiles();
  }

+
+
  handlePress(id?: string) {
    this.selectedMsgId = id;
    this.showMessageOptions = true;
@@ -269,19 +291,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
  }

  deleteMessage(msgId: string) {
-    let body = {
-      "roomId": this.roomId,
-      "msgId": msgId,
-      "asUser": false,
-    }
-    if (msgId) {
-      //this.alertService.confirmDeleteMessage(body);
-    }
-    else {
-      this.toastService.badRequest('Não foi possível apagar');
-    }
-    this.showMessageOptions = false;
-    this.selectedMsgId = "";
+    const room = this.wsChatMethodsService.getDmRoom(this.roomId)
+    this.alertService.confirmDeleteMessage(msgId, room);
  }


@@ -291,6 +302,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {

  close() {
    this.modalController.dismiss();
+    this.deleteRecording();
  }

  load() {
@@ -367,6 +379,44 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    this.wsChatMethodsService.getDmRoom(this.roomId).send({})
  }

+  async sendAudio(fileName) {
+
+    const roomId = this.roomId
+    this.storage.get('recordData').then((recordData) => {
+      console.log(recordData);
+      if(recordData.value.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData.value.recordDataBase64;
+      }
+      else{
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+      }
+    });
+
+    //Converting base64 to blob
+    const base64Response = await fetch(this.audioRecorded);
+    const blob = await  base64Response.blob();
+
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/audio",
+        /* "guid": '', */
+      },
+      attachments: [{
+        "title": fileName ,
+        "title_link": this.audioRecorded,
+        "title_link_download": true,
+        "type": "file"
+      }],
+      temporaryData: formData
+    })
+    this.deleteRecording();
+
+  }
+
+
  viewDocument(msg: any, url?: string) {
    console.log(msg)
    if (msg.attachments.type == "application/webtrix") {
@@ -405,6 +455,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    }
  }

+  /* playSound(url?:any){
+    alert('here')
+    console.log(url);
+    //this.audioDownloaded = this.sanitiser.bypassSecurityTrustResourceUrl(url);
+    this.audioDownloaded = url;
+  } */
+
  docIndex(index: number) {
    this.dicIndex = index
  }
@@ -464,8 +521,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;
    });
  }
@@ -956,6 +1011,11 @@ fileToBase64 = (blob,filename) => {

  }

+ /*  testeDownload(msg: MessageService) {
+    this.downloadFile = "";
+    this.AttachmentsService.downloadFileAndStore(msg.file.guid);
+  } */
+

  downloadFileMsg(msg: MessageService) {
    console.log('FILE TYPE', msg.file.type)
@@ -966,7 +1026,8 @@ fileToBase64 = (blob,filename) => {
      var name = msg.file.guid;

      if (event.type === HttpEventType.DownloadProgress) {
-        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        console.log(this.downloadProgess)
        console.log('FILE TYPE 33', msg.file.type)
      } else if (event.type === HttpEventType.Response) {
        if (msg.file.type == "application/img") {
@@ -1009,7 +1070,8 @@ fileToBase64 = (blob,filename) => {
    console.log(msg);

    if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
-      this.downloadFileMsg(msg)
+      this.downloadFile(msg)
+      //this.testDownlod(msg)

    } else {
      const modal = await this.modalController.create({