Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/chat/group-messages/group-messages.module.ts

@@ -15,6 +15,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import {MatMenuModule} from '@angular/material/menu';
 import { LettersAvatarModule } from "ngx-letters-avatar";
 import { PipesModule } from 'src/app/pipes/pipes.module';
+import { SafehtmlPipe } from 'src/app/pipes/safehtml.pipe';
 
 @NgModule({
   imports: [
@@ -33,4 +34,4 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   declarations: [GroupMessagesPage]
 })
-export class GroupMessagesPageModule {}
+export class GroupMessagesPageModule {}

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

@@ -56,6 +56,14 @@
         <div class="message">
           <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
           <ion-label *ngIf="msg.delate == true">{{msg.msg}}</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>
@@ -83,6 +91,13 @@
                   msg.attachments[0].image_url" (click)="openPreview(msg)">
                     <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
                     <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
+                    <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">
@@ -90,6 +105,7 @@
                           <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>
+                            <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'" icon="file-word" class="word-icon"></fa-icon>
                             <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
                             <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
                           </span>
@@ -113,6 +129,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-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>

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

@@ -293,3 +293,31 @@
 .typing ngx-letters-avatar {
   padding-right: 5px;
 }
+
+
+.float-status{
+  position: relative !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+}
+
+.float-status-image{
+  position: relative !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+  top: -15px;
+}
+
+.float-status-webtrix {
+  position: relative !important;
+  top: 0px !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+}
+
+.float-status-all {
+  font-size: 10pt !important;
+}

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

@@ -36,9 +36,11 @@ import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { DomSanitizer } from '@angular/platform-browser';
+import { AlertController, NavParams } from '@ionic/angular';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 
+
 /*
 import * as pdfjsLib from 'pdfjs-dist';
 if( pdfjsLib !== undefined ){
@@ -101,6 +103,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   durationDisplay = '';
   duration = 0;
 
+  audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
+
   constructor(
     public wsChatMethodsService: WsChatMethodsService,
     private modalController: ModalController,
@@ -123,10 +127,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private CameraService: CameraService,
     private toastService: ToastService,
     private sanitiser: DomSanitizer,
+    private alertController: AlertController,
     private file: File,
     private platform: Platform,
     private fileOpener: FileOpener,
 
+
   ) {
     console.log('OnCONSTRUCTOR');
     this.loggedUserChat = authService.ValidatedUserChat['data'];

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

@@ -13,6 +13,7 @@ import { MatButtonModule } from '@angular/material/button';
 import {MatMenuModule} from '@angular/material/menu';
 import { LettersAvatarModule } from "ngx-letters-avatar";
 import { PipesModule } from 'src/app/pipes/pipes.module';
+import { SafehtmlPipe } from 'src/app/pipes/safehtml.pipe';
 
 @NgModule({
   imports: [
@@ -25,9 +26,8 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
     MatMenuModule,
     LettersAvatarModule,
     PipesModule,
-
   ],
   exports: [MessagesPage],
   declarations: [MessagesPage]
 })
-export class MessagesPageModule {}
+export class MessagesPageModule {}

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

@@ -233,6 +233,7 @@
       <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>
+        <!-- <ion-icon *ngIf="audioPermissionStatus != 'granted' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-record-audio-disable.svg"></ion-icon> -->
       </button>
       <button *ngIf="wsChatMethodsService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage()">
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>

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

@@ -1,5 +1,5 @@
 import { AfterViewChecked, AfterViewInit, Component, ElementRef, ChangeDetectorRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
-import { AnimationController, GestureController, IonSlides, ModalController, PopoverController, Platform } from '@ionic/angular';
+import { AnimationController, GestureController, IonSlides, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -35,9 +35,11 @@ import { DocumentViewer, DocumentViewerOptions } from '@ionic-native/document-vi
 import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { DomSanitizer } from '@angular/platform-browser';
+import { AlertController, Platform, NavParams } from '@ionic/angular';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 
+
 const IMAGE_DIR = 'stored-images';
 @Component({
   selector: 'app-messages',
@@ -92,6 +94,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   durationDisplay = '';
   duration = 0;
 
+  audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
+
   constructor(
     public popoverController: PopoverController,
     private modalController: ModalController,
@@ -120,11 +124,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private processesService: ProcessesService,
     private fileToBase64Service: FileToBase64Service,
     private sanitiser: DomSanitizer,
+    private alertController: AlertController,
     private file: File,
     private platform: Platform,
     private fileOpener: FileOpener,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
+
+    this.checkAudioPermission()
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -149,6 +156,20 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   }
 
+  async checkAudioPermission() {
+    const permissionStatus = await navigator.permissions.query({ name: 'microphone' } as any)
+
+    console.log('permission', permissionStatus.state); // granted, denied, prompt
+
+    this.audioPermissionStatus = permissionStatus.state
+
+    permissionStatus.onchange = (data : any) => {
+      // console.log("Permission changed to " + data.state);
+      // console.log('permission', permissionStatus.state); // granted, denied, prompt
+    }
+
+  }
+
   ngOnInit() {
     this.scrollToBottom();