merge

src/app/pages/chat/chat.page.html

@@ -75,10 +75,12 @@
                       </ion-label> -->
 
                       <div *ngIf="room.lastMessage.file">
-                        <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
+                        <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img' && room.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
+                        <fa-icon *ngIf="room.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
+                        <span *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span>
 
                         <fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-                        <span> {{room.lastMessage.file.name || room.lastMessage.file.subject }}</span>
+                        <span> {{room.lastMessage.file.name || room.lastMessage.file.subject}}</span>
                       </div>
 
                       <ion-label *ngIf="room.lastMessage.attachments">
@@ -120,8 +122,7 @@
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
                     </div>
-                    <div
-                     (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
+                    <div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
                       <div class="item-title-time">
                         <div class="item-title" [class.item-title-active]="group.id ==idSelected">
                           <ion-label>{{group.name.split('-').join(' ')}}</ion-label>
@@ -132,11 +133,12 @@
                       <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected">
                         <div class="item-message" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
                         <div *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
-
-                        <div class="item-files add-ellipsis" *ngIf="group.file">
-                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
+                        <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
+                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting' && group.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="group.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
+                          <span *ngIf="group.lastMessage.file.type == 'application/audio'" class="item-files-title"> audio </span>
                           <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
-                          <span class="item-files-title"> {{group.lastMessage.file.name || group.file.subject}}</span>
+                          <span *ngIf="group.lastMessage.file.type != 'application/audio'" class="item-files-title"> {{ group.lastMessage.attachments[0].title }}</span>
                         </div>
                         <div  class="item-files" *ngIf="group.attachments">
                           <div *ngIf="group.value.lastMessage.attachments[0].image_url">

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

@@ -106,7 +106,7 @@
                 <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 add-attachment-bg-color" *ngIf="msg.file.type != 'aplication/audio'">
+                  <div class="file add-attachment-bg-color" *ngIf="msg.file.type != 'application/audio'">
                     <div (click)="openPreview(msg)" 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>
@@ -117,14 +117,14 @@
                       <ion-label class="file-title">{{file.title}}</ion-label>
                     </div>
                   </div>
-                  <div *ngIf="msg.file.type == 'aplication/audio'">
+                  <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.file.type != 'aplication/audio'">{{msg.displayType}}</span>
+                      <span *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                     </ion-label>
                   </div>
               </div>

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

@@ -288,7 +288,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       if (result.value && result.value.recordDataBase64) {
         const recordData = result.value.recordDataBase64;
         //console.log(recordData);
-        const fileName = new Date().getTime() + ".wav";
+        const fileName = new Date().getTime() + ".mp3";
         //Save file
         this.storage.set('fileName',fileName);
         this.storage.set('recordData',result).then(() => {
@@ -450,7 +450,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.wsChatMethodsService.getGroupRoom(roomId).send({
       file: {
-        "type": "aplication/audio",
+        "type": "application/audio",
         /* "guid": '', */
       },
       attachments: [{

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

@@ -87,7 +87,7 @@
                 <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 add-attachment-bg-color" *ngIf="msg.file.type != 'aplication/audio'">
+                  <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>
@@ -98,14 +98,14 @@
                       <ion-label class="file-title">{{file.title}}</ion-label>
                     </div>
                   </div>
-                  <div *ngIf="msg.file.type == 'aplication/audio'">
+                  <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.file.type != 'aplication/audio'">{{msg.displayType}}</span>
+                      <span *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                     </ion-label>
                   </div>
               </div>

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

@@ -243,7 +243,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       if (result.value && result.value.recordDataBase64) {
         const recordData = result.value.recordDataBase64;
         //console.log(recordData);
-        const fileName = new Date().getTime() + ".wav";
+        const fileName = new Date().getTime() + ".mp3";
         //Save file
         this.storage.set('fileName',fileName);
         this.storage.set('recordData',result).then(() => {
@@ -388,7 +388,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.wsChatMethodsService.getDmRoom(roomId).send({
       file: {
-        "type": "aplication/audio",
+        "type": "application/audio",
         /* "guid": '', */
       },
       attachments: [{

src/app/services/chat/ws-chat-methods.service.ts

@@ -210,6 +210,7 @@ export class WsChatMethodsService {
    * @description sort room list by last message date
    */
   sortRoomList =() => {
+
     this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
     this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
   }
@@ -265,6 +266,16 @@ export class WsChatMethodsService {
     })
   }
 
+  private fix_updatedAt(message) {
+    if (message.result) {
+      message.result._updatedAt = message.result._updatedAt['$date']
+    } else if(message._updatedAt) {
+      if(message._updatedAt.hasOwnProperty('$date')) {
+        message._updatedAt = message._updatedAt['$date']
+      }
+    }
+    return message
+  }
 
   /**
    * @description create a representation of an room in these instance this.dm, this.group ...
@@ -276,13 +287,16 @@ export class WsChatMethodsService {
     /**
      * @description data used to define or create room
      */
+
+
+    roomData = this.fix_updatedAt(roomData)
     const setData = {
       customFields: roomData.customFields,
       id: this.getRoomId(roomData),
       name: this.getRoomName(roomData),
       t: roomData.t,
       lastMessage: this.getRoomLastMessage(roomData),
-      _updatedAt: new Date(roomData._updatedAt['$date']),
+      _updatedAt: new Date( roomData._updatedAt || roomData._updatedAt['$date']),
       u : roomData.u || {},
       members: roomData.members
     }
@@ -297,7 +311,7 @@ export class WsChatMethodsService {
       room.getAllUsers = this.getUsers
       room.receiveMessageDelete();
       room.sortRoomList = this.sortRoomList
-      
+
       // create individual room
 
       if(this.isIndividual(roomData)) {
@@ -412,9 +426,9 @@ export class WsChatMethodsService {
   }
 
   hidingRoom(id?) {
-    
+
     return this.WsChatService.hidingRoom(id).then(()=>{
-      // this.hideRoom(id)      
+      // this.hideRoom(id)
     })
 
   }

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

@@ -83,7 +83,7 @@
                   <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
-                  <div *ngIf="msg.file.type != 'aplication/audio'" class="file add-attachment-bg-color">
+                  <div *ngIf="msg.file.type != 'application/audio'" class="file add-attachment-bg-color">
                       <div (click)="openPreview(msg)" 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>
@@ -94,14 +94,14 @@
                         <ion-label class="file-title">{{file.title}}</ion-label>
                       </div>
                     </div>
-                    <div class="audio-contentainer" *ngIf="msg.file.type == 'aplication/audio'">
+                    <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio'">
                       <audio [src]="file.title_link|safehtml" preload="metadata" controls controlsList="nodownload noplaybackrate"></audio>
                     </div>
                     <div class="file-details-optional add-attachment-bg-color">
                       <ion-label *ngIf="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.file.type != 'aplication/audio'">{{msg.displayType}}</span>
+                        <span *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                       </ion-label>
                   </div>
                 </div>

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

@@ -315,7 +315,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       if (result.value && result.value.recordDataBase64) {
         const recordData = result.value.recordDataBase64;
         //console.log(recordData);
-        const fileName = new Date().getTime() + ".wav";
+        const fileName = new Date().getTime() + ".mp3";
         //Save file
         this.storage.set('fileName',fileName);
         this.storage.set('recordData',result).then(() => {
@@ -439,7 +439,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     this.wsChatMethodsService.getGroupRoom(roomId).send({
       file: {
-        "type": "aplication/audio",
+        "type": "application/audio",
         /* "guid": '', */
       },
       attachments: [{

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

@@ -96,7 +96,7 @@
                   </ion-label>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
-                  <div *ngIf="msg.file.type != 'aplication/audio'" class="file add-attachment-bg-color">
+                  <div *ngIf="msg.file.type != 'application/audio'" class="file add-attachment-bg-color">
                     <div (click)="openPreview(msg)" 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>
@@ -113,14 +113,14 @@
                       <ion-label class="file-title">{{file.title}}</ion-label>
                     </div>
                   </div>
-                  <div class="audio-contentainer" *ngIf="msg.file.type == 'aplication/audio'">
+                  <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio'">
                     <audio [src]="file.title_link|safehtml" preload="metadata" class="flex-grow-1" controls controlsList="nodownload noplaybackrate"></audio>
                   </div>
                   <div class="file-details-optional add-attachment-bg-color">
                     <ion-label *ngIf="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.file.type != 'aplication/audio'">{{msg.displayType}}</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" >
             

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

@@ -291,7 +291,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       if (result.value && result.value.recordDataBase64) {
         const recordData = result.value.recordDataBase64;
         //console.log(recordData);
-        const fileName = new Date().getTime() + ".wav";
+        const fileName = new Date().getTime() + ".mp3";
         //Save file
         this.storage.set('fileName',fileName);
         this.storage.set('recordData',result).then(() => {
@@ -357,8 +357,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   async sendAudio(fileName) {
 
     const roomId = this.roomId
+    let audioFile;
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
+      audioFile = recordData;
       if(recordData.value.recordDataBase64.includes('data:audio')){
         this.audioRecorded = recordData.value.recordDataBase64;
       }
@@ -376,14 +378,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     this.wsChatMethodsService.getDmRoom(roomId).send({
       file: {
-        "type": "aplication/audio",
+        "type": "application/audio",
         /* "guid": '', */
+        "msDuration":audioFile.value.msDuration,
+        "mimeType":audioFile.value.mimeType,
       },
       attachments: [{
         "title": fileName ,
         "title_link": this.audioRecorded,
         "title_link_download": true,
-        "type": "file"
+        "type": "audio"
       }],
       temporaryData: formData
     })