From ce357b786213c584a2e40ad20dbcd6f33060e5fa Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 21 Mar 2022 21:36:50 +0100
Subject: [PATCH 01/27] svae

---
 src/app/services/chat/room.service.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index f7f9bbd7f..53344c4c1 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -363,7 +363,6 @@ export class RoomService {
         
         this.messages.splice(index, 1)
         
-
         if (SessionStore.user.RochetChatUser == message.u.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
@@ -418,7 +417,6 @@ export class RoomService {
       (response: any) => {
         message.delateRequest = true
         message.save()
-        this.deleteMessage(msgId)
       },
       (response) => {
 

From c4c4355c950148d4099fab0f1dbf56e9b58bc37a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 22 Mar 2022 14:23:38 +0100
Subject: [PATCH 02/27] improve

---
 .../group-messages/group-messages.page.ts     | 45 ++++++++------
 src/app/pages/chat/messages/messages.page.ts  | 46 ++++++++------
 src/app/services/chat/room.service.ts         | 62 ++++++++++---------
 .../group-messages/group-messages.page.ts     | 54 +++++++++-------
 .../shared/chat/messages/messages.page.html   |  2 +-
 src/app/shared/chat/messages/messages.page.ts | 55 +++++++++-------
 6 files changed, 151 insertions(+), 113 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index fc233c102..859065b17 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -252,15 +252,19 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       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}`);
-      }
-    });
+    try {
+      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}`);
+        }
+      });
+    } catch (error) {}
+
+
   }
 
   startRecording() {
@@ -431,15 +435,20 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   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}`;
-      }
-    });
+    
+    try {
+      
+      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}`;
+        }
+      });
+    } catch (error) {}
+  
 
     //Converting base64 to blob
     const base64Response = await fetch(this.audioRecorded);
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 217ccbc57..75ae06f9c 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -205,15 +205,19 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       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}`);
-      }
-    });
+    try {
+      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}`);
+        }
+      });
+    } catch (error) {}
+
+    
   }
 
   startRecording() {
@@ -367,17 +371,21 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   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}`;
-      }
-    });
+    try {
+      
+      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}`;
+        }
+      });
+    } catch (error) {}
+
+    
 
     //Converting base64 to blob
     const base64Response = await fetch(this.audioRecorded);
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 53344c4c1..bd46ff5a4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -255,7 +255,7 @@ export class RoomService {
           
           // alert('delete')
           // console.log(args[0], 'receive delete message::()')
-          this.deleteMessage(args[1]?.method?._id)
+          // this.deleteMessage(args[1]?.method?._id)
           
         } else {
           // alert('miss')
@@ -357,36 +357,43 @@ export class RoomService {
    * @description delete message in the view
    * @param id message ID
    */
-   async deleteMessage(id) {
-    await this.messages.forEach(async(message, index) => {
-      if(message._id == id) {
-        
-        this.messages.splice(index, 1)
-        
-        if (SessionStore.user.RochetChatUser == message.u.username) {
-          const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
+   async deleteMessage(_id) {
+    
+    const id = _id
+
+    for (let i =0; i <= this.messages.length; i++) {
+
+      console.log('message._id == id',this.messages[i]?._id, id, i, this.messages[i]?._id == id)
+
+      if(this.messages[i]?._id == id ) {
+
+          this.messages.splice(i, 1)
           
-          await DeleteMessageModel.create({
-            messageId: message._id,
-            rid: message.rid,
-            ts: message.ts,
-            u: message.u,
-            needToReceiveBy: allMemberThatIsOffline
-          })
-        }
-        
-        message.delateStatusFalse()
-        message.delateDB()
+          if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
+            const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
+            
+            DeleteMessageModel.create({
+              messageId: this.messages[i]._id,
+              rid: this.messages[i].rid,
+              ts: this.messages[i].ts,
+              u: this.messages[i].u,
+              needToReceiveBy: allMemberThatIsOffline
+            })
+          }
+          
+          this.messages[i].delateStatusFalse()
+          this.messages[i].delateDB()
+  
+          //Get previous last message from room
+          const previousLastMessage = this.messages.slice(-1)[0];
+  
+          this.lastMessage = previousLastMessage;
+          this.calDateDuration(previousLastMessage._updatedAt)
+          this.sortRoomList()
 
-        //Get previous last message from room
-        const previousLastMessage = this.messages.slice(-1)[0];
-
-        this.lastMessage = previousLastMessage;
-        this.calDateDuration(previousLastMessage._updatedAt)
-        this.sortRoomList()
 
       }
-    })
+    }
 
   }
 
@@ -424,7 +431,6 @@ export class RoomService {
           // alert('not found')
           this.deleteMessage(msgId)
         } else {
-          // this.deleteMessage(DeletedMessageId)
           this.WsChatService.registerCallback({
             type: 'reConnect',
             funx: async ()=> {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 245533836..875afc895 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -274,20 +274,23 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   async loadFiles() {
+    try {
+      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}`);
+        }
+      });
+    } catch (error) {}
 
-    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() {
@@ -418,18 +421,23 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   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}`;
-      }
-    });
+  
 
+    
+    try {
+      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}`;
+        }
+      });
+    } catch (error) {}
+
+   
     //Converting base64 to blob
     const base64Response = await fetch(this.audioRecorded);
     const blob = await  base64Response.blob();
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index f2b691ed3..faee008e0 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -50,7 +50,7 @@
         </div>
         <div class="d-flex justify-space-between">
           
-          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}}</ion-label> 
+          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}} {{msg._id}}</ion-label> 
           <ion-label *ngIf="msg.delate == true" class="flex-0">Apagou a mensagem</ion-label>
 
           <ion-label class="float-status-all float-status" >
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 320a7ff46..a27d82756 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -250,20 +250,23 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   async loadFiles() {
+    try {
+      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}`);
+        }
+      });
+    } catch (error) {}
 
-    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() {
@@ -355,19 +358,23 @@ 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;
-      }
-      else{
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
-      }
-    });
+
+    try {
+     
+      this.storage.get('recordData').then((recordData) => {
+        // console.log(recordData);
+        audioFile = recordData;
+        if(recordData.value.recordDataBase64.includes('data:audio')){
+          this.audioRecorded = recordData.value.recordDataBase64;
+        }
+        else{
+          this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+        }
+      });
+    } catch (error) {}
+
 
     //Converting base64 to blob
     const base64Response = await fetch(this.audioRecorded);

From 6960333d0aab296ec55254603a198f94be6ece0d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 23 Mar 2022 22:01:59 +0100
Subject: [PATCH 03/27] save

---
 src/app/services/chat/room.service.ts         |  61 +++++-----
 .../group-messages/group-messages.page.html   | 114 +++++++++---------
 .../shared/chat/messages/messages.page.html   |  21 ++--
 src/app/shared/chat/messages/messages.page.ts |   1 -
 4 files changed, 101 insertions(+), 96 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 89d279ab6..045c4cdf8 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -360,40 +360,41 @@ export class RoomService {
    * @param id message ID
    */
    async deleteMessage(_id) {
-    
+    alert('delete!!!')
     const id = _id
 
     for (let i =0; i <= this.messages.length; i++) {
 
-      console.log('message._id == id',this.messages[i]?._id, id, i, this.messages[i]?._id == id)
-
       if(this.messages[i]?._id == id ) {
 
-          this.messages.splice(i, 1)
+        // console.log(_id,'==',this.messages[i]?._id, true)
+        this.messages.splice(i, 1)
+        
+        if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
+          const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
-          if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
-            const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
-            
-            DeleteMessageModel.create({
-              messageId: this.messages[i]._id,
-              rid: this.messages[i].rid,
-              ts: this.messages[i].ts,
-              u: this.messages[i].u,
-              needToReceiveBy: allMemberThatIsOffline
-            })
-          }
-          
-          this.messages[i].delateStatusFalse()
-          this.messages[i].delateDB()
-  
-          //Get previous last message from room
-          const previousLastMessage = this.messages.slice(-1)[0];
-  
-          this.lastMessage = previousLastMessage;
-          this.calDateDuration(previousLastMessage._updatedAt)
-          this.sortRoomList()
+          DeleteMessageModel.create({
+            messageId: this.messages[i]._id,
+            rid: this.messages[i].rid,
+            ts: this.messages[i].ts,
+            u: this.messages[i].u,
+            needToReceiveBy: allMemberThatIsOffline
+          })
+        }
+        
+        this.messages[i].delateDB()
 
+        //Get previous last message from room
+        const previousLastMessage = this.messages.slice(-1)[0];
 
+        this.lastMessage = previousLastMessage;
+        this.calDateDuration(previousLastMessage._updatedAt)
+        this.sortRoomList()
+
+        return true
+
+      } else {
+        console.log(_id,'==',this.messages[i]?._id, false)
       }
     }
 
@@ -420,18 +421,24 @@ export class RoomService {
   async sendDeleteRequest(msgId) {
 
     const message = this.messages.find((e)=>e._id = msgId)
-    message.delateStatusFalse()
+    // await message.delateStatusFalse()
 
     this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
       (response: any) => {
+
+        const message = this.messages.find((e)=>e._id = msgId)
         message.delateRequest = true
         message.save()
+
       },
       (response) => {
 
         if (response.error.error.startsWith('No message found with the id of')) {
-          // alert('not found')
+          
           this.deleteMessage(msgId)
+          const message = this.messages.find((e)=>e._id = msgId)
+          message.delateRequest = true
+
         } else {
           this.WsChatService.registerCallback({
             type: 'reConnect',
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index ec38e0b7e..356ff82c3 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -60,73 +60,71 @@
         </div>
       </div>
 
-      <div *ngIf="msg.file && msg.delate == false">
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.file.type != 'application/meeting'" >
-        <div *ngIf="msg.file.type != 'application/meeting'">
-          <div class="message-item-options d-flex justify-content-end">
-            <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
-            <mat-menu #beforeMenu="matMenu" xPosition="before">
-              <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
-            </mat-menu>
-          </div>
-          <div class="title">
-            <ion-label>{{msg.u.name}}</ion-label>
-            <span class="time">{{msg.duration}}</span>
-          </div>
-          <div class="message">
-            <div *ngIf="msg.attachments" class="message-attachments">
-              <div *ngFor="let file of msg.attachments">
-                <div *ngIf="msg.file.type == 'application/img'" (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>
-                </div>
-                <div *ngIf="msg.file.type != 'application/img'">
-                  <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>
-                          <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.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>
-                        <ion-label class="file-title">{{file.title}}</ion-label>
+      <div *ngIf="msg.file">
+        <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.file.type != 'application/meeting'" >
+          <div *ngIf="msg.file.type != 'application/meeting'">
+            <div class="message-item-options d-flex justify-content-end">
+              <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
+              <mat-menu #beforeMenu="matMenu" xPosition="before">
+                <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
+              </mat-menu>
+            </div>
+            <div class="title">
+              <ion-label>{{msg.u.name}}</ion-label>
+              <span class="time">{{msg.duration}}</span>
+            </div>
+            <div class="message">
+              <div *ngIf="msg.attachments" class="message-attachments">
+                <div *ngFor="let file of msg.attachments">
+                  <div *ngIf="msg.file.type == 'application/img'" (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>
+                  </div>
+                  <div *ngIf="msg.file.type != 'application/img'">
+                    <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>
+                            <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.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>
+                          <ion-label class="file-title">{{file.title}}</ion-label>
+                        </div>
                       </div>
+                      <div (click)="audioPreview(msg)" class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
+                        <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                          <ion-icon name="mic-outline" class="file-icon"></ion-icon>
+                          <ion-label>{{file.title}}</ion-label>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        </ion-item>
+                      </div>
+                      <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
+                        <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 != 'application/audio'">{{msg.displayType}}</span>
+                        </ion-label>
                     </div>
-                    <div (click)="audioPreview(msg)" class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
-                      <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                        <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                        <ion-label>{{file.title}}</ion-label>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
-                      </ion-item>
-                    </div>
-                    <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
-                      <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 != 'application/audio'">{{msg.displayType}}</span>
-                      </ion-label>
                   </div>
                 </div>
               </div>
+              {{last ? scrollToBottom() : ''}}
             </div>
-            {{last ? scrollToBottom() : ''}}
           </div>
         </div>
+        <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 />
+          <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
+          <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
+        </div>
       </div>
-      <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 />
-        <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
-        <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
-      </div>
-      </div>
-      <div *ngIf="msg.file && msg.delate == true">
-        Apagou a mensagem
-      </div>
+ 
       
 
       <div *ngIf="msg.t == 'r'" class="info-text">
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 03901b8ea..1cc280109 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -45,12 +45,12 @@
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label>{{msg.u.name}}</ion-label>
+          <ion-label>{{msg.u.name}} {{msg.delateRequest}}</ion-label>
           <span class="time">{{msg.duration}}</span>
         </div>
         <div class="d-flex justify-space-between">
           
-          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}} {{msg._id}}</ion-label> 
+          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}} </ion-label> 
           <ion-label *ngIf="msg.delate == true" class="flex-0">Apagou a mensagem</ion-label>
 
           <ion-label class="float-status-all float-status" >
@@ -75,7 +75,7 @@
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}}</ion-label>
+            <ion-label>{{msg.u.name}} {{msg.delateRequest}}</ion-label>
             <span class="time">{{msg.duration}}</span>
           </div>
           <div>
@@ -141,24 +141,25 @@
           </div>
         </div>
         <div class="info-meeting" *ngIf="msg.file.type == 'application/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 *ngIf="msg.delate == true" class="info-meeting-small">Apagou a mensagem</ion-label><br />
+
+          <ion-label *ngIf="msg.delate == false" class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
+          <button *ngIf="msg.delate == false" (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 />
-          <ion-label class="info-meeting-medium">
+          <ion-label *ngIf="msg.delate == false" class="info-meeting-medium">
             <ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a
             {{showDateDuration(msg.file.end_date)}}
           </ion-label><br />
-          <ion-label class="info-meeting-medium">
+          <ion-label *ngIf="msg.delate == false" class="info-meeting-medium">
             <ion-icon></ion-icon>
             <ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}
           </ion-label><br />
         </div>
       </div>
 
-      <div *ngIf="msg.file && msg.delate == true">
-        Apagou a mensagem
-      </div>
+
 
     </div>
   </div>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 561c3b6a7..c7ebdc2db 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -416,7 +416,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
   deleteMessage(msgId: string, msg:MessageService) {
-    msg.delateStatusFalse()
     this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId)
   }
 

From d05f9fdf77b3a8c57118ddf00ff576a327a17083 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 23 Mar 2022 23:00:19 +0100
Subject: [PATCH 04/27] fix bug

---
 src/app/services/chat/message.service.ts       |  2 +-
 src/app/services/chat/room.service.ts          | 18 ++++++++++--------
 .../shared/chat/messages/messages.page.html    |  6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3dd75d4a3..1b016202c 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -69,7 +69,7 @@ export class MessageService {
 
     this.channels = channels || []
     this.mentions = mentions || []
-    this.msg = msg || ""
+    this.msg = msg || " "
     this.rid = rid
     this.ts = ts
     this.u = u || { name: this.usernameToDisplayName(SessionStore.user.RochetChatUser), username: SessionStore.user.RochetChatUser, _id: ""}
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 045c4cdf8..ceedb63f6 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -257,7 +257,7 @@ export class RoomService {
           
           // alert('delete')
           // console.log(args[0], 'receive delete message::()')
-          // this.deleteMessage(args[1]?.method?._id)
+          this.deleteMessage(args[1]?.method?._id)
           
         } else {
           // alert('miss')
@@ -360,20 +360,22 @@ export class RoomService {
    * @param id message ID
    */
    async deleteMessage(_id) {
-    alert('delete!!!')
+    
     const id = _id
 
     for (let i =0; i <= this.messages.length; i++) {
 
       if(this.messages[i]?._id == id ) {
 
-        // console.log(_id,'==',this.messages[i]?._id, true)
+
+        
+        console.log(_id,'==',this.messages[i]?._id, true)
         this.messages.splice(i, 1)
         
         if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
-          DeleteMessageModel.create({
+          await DeleteMessageModel.create({
             messageId: this.messages[i]._id,
             rid: this.messages[i].rid,
             ts: this.messages[i].ts,
@@ -382,7 +384,7 @@ export class RoomService {
           })
         }
         
-        this.messages[i].delateDB()
+        await this.messages[i].delateDB()
 
         //Get previous last message from room
         const previousLastMessage = this.messages.slice(-1)[0];
@@ -420,13 +422,13 @@ export class RoomService {
 
   async sendDeleteRequest(msgId) {
 
-    const message = this.messages.find((e)=>e._id = msgId)
+    const message = this.messages.find((e)=>e._id == msgId)
     // await message.delateStatusFalse()
 
     this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
       (response: any) => {
 
-        const message = this.messages.find((e)=>e._id = msgId)
+        const message = this.messages.find((e)=>e._id == msgId)
         message.delateRequest = true
         message.save()
 
@@ -436,7 +438,7 @@ export class RoomService {
         if (response.error.error.startsWith('No message found with the id of')) {
           
           this.deleteMessage(msgId)
-          const message = this.messages.find((e)=>e._id = msgId)
+          const message = this.messages.find((e)=>e._id == msgId)
           message.delateRequest = true
 
         } else {
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 1cc280109..0b6fbaf43 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -35,7 +35,7 @@
   </ion-refresher>
   <div class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100"
-      *ngFor="let msg of  wsChatMethodsService.getDmRoom(roomId).messages; let last = last">
+      *ngFor="let msg of  wsChatMethodsService.getDmRoom(roomId).messages; index as i; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
@@ -45,7 +45,7 @@
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label>{{msg.u.name}} {{msg.delateRequest}}</ion-label>
+          <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
         </div>
         <div class="d-flex justify-space-between">
@@ -75,7 +75,7 @@
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}} {{msg.delateRequest}}</ion-label>
+            <ion-label>{{msg.u.name}}</ion-label>
             <span class="time">{{msg.duration}}</span>
           </div>
           <div>

From 7d646a4873391d882090d7300015ddbef5cc17d9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 23 Mar 2022 23:01:03 +0100
Subject: [PATCH 05/27] fixe bug

---
 src/app/services/chat/room.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index ceedb63f6..113fd11f4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -423,7 +423,7 @@ export class RoomService {
   async sendDeleteRequest(msgId) {
 
     const message = this.messages.find((e)=>e._id == msgId)
-    // await message.delateStatusFalse()
+    await message.delateStatusFalse()
 
     this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
       (response: any) => {

From c369273830c8cd046a0ce7209c40bf6f04c8ab10 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 23 Mar 2022 23:01:40 +0100
Subject: [PATCH 06/27] fixe bug

---
 src/app/services/chat/room.service.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 113fd11f4..5e4028fcd 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -428,7 +428,6 @@ export class RoomService {
     this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
       (response: any) => {
 
-        const message = this.messages.find((e)=>e._id == msgId)
         message.delateRequest = true
         message.save()
 
@@ -438,7 +437,7 @@ export class RoomService {
         if (response.error.error.startsWith('No message found with the id of')) {
           
           this.deleteMessage(msgId)
-          const message = this.messages.find((e)=>e._id == msgId)
+
           message.delateRequest = true
 
         } else {

From b80c2070f4a47646b357f38dd6102ebec6ebc561 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 23 Mar 2022 23:08:49 +0100
Subject: [PATCH 07/27] fixe bug

---
 src/app/services/chat/message.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 1b016202c..3dd75d4a3 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -69,7 +69,7 @@ export class MessageService {
 
     this.channels = channels || []
     this.mentions = mentions || []
-    this.msg = msg || " "
+    this.msg = msg || ""
     this.rid = rid
     this.ts = ts
     this.u = u || { name: this.usernameToDisplayName(SessionStore.user.RochetChatUser), username: SessionStore.user.RochetChatUser, _id: ""}

From 71ecf0ded36df3b35505c07551e4995598c671de Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 24 Mar 2022 16:28:47 +0100
Subject: [PATCH 08/27] save

---
 src/app/services/chat/room.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 5e4028fcd..bbed55b36 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -430,6 +430,7 @@ export class RoomService {
 
         message.delateRequest = true
         message.save()
+        this.deleteMessage(msgId)
 
       },
       (response) => {
@@ -437,7 +438,6 @@ export class RoomService {
         if (response.error.error.startsWith('No message found with the id of')) {
           
           this.deleteMessage(msgId)
-
           message.delateRequest = true
 
         } else {

From 02950aeca069336410ff5d1d928cec70914ed5c8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 24 Mar 2022 16:30:18 +0100
Subject: [PATCH 09/27] fix

---
 src/app/services/chat/message.service.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3dd75d4a3..eb57debc5 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -110,8 +110,6 @@ export class MessageService {
         this.displayType = this.file.type.replace('application/','').toUpperCase()
       }
 
-      this.downloadFileMsg()
-
     }
 
     this.calDateDuration()

From 7ef93a2aff1e512f8fbbee15be4bb683d6268ee3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 24 Mar 2022 17:40:14 +0100
Subject: [PATCH 10/27] fix chat rooms list

---
 .../group-messages/group-messages.page.ts     | 69 ++++++++++---------
 src/app/pages/chat/messages/messages.page.ts  | 12 ++--
 src/app/services/auth.service.ts              |  2 +
 src/app/services/chat/message.service.ts      |  1 +
 src/app/services/chat/room.service.ts         | 14 ++--
 .../group-messages/group-messages.page.ts     | 12 ++--
 src/app/shared/chat/messages/messages.page.ts | 12 ++--
 7 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 0fb93ec00..c2dd76e6e 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -254,11 +254,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     try {
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData.value.recordDataBase64.includes('data:audio')){
-          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+        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}`);
+          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
     } catch (error) {}
@@ -266,6 +266,36 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   }
 
+  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);
+        const fileName = new Date().getTime() + ".mp3";
+        //Save file
+        await this.storage.set('fileName',fileName)
+        this.storage.set('recordData',result).then(() => {
+          console.log('Audio recorded saved', result);
+
+          setTimeout(async () => {
+            this.loadFiles();
+          }, 1000);
+        })
+      }
+    })
+    
+  }
+
   startRecording() {
     console.log('Recording');
 
@@ -277,32 +307,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     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);
-        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 deleteRecording(){
     this.storage.remove('fileName');
@@ -458,11 +463,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
-      if(recordData.value.recordDataBase64.includes('data:audio')){
-        this.audioRecorded = recordData.value.recordDataBase64;
+      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData?.value?.recordDataBase64;
       }
       else{
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
     //Converting base64 to blob
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 110e45d2c..236932ab4 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -208,11 +208,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     try {
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData.value.recordDataBase64.includes('data:audio')){
-          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+        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}`);
+          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
     } catch (error) {}
@@ -397,11 +397,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
-      if(recordData.value.recordDataBase64.includes('data:audio')){
-        this.audioRecorded = recordData.value.recordDataBase64;
+      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData?.value?.recordDataBase64;
       }
       else{
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
     //Converting base64 to blob
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index a9c989a6c..779457497 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -169,6 +169,8 @@ export class AuthService {
               try {
                 let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
                 message.file.guid = guid.path
+
+                console.log('========================================',guid)
                 // await this.storage.set(guid.path, message.file.image_url).then(() => {
                 //   console.log('add picture to chat IMAGE SAVED')
                 //   // message.getFileFromDb()
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index eb57debc5..3c5e5e934 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -245,6 +245,7 @@ export class MessageService {
           ts: this.attachments[0].ts
         }
         
+        console.log(this.attachments)
         // save the changes to the storage
         this.save()
       }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index bbed55b36..3d0ebedef 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -371,6 +371,13 @@ export class RoomService {
         
         console.log(_id,'==',this.messages[i]?._id, true)
         this.messages.splice(i, 1)
+
+        //Get previous last message from room
+        const previousLastMessage = this.messages.slice(-1)[0];
+        this.lastMessage = previousLastMessage;
+        
+        this.calDateDuration(previousLastMessage._updatedAt)
+        this.sortRoomList()
         
         if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
@@ -386,13 +393,6 @@ export class RoomService {
         
         await this.messages[i].delateDB()
 
-        //Get previous last message from room
-        const previousLastMessage = this.messages.slice(-1)[0];
-
-        this.lastMessage = previousLastMessage;
-        this.calDateDuration(previousLastMessage._updatedAt)
-        this.sortRoomList()
-
         return true
 
       } else {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 7687b6519..8c340283a 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -281,11 +281,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData.value.recordDataBase64.includes('data:audio')){
-          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+        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}`);
+          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
     } catch (error) {}
@@ -447,11 +447,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
-      if(recordData.value.recordDataBase64.includes('data:audio')){
-        this.audioRecorded = recordData.value.recordDataBase64;
+      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData?.value?.recordDataBase64;
       }
       else{
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
    
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index c7ebdc2db..3e3b4afd3 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -256,11 +256,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData.value.recordDataBase64.includes('data:audio')){
-          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+        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}`);
+          this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
     } catch (error) {}
@@ -382,11 +382,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
-      if(recordData.value.recordDataBase64.includes('data:audio')){
-        this.audioRecorded = recordData.value.recordDataBase64;
+      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData?.value?.recordDataBase64;
       }
       else{
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
     //Converting base64 to blob

From c9267f808ec2b26b160337ca2c87f2e64fbf6c8b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 24 Mar 2022 17:58:20 +0100
Subject: [PATCH 11/27] save

---
 src/environments/environment.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index cd809f519..8737cf097 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',

From 7bb81f17eaad4a6750bd4889630524367bee85ae Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 25 Mar 2022 11:05:51 +0100
Subject: [PATCH 12/27] save

---
 src/environments/environment.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8737cf097..934547196 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,10 +6,11 @@ export const environment = {
   production: false,
   //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
-  /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
+  /* apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
+  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
+  //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
   defaultuserpwd: 'tabteste@006', //tabteste@006,

From 160015c878e37a3eb38acbb9b945925370f8bcdc Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 25 Mar 2022 12:25:17 +0100
Subject: [PATCH 13/27] comment add file option

---
 .../group-messages/group-messages.page.html    |  8 ++++----
 .../shared/chat/messages/messages.page.html    | 18 +++++++++---------
 .../chat-options-popover.page.html             |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 356ff82c3..72961fdaa 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -124,8 +124,8 @@
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
       </div>
- 
-      
+
+
 
       <div *ngIf="msg.t == 'r'" class="info-text">
         <ion-label>Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
@@ -214,9 +214,9 @@
           <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
-          </ion-fab-button>
+          </ion-fab-button> -->
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 0b6fbaf43..b7f8692cf 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -49,12 +49,12 @@
           <span class="time">{{msg.duration}}</span>
         </div>
         <div class="d-flex justify-space-between">
-          
-          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}} </ion-label> 
+
+          <ion-label *ngIf="msg.delate == false" class="flex-0">{{msg.msg}} </ion-label>
           <ion-label *ngIf="msg.delate == true" class="flex-0">Apagou a mensagem</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>
@@ -84,7 +84,7 @@
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
                   <img src={{msg.attachments[0].image_url}} alt="image">
                   <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>
@@ -127,7 +127,7 @@
                       <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>
@@ -163,7 +163,7 @@
 
     </div>
   </div>
-  
+
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
     <ion-fab-button *ngIf="scrollToBottomBtn" (click)="scrollToBottomClicked()" color="light" size="small">
       <ion-icon name="chevron-down"></ion-icon>
@@ -174,7 +174,7 @@
 
 
 <ion-footer (click)="wsChatMethodsService.getDmRoom(roomId).sendReadMessage()">
-  
+
   <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getDmRoom(roomId).name"
@@ -198,9 +198,9 @@
           <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
-          </ion-fab-button>
+          </ion-fab-button> -->
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 33bebb685..88a4ba92e 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -7,7 +7,7 @@
   </div>
   <div class="buttons">
     <button  (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
-    <button  (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
+    <!-- <button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button> -->
     <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>

From f2cf3163299e38a73db9a806f4a421e6b391f3a0 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Mar 2022 14:32:15 +0100
Subject: [PATCH 14/27] save

---
 src/app/services/chat/message.service.ts |  2 +-
 src/app/services/chat/room.service.ts    |  6 ++----
 src/environments/environment.ts          | 26 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3c5e5e934..908bfd4cf 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -143,7 +143,7 @@ export class MessageService {
 
       this.uploadingFile = false
 
-      if(uploadSuccessfully || this.hasSendAttachment == false) {
+      if(uploadSuccessfully) {
         this.hasSendAttachment = true
         this.errorUploadingAttachment = false
         this.temporaryData = {}
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 3d0ebedef..138093304 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -367,8 +367,6 @@ export class RoomService {
 
       if(this.messages[i]?._id == id ) {
 
-
-        
         console.log(_id,'==',this.messages[i]?._id, true)
         this.messages.splice(i, 1)
 
@@ -382,7 +380,7 @@ export class RoomService {
         if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
-          await DeleteMessageModel.create({
+          DeleteMessageModel.create({
             messageId: this.messages[i]._id,
             rid: this.messages[i].rid,
             ts: this.messages[i].ts,
@@ -391,7 +389,7 @@ export class RoomService {
           })
         }
         
-        await this.messages[i].delateDB()
+        this.messages[i].delateDB()
 
         return true
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index cd809f519..b3c070ea0 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,17 +3,31 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
+
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
-  /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
+
+  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+
+  /* apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
+
+  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+
+  apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
+
+  //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
+
   domain: 'gabinetedigital.local', //gabinetedigital.local
+
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
+
   defaultuserpwd: 'tabteste@006', //tabteste@006,
+
   chatOffline: true
+
 };
 
 /*

From e2721f10919da8d76e7eccdcda7923fb3d2b3b1a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Mar 2022 17:39:51 +0100
Subject: [PATCH 15/27] fix

---
 src/app/services/chat/message.service.ts | 12 +++++++-----
 src/app/services/chat/room.service.ts    | 11 ++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 908bfd4cf..838c0ea51 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -77,17 +77,21 @@ export class MessageService {
     this._id = _id
     this._updatedAt = _updatedAt || new Date().getTime()
     this.file = file
-    this.attachments = attachments
     this.temporaryData = temporaryData
     this.localReference = localReference || null
     this.id = id
     this.delate = delate
     this.delateRequest = delateRequest
 
+    if(this.attachments?.length >= 1 && attachments?.length >= 1) {
+      this.attachments[0] = Object.assign(this.attachments[0], attachments[0])
+    } else {
+      this.attachments = attachments
+    }
+    
     this.viewed =  [...new Set([...viewed,...this.viewed])];
     this.received =   [...new Set([...received,...this.received])];
-
-
+    
     if(!this.ts) {
       this.offline = true
       this.messageSend = false
@@ -105,11 +109,9 @@ export class MessageService {
     }
 
     if(this.hasFile) {
-      
       if(this.file.type != 'application/webtrix') {
         this.displayType = this.file.type.replace('application/','').toUpperCase()
       }
-
     }
 
     this.calDateDuration()
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 138093304..5dd8c4a0c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -238,7 +238,6 @@ export class RoomService {
 
         const args = message.fields.args
 
-        // alert(JSON.stringify(args))
 
            
         if (typeof args[1] != 'object') {
@@ -367,8 +366,7 @@ export class RoomService {
 
       if(this.messages[i]?._id == id ) {
 
-        console.log(_id,'==',this.messages[i]?._id, true)
-        this.messages.splice(i, 1)
+        
 
         //Get previous last message from room
         const previousLastMessage = this.messages.slice(-1)[0];
@@ -377,7 +375,7 @@ export class RoomService {
         this.calDateDuration(previousLastMessage._updatedAt)
         this.sortRoomList()
         
-        if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
+        if (SessionStore.user.RochetChatUser == this.messages[i]?.u?.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
           DeleteMessageModel.create({
@@ -389,7 +387,10 @@ export class RoomService {
           })
         }
         
-        this.messages[i].delateDB()
+        this.messages[i]?.delateDB()
+
+        console.log(_id,'==',this.messages[i]?._id, true)
+        this.messages.splice(i, 1)
 
         return true
 

From 313314f3a5843b3deca09314dc82b6965bc892b4 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 26 Mar 2022 08:52:33 +0100
Subject: [PATCH 16/27] fix

---
 src/app/services/chat/room.service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 5dd8c4a0c..910c80f1e 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -270,7 +270,12 @@ export class RoomService {
 
 
   getRoomMembersIds(): string[] {
-    return this.members.map((user)=> user._id)
+    try {
+      return this.members.map((user)=> user._id)
+    } catch(error) {
+      return []
+    }
+    
   }
 
   getAllMemberThatIsNotOffline(): string[] {

From ee496965e118f63b7bfb2214155084bce104746b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Sun, 27 Mar 2022 15:18:54 +0100
Subject: [PATCH 17/27] fix bug

---
 .../group-messages/group-messages.page.html   |  5 ++-
 .../group-messages/group-messages.page.ts     |  4 +--
 src/app/services/chat/message.service.ts      | 35 ++++++++-----------
 .../group-messages/group-messages.page.html   |  6 +++-
 .../group-messages/group-messages.page.ts     |  6 ++--
 .../shared/chat/messages/messages.page.html   |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index e8b83b138..28b5366ad 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -102,7 +102,10 @@
         <div class="message">
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments">
-              <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
+              <div *ngIf="msg.file.type == 'application/img' && !msg.attachments[0].image_url">
+                NOT UPLOADED
+              </div>
+              <div *ngIf="msg.file.type == 'application/img' && 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>
               </div>
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index c2dd76e6e..d10e4cf45 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -276,7 +276,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     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;
@@ -293,7 +293,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         })
       }
     })
-    
+
   }
 
   startRecording() {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3c5e5e934..453c0f899 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -24,10 +24,10 @@ export class MessageService {
   msg = ''
   rid = ''
   ts = {}
-  
-  u = { 
-    name: '', 
-    username: '', 
+
+  u = {
+    name: '',
+    username: '',
     _id: ""
   }
 
@@ -105,7 +105,7 @@ export class MessageService {
     }
 
     if(this.hasFile) {
-      
+
       if(this.file.type != 'application/webtrix') {
         this.displayType = this.file.type.replace('application/','').toUpperCase()
       }
@@ -129,7 +129,7 @@ export class MessageService {
     if(!this.hasFile) {
 
       const params =  {roomId:this.rid, msg:this.msg, localReference: this.localReference}
-      
+
       await this.sendRequest(params)
 
     } else {
@@ -143,7 +143,7 @@ export class MessageService {
 
       this.uploadingFile = false
 
-      if(uploadSuccessfully || this.hasSendAttachment == false) {
+      if(uploadSuccessfully ) {
         this.hasSendAttachment = true
         this.errorUploadingAttachment = false
         this.temporaryData = {}
@@ -169,7 +169,7 @@ export class MessageService {
         return new Promise((resolve, reject)=>{
           reject(false)
         })
-        
+
       }
 
     }
@@ -193,13 +193,8 @@ export class MessageService {
         this.WsChatService.registerCallback({
           type: 'reConnect',
           funx: async ()=> {
-            
-            this.WsChatService.send(params).then(({message, requestId}) => {
-              let ChatMessage = message.result
-              this.messageSend = true
-              this.redefinedMessage(ChatMessage)
-  
-            })
+
+            this.sendRequest(params)
             return true
           }
         })
@@ -209,7 +204,7 @@ export class MessageService {
 
   async redefinedMessage(ChatMessage , update = true) {
     ChatMessage = this.NfService.fix_updatedAt(ChatMessage)
-    
+
     const message = this.getChatObj()
 
     ChatMessage = Object.assign(message, ChatMessage)
@@ -244,7 +239,7 @@ export class MessageService {
           title_link_download: this.attachments[0].title_link_download,
           ts: this.attachments[0].ts
         }
-        
+
         console.log(this.attachments)
         // save the changes to the storage
         this.save()
@@ -264,7 +259,7 @@ export class MessageService {
   }
 
   async delateDB() {
-    
+
     // alert('delete data')
     const message = await MessageModel.get({_id: this._id})
     await message.delete()
@@ -284,8 +279,8 @@ export class MessageService {
     return {
       channels: this.channels,
       mentions: this.mentions,
-      //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.RochetChatUser), 
-      msg:this.msg, 
+      //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.RochetChatUser),
+      msg:this.msg,
       rid: this.rid,
       ts: this.ts,
       u: this.u,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 72961fdaa..e9cf98ea0 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -76,7 +76,11 @@
             <div class="message">
               <div *ngIf="msg.attachments" class="message-attachments">
                 <div *ngFor="let file of msg.attachments">
-                  <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
+                  <div *ngIf="msg.file.type == 'application/img' && !msg.attachments[0].image_url">
+                    NOT UPLOADED
+                  </div>
+                  <div *ngIf="msg.file.type == 'application/img' &&
+                  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>
                   </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 8c340283a..829ce53d3 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -278,7 +278,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       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')){
@@ -290,7 +290,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       });
     } catch (error) {}
 
-    
+
   }
 
   startRecording() {
@@ -454,7 +454,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
-   
+
     //Converting base64 to blob
     const encodedData = btoa(this.audioRecorded);
     const blob =  this.base64toBlob(encodedData, recordData.value.mimeType)
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index b7f8692cf..7ec469275 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -84,7 +84,6 @@
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
                   <img src={{msg.attachments[0].image_url}} alt="image">
                   <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>
@@ -144,6 +143,7 @@
 
           <ion-label *ngIf="msg.delate == true" class="info-meeting-small">Apagou a mensagem</ion-label><br />
 
+
           <ion-label *ngIf="msg.delate == false" class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button *ngIf="msg.delate == false" (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>

From 060299c71f6447ca3a5f01aee59f5b6111a3571a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 27 Mar 2022 15:30:57 +0100
Subject: [PATCH 18/27] fix

---
 src/app/models/beast-orm.ts              | 14 ++++++-------
 src/app/services/chat/message.service.ts |  7 +------
 src/app/services/chat/ws-chat.service.ts |  2 +-
 src/environments/environment.ts          | 26 ++++++------------------
 4 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index 49809e81f..b2a6b9b39 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -1,4 +1,4 @@
-import { models } from 'beast-orm'
+import { models } from '../../plugin/beast-orm/dist/src/'
 import { AESEncrypt } from '../services/aesencrypt.service'
 
 const _AESEncrypt  = new AESEncrypt() 
@@ -10,25 +10,25 @@ export class MessageModel extends models.Model {
 	mentions =  ArrayField()
 	msg =  models.CharField()
 	rid =  models.CharField()
-	ts =  models.CharField()
+	ts =  JsonField()
 	u =  JsonField()
 	_id =  models.CharField({unique:true})
-	_updatedAt =  models.CharField()
+	_updatedAt =  models.IntegerField()
 	messageSend =  models.BooleanField()
 	offline =  models.BooleanField()
 	viewed =  ArrayField() 
 	received =  ArrayField()
 	localReference =  models.CharField({blank:true})
-	attachments =  ArrayField()
-	file =  ArrayField()
+	attachments =  ArrayField({blank:true})
+	file =  JsonField({blank:true})
 
 }
 
 export class DeleteMessageModel extends models.Model {
 
-	messageId = models.IntegerField()
+	messageId = models.CharField()
 	rid =  models.CharField()
-	ts =  models.CharField()
+	ts =  JsonField()
 	u =  JsonField()
 	needToReceiveBy = ArrayField()
 
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 838c0ea51..b1f3efee0 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -196,12 +196,7 @@ export class MessageService {
           type: 'reConnect',
           funx: async ()=> {
             
-            this.WsChatService.send(params).then(({message, requestId}) => {
-              let ChatMessage = message.result
-              this.messageSend = true
-              this.redefinedMessage(ChatMessage)
-  
-            })
+            this.send()
             return true
           }
         })
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 75df35da7..bfb47a6d9 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -728,7 +728,7 @@ export class WsChatService {
         this.wsMsgQueue[requestId] = {message, requestId, loginRequired}
       } else {
         let messageStr = JSON.stringify(message)
-        console.log('messageStr', messageStr)
+        // console.log('messageStr', messageStr)
 
         this.socket.send(messageStr)
       }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b3c070ea0..2c9100ef6 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,31 +3,17 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-
   production: false,
-
-  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-
-  /* apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-
-  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
-
-  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
-
-  apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
-
-  //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
-
+  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
+  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local
-
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
-
   defaultuserpwd: 'tabteste@006', //tabteste@006,
-
   chatOffline: true
-
 };
 
 /*

From 3bcbacae9a6967130aac8b5361846be3ef108ced Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 27 Mar 2022 20:09:30 +0100
Subject: [PATCH 19/27] update version

---
 package-lock.json           | 6 +++---
 package.json                | 2 +-
 src/app/models/beast-orm.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6584646ed..bd3ac05e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6230,9 +6230,9 @@
       }
     },
     "beast-orm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.0.tgz",
-      "integrity": "sha512-wSholUbFMteq50U3QM0o4H3xY9IpevpG9MPlq0ZK8yRtRkIuKf/YoZW4QUwFOfY72PJbNzp68z7Ln/iFhpOxDg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.1.tgz",
+      "integrity": "sha512-6RNJuVs4Kk4T/nb+Jbtwi5AR+Fd109yuoM0us/eZkuEPPG/QTst4wrukOIH3cf1HZjtcpsZJ7qySNw2U0ZEl2Q=="
     },
     "big-integer": {
       "version": "1.6.49",
diff --git a/package.json b/package.json
index 958407be1..07e7071b7 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "angular-svg-icon": "^12.0.0",
     "angular-tag-cloud-module": "^5.2.2",
     "base64-js": "^1.5.1",
-    "beast-orm": "^1.0.0",
+    "beast-orm": "^1.0.1",
     "bootstrap": "^4.5.0",
     "build": "0.1.4",
     "capacitor-voice-recorder": "^2.1.0",
diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index b2a6b9b39..b5170eb73 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -1,4 +1,4 @@
-import { models } from '../../plugin/beast-orm/dist/src/'
+import { models } from 'beast-orm'
 import { AESEncrypt } from '../services/aesencrypt.service'
 
 const _AESEncrypt  = new AESEncrypt() 

From dd488c32e3a87db61c3c4942dded89697b064db0 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 27 Mar 2022 20:10:57 +0100
Subject: [PATCH 20/27] fix

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 07e7071b7..eb0f54efe 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "angular-svg-icon": "^12.0.0",
     "angular-tag-cloud-module": "^5.2.2",
     "base64-js": "^1.5.1",
-    "beast-orm": "^1.0.1",
+    "beast-orm": "1.0.1",
     "bootstrap": "^4.5.0",
     "build": "0.1.4",
     "capacitor-voice-recorder": "^2.1.0",

From 80ddf8c764440c35ef786e32660a497cf0aa3e36 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 28 Mar 2022 13:34:01 +0100
Subject: [PATCH 21/27] save

---
 src/app/home/home.page.html                   | 74 +++++++++++--------
 src/app/home/home.page.ts                     | 10 ++-
 src/app/services/auth.service.ts              | 11 ++-
 .../functions/initials.service.spec.ts        | 16 ++++
 .../services/functions/initials.service.ts    | 18 +++++
 src/environments/environment.ts               |  9 ++-
 6 files changed, 99 insertions(+), 39 deletions(-)
 create mode 100644 src/app/services/functions/initials.service.spec.ts
 create mode 100644 src/app/services/functions/initials.service.ts

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 20503ed16..c340f97bc 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -1,39 +1,51 @@
 
 <ion-tabs class="tab">
   <ion-tab-bar class="bottoms" slot="bottom">
-    <ion-tab-button tab="events" [class.active]="pathname === '/home/events' ">
-      <!-- <ion-icon name="home"></ion-icon> -->
-      <ion-icon *ngIf="pathname != '/home/events'" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
-      <ion-icon *ngIf="pathname == '/home/events'" class="nav-icon" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon>
-      <!-- <ion-badge color="danger">{{toDayEventStorage.eventsList.length + expedienteGdStore.count}}</ion-badge> -->
-      <ion-label>Início</ion-label>
-    </ion-tab-button>
 
-    <ion-tab-button tab="agenda" [class.active]="pathname === '/home/agenda' ">
-      <!-- <ion-icon name="calendar"></ion-icon> -->
-      <ion-icon *ngIf="pathname != '/home/agenda'" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
-      <ion-icon *ngIf="pathname == '/home/agenda'" class="nav-icon" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon>
-      <ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label>
-    </ion-tab-button>
-    <ion-tab-button (click)="goto('/home/gabinete-digital')" [class.active]="pathname === '/home/gabinete-digital' ">
-      <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
-      <ion-icon *ngIf="pathname != '/home/gabinete-digital'" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
-      <ion-icon *ngIf="pathname == '/home/gabinete-digital'" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
-      <!-- <ion-badge color="danger" *ngIf="!p.userRole(['PR'])" >{{ documentCounterService.mdTotalDocument }}</ion-badge>
-      <ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ documentCounterService.prTotalDocument }}</ion-badge> -->
-      <ion-label>Gabinete</ion-label>
-    </ion-tab-button>
 
-    <ion-tab-button tab="publications" [class.active]="pathname === '/home/publications' ">
-      <ion-icon *ngIf="pathname != '/home/publications'" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
-      <ion-icon *ngIf="pathname == '/home/publications'" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
-      <ion-label style="margin-bottom: 2px;" class="overflow-visible">Ações</ion-label>
-    </ion-tab-button>
-    <ion-tab-button tab="chat" [class.active]="pathname === '/home/chat' ">
-      <ion-icon *ngIf="pathname != '/home/chat'" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
-      <ion-icon *ngIf="pathname == '/home/chat'" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
-      <ion-label>Chat</ion-label>
-    </ion-tab-button>
+      <ion-tab-button tab="events" [class.active]="pathname === '/home/events'">
+        <!-- <ion-icon name="home"></ion-icon> -->
+        <ion-icon *ngIf="pathname != '/home/events'" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
+        <ion-icon *ngIf="pathname == '/home/events'" class="nav-icon" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon>
+        <!-- <ion-badge color="danger">{{toDayEventStorage.eventsList.length + expedienteGdStore.count}}</ion-badge> -->
+        <ion-label>Início</ion-label>
+      </ion-tab-button>
+
+      <div *ngFor="let permission of user.UserPermissions">
+      <ion-tab-button *ngIf="permission == 530" tab="agenda" [class.active]="pathname === '/home/agenda' ">
+        <!-- <ion-icon name="calendar"></ion-icon> -->
+        <ion-icon *ngIf="pathname != '/home/agenda'" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
+        <ion-icon *ngIf="pathname == '/home/agenda'" class="nav-icon" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon>
+        <ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label>
+      </ion-tab-button>
+      </div>
+
+      <div *ngFor="let permission of user.UserPermissions">
+      <ion-tab-button *ngIf="permission == 531" (click)="goto('/home/gabinete-digital')" [class.active]="pathname === '/home/gabinete-digital' ">
+        <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
+        <ion-icon *ngIf="pathname != '/home/gabinete-digital'" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
+        <ion-icon *ngIf="pathname == '/home/gabinete-digital'" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
+        <!-- <ion-badge color="danger" *ngIf="!p.userRole(['PR'])" >{{ documentCounterService.mdTotalDocument }}</ion-badge>
+        <ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ documentCounterService.prTotalDocument }}</ion-badge> -->
+        <ion-label>Gabinete</ion-label>
+      </ion-tab-button>
+    </div>
+    <div *ngFor="let permission of user.UserPermissions">
+      <ion-tab-button *ngIf="permission == 534" tab="publications" [class.active]="pathname === '/home/publications' ">
+        <ion-icon *ngIf="pathname != '/home/publications'" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
+        <ion-icon *ngIf="pathname == '/home/publications'" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
+        <ion-label style="margin-bottom: 2px;" class="overflow-visible">Ações</ion-label>
+      </ion-tab-button>
+    </div>
+
+    <div *ngFor="let permission of user.UserPermissions">
+      <ion-tab-button *ngIf="permission == 541" tab="chat" [class.active]="pathname === '/home/chat' ">
+        <ion-icon *ngIf="pathname != '/home/chat'" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
+        <ion-icon *ngIf="pathname == '/home/chat'" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
+        <ion-label>Chat</ion-label>
+      </ion-tab-button>
+    </div>
+
 
   </ion-tab-bar>
 </ion-tabs>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a55b4459b..a6e8ca9d9 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -30,6 +30,7 @@ import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
 import { NativeNotificationService } from 'src/app/services/native-notification.service';
+import { UserSession } from '../models/user.model';
 
 @Component({
   selector: 'app-home',
@@ -79,6 +80,7 @@ export class HomePage implements OnInit {
 
   status: string = "";
   audioName: string = "";
+  public user: UserSession;
 
   constructor(
     private router: Router,
@@ -102,12 +104,16 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     public RouteService: RouteService,
     private WsChatService: WsChatService,
-    private NativeNotificationService: NativeNotificationService,) {
+    private NativeNotificationService: NativeNotificationService) {
+
+      if (SessionStore.exist) {
+        this.user = SessionStore.user;
+      }
 
     /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.NativeNotificationService.askForPermission()
-    
+
     this.router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
       document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 779457497..b2790df57 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -18,6 +18,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { RoomService } from './chat/room.service';
 import { Storage } from '@ionic/storage';
+import { InitialsService } from './functions/initials.service';
 
 @Injectable({
   providedIn: 'root'
@@ -44,7 +45,8 @@ export class AuthService {
     private NfService:NfService,
     private processesService: ProcessesService,
     private AttachmentsService: AttachmentsService,
-    private storage: Storage ) {
+    private storage: Storage,
+    private initialsService: InitialsService ) {
 
       this.headers = new HttpHeaders();
 
@@ -74,6 +76,8 @@ export class AuthService {
 
       try {
         response = await this.http.post<LoginUserRespose>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
+        console.log(response);
+
         if(saveSession) {
           this.SetSession(response, user)
         }
@@ -94,6 +98,9 @@ export class AuthService {
         } else if(session.RoleID == 100000011) {
           session.Profile = 'MDGPR'
         }
+        else{
+          session.Profile = this.initialsService.getInitials(session.FullName);
+        }
 
         session.Password = user.password
         session.RochetChatUser = user.username.split('@')[0]
@@ -149,7 +156,7 @@ export class AuthService {
 
         this.WsChatService.connect();
         this.WsChatService.login().then((message: any) => {
-          
+
           SessionStore.user.RochetChatUserId = message.result.id
           SessionStore.save()
           this.WsChatService.setStatus('online')
diff --git a/src/app/services/functions/initials.service.spec.ts b/src/app/services/functions/initials.service.spec.ts
new file mode 100644
index 000000000..7ecc24a60
--- /dev/null
+++ b/src/app/services/functions/initials.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { InitialsService } from './initials.service';
+
+describe('InitialsService', () => {
+  let service: InitialsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(InitialsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/functions/initials.service.ts b/src/app/services/functions/initials.service.ts
new file mode 100644
index 000000000..3615f4124
--- /dev/null
+++ b/src/app/services/functions/initials.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class InitialsService {
+
+  constructor() { }
+
+  getInitials(name:string){
+    let names = name.split(' '),
+    initials = names[0].substring(0, 1).toUpperCase();
+    if (names.length > 1) {
+      initials += names[names.length - 1].substring(0, 1).toUpperCase();
+    }
+    return initials;
+    }
+}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 2c9100ef6..79baa6103 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,11 +4,12 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  /* apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local

From 18797a43ffa862d7e587dac2ffddb42309ced30d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 14:12:00 +0100
Subject: [PATCH 22/27] fix

---
 src/app/models/beast-orm.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index b5170eb73..a09954a36 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -10,9 +10,9 @@ export class MessageModel extends models.Model {
 	mentions =  ArrayField()
 	msg =  models.CharField()
 	rid =  models.CharField()
-	ts =  JsonField()
+	ts =  JsonField({blank:true})
 	u =  JsonField()
-	_id =  models.CharField({unique:true})
+	_id =  models.CharField({unique:true, blank:true})
 	_updatedAt =  models.IntegerField()
 	messageSend =  models.BooleanField()
 	offline =  models.BooleanField()

From 420b203c0c70dea473cc7e8be474b3c18eb47275 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 28 Mar 2022 15:46:07 +0100
Subject: [PATCH 23/27] add permission logic to nav bar.

---
 src/app/Rules/despacho.service.ts             |  2 +-
 src/app/Rules/pedido.service.ts               | 10 ++--
 src/app/home/home.page.html                   | 19 ++------
 src/app/home/home.page.ts                     |  7 ++-
 .../create-process/create-process.page.ts     |  2 +-
 .../document-detail/document-detail.page.ts   |  4 +-
 src/app/models/permissionList.ts              |  6 +++
 src/app/models/user.model.ts                  | 12 +++--
 .../despachos/despacho/despacho.page.ts       |  6 +--
 .../expediente-detail.page.ts                 | 12 ++---
 .../gabinete-digital.page.html                |  2 +-
 .../gabinete-digital/gabinete-digital.page.ts | 19 ++++----
 .../pedidos/pedido/pedido.page.ts             |  2 +-
 src/app/services/permission.service.spec.ts   |  2 +-
 .../{worker => }/permission.service.ts        | 24 ++++++++--
 src/app/services/rules/event.service.ts       |  4 +-
 src/app/shared/header/header.page.html        |  8 ++--
 src/app/shared/header/header.page.ts          |  2 +
 .../despachos-options.page.ts                 | 40 ++++++++--------
 .../despachos-pr-options.page.ts              | 48 +++++++++----------
 .../event-details-documents-options.page.ts   |  2 +-
 .../opts-expediente/opts-expediente.page.ts   |  2 +-
 .../request-options/request-options.page.ts   |  2 +-
 .../searched-document-options.page.ts         |  2 +-
 24 files changed, 130 insertions(+), 109 deletions(-)
 create mode 100644 src/app/models/permissionList.ts
 rename src/app/services/{worker => }/permission.service.ts (58%)

diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts
index 2e41e5305..f3f2d5cc1 100644
--- a/src/app/Rules/despacho.service.ts
+++ b/src/app/Rules/despacho.service.ts
@@ -6,7 +6,7 @@ import { ProcessesService } from '../services/processes.service';
 import { DespachoStore } from '../store/despacho-store.service';
 import { LoaderService } from 'src/app/store/loader.service'
 import { SessionStore } from '../store/session.service';
-import { PermissionService } from '../services/worker/permission.service';
+import { PermissionService } from '../services/permission.service';
 import { SortService } from '../services/functions/sort.service';
 
 @Injectable({
diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts
index b2dc88092..848b5d728 100644
--- a/src/app/Rules/pedido.service.ts
+++ b/src/app/Rules/pedido.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ProcessesService } from '../services/processes.service';
-import { PermissionService } from '../services/worker/permission.service';
+import { PermissionService } from '../services/permission.service';
 
 @Injectable({
   providedIn: 'root'
@@ -22,10 +22,10 @@ export class PedidoService {
 
   createDeferimento(body: any) {
 
-    if(this.p.userRole(['PR'])) { 
+    if(this.p.userRole(['PR'])) {
       throw('PR cant create Deferimento')
     }
-    
+
     return this.processes.postDeferimento(body)
   }
 
@@ -57,8 +57,8 @@ export class PedidoService {
   }
 
   arquivar({note = "", serialNumber, documents= [] }) {
-    let body = { 
-      "serialNumber": serialNumber, 
+    let body = {
+      "serialNumber": serialNumber,
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index c340f97bc..a923fb919 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -2,7 +2,6 @@
 <ion-tabs class="tab">
   <ion-tab-bar class="bottoms" slot="bottom">
 
-
       <ion-tab-button tab="events" [class.active]="pathname === '/home/events'">
         <!-- <ion-icon name="home"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/events'" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
@@ -11,17 +10,14 @@
         <ion-label>Início</ion-label>
       </ion-tab-button>
 
-      <div *ngFor="let permission of user.UserPermissions">
-      <ion-tab-button *ngIf="permission == 530" tab="agenda" [class.active]="pathname === '/home/agenda' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda])" tab="agenda" [class.active]="pathname === '/home/agenda' ">
         <!-- <ion-icon name="calendar"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/agenda'" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/agenda'" class="nav-icon" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon>
         <ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label>
       </ion-tab-button>
-      </div>
 
-      <div *ngFor="let permission of user.UserPermissions">
-      <ion-tab-button *ngIf="permission == 531" (click)="goto('/home/gabinete-digital')" [class.active]="pathname === '/home/gabinete-digital' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete])" (click)="goto('/home/gabinete-digital')" [class.active]="pathname === '/home/gabinete-digital' ">
         <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
         <ion-icon *ngIf="pathname != '/home/gabinete-digital'" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/gabinete-digital'" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
@@ -29,23 +25,18 @@
         <ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ documentCounterService.prTotalDocument }}</ion-badge> -->
         <ion-label>Gabinete</ion-label>
       </ion-tab-button>
-    </div>
-    <div *ngFor="let permission of user.UserPermissions">
-      <ion-tab-button *ngIf="permission == 534" tab="publications" [class.active]="pathname === '/home/publications' ">
+
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions])" tab="publications" [class.active]="pathname === '/home/publications' ">
         <ion-icon *ngIf="pathname != '/home/publications'" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/publications'" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
         <ion-label style="margin-bottom: 2px;" class="overflow-visible">Ações</ion-label>
       </ion-tab-button>
-    </div>
 
-    <div *ngFor="let permission of user.UserPermissions">
-      <ion-tab-button *ngIf="permission == 541" tab="chat" [class.active]="pathname === '/home/chat' ">
+      <ion-tab-button *ngIf="p.userPermission([permissionList.Actions])" tab="chat" [class.active]="pathname === '/home/chat' ">
         <ion-icon *ngIf="pathname != '/home/chat'" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
         <ion-icon *ngIf="pathname == '/home/chat'" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
         <ion-label>Chat</ion-label>
       </ion-tab-button>
-    </div>
-
 
   </ion-tab-bar>
 </ion-tabs>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index a6e8ca9d9..6e7d3c71a 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -16,7 +16,7 @@ import { StorageService } from '../services/storage.service';
 import { File } from '@ionic-native/file/ngx';
 /* import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; */
 import { DocumentCounterService } from '../services/worker/document-counter.service';
-import { PermissionService } from '../services/worker/permission.service';
+import { PermissionService } from '../services/permission.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { Storage } from '@ionic/storage';
@@ -31,6 +31,7 @@ import { environment } from 'src/environments/environment';
 import { v4 as uuidv4 } from 'uuid'
 import { NativeNotificationService } from 'src/app/services/native-notification.service';
 import { UserSession } from '../models/user.model';
+import { PermissionList } from '../models/permissionList';
 
 @Component({
   selector: 'app-home',
@@ -81,6 +82,7 @@ export class HomePage implements OnInit {
   status: string = "";
   audioName: string = "";
   public user: UserSession;
+  permissionList = new PermissionList();
 
   constructor(
     private router: Router,
@@ -104,7 +106,8 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     public RouteService: RouteService,
     private WsChatService: WsChatService,
-    private NativeNotificationService: NativeNotificationService) {
+    private NativeNotificationService: NativeNotificationService,
+    ) {
 
       if (SessionStore.exist) {
         this.user = SessionStore.user;
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 6417a56ce..169460d73 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -16,7 +16,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { PedidoService } from 'src/app/Rules/pedido.service'
 import { fullTask } from 'src/app/models/dailyworktask.model';
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts
index aaa8c1b9a..c9558af34 100644
--- a/src/app/modals/document-detail/document-detail.page.ts
+++ b/src/app/modals/document-detail/document-detail.page.ts
@@ -7,7 +7,7 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
 import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
 import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document';
 import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page';
 import { Location } from '@angular/common';
 import { ViewDocumentPage } from '../view-document/view-document.page';
@@ -132,7 +132,7 @@ export class DocumentDetailPage implements OnInit {
   }
 
   async viewDocumentModal() {
-    
+
     const selectedDoc = this.LoadedDocument.Documents[ this.dicIndex]
 
     let task = {
diff --git a/src/app/models/permissionList.ts b/src/app/models/permissionList.ts
new file mode 100644
index 000000000..cfaf80f57
--- /dev/null
+++ b/src/app/models/permissionList.ts
@@ -0,0 +1,6 @@
+export class PermissionList{
+  Agenda = 530;
+  Gabinete = 531;
+  Actions = 534;
+  Chat = 541;
+}
diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts
index 172044e38..e7c5cbe56 100644
--- a/src/app/models/user.model.ts
+++ b/src/app/models/user.model.ts
@@ -2,12 +2,12 @@ export class UserForm {
   username: string;
   password: string;
   domainName: string;
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
 }
 
 
 export class LoginUserRespose {
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
   UserId: number;
   Authorization: string;
   Email: string
@@ -30,11 +30,12 @@ export class LoginUserRespose {
   }[]
   UserName: string
   Profile: any;
+  UserPermissions: any;
 }
 
 
 export class UserSession {
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
   UserId: number;
   Authorization: string;
   Email: string
@@ -63,5 +64,6 @@ export class UserSession {
   LoginPreference: 'None' | 'Password' | 'Pin' | null;
   PIN: string
   Inactivity: boolean
-  UrlBeforeInactivity: string
-}
\ No newline at end of file
+  UrlBeforeInactivity: string;
+  UserPermissions: any;
+}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 7eec5849f..719139cf0 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -16,7 +16,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service'
 import { Location } from '@angular/common'
 import { fullTask } from 'src/app/models/dailyworktask.model';
 import { AttachmentList } from 'src/app/models/Excludetask';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
@@ -359,8 +359,8 @@ export class DespachoPage implements OnInit {
   }
 
   async generateDiploma(note:string, documents:any) {
-    let body = { 
-      "serialNumber": this.serialnumber, 
+    let body = {
+      "serialNumber": this.serialnumber,
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 2ac4ac6ad..b25262bd7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -22,7 +22,7 @@ import { ExpedienteService } from 'src/app/Rules/expediente.service';
 import { expedienteTask } from 'src/app/models/dailyworktask.model';
 import { TaskService } from 'src/app/Rules/task.service';
 import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
 
@@ -165,7 +165,7 @@ export class ExpedienteDetailPage implements OnInit {
         this.onlinecheck = false;
         this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
           console.log("expedient ditail", process)
-  
+
           var workflow = JSON.parse(process[0].workflowInstanceDataFields);
           var origina
           if (process[0].originator === "undefined") {
@@ -173,7 +173,7 @@ export class ExpedienteDetailPage implements OnInit {
           } else {
             origina = JSON.parse(process[0].originator)
           }
-  
+
           this.task = {
             "SerialNumber": process[0].serialNumber,
             "Folio": workflow.Subject,
@@ -191,7 +191,7 @@ export class ExpedienteDetailPage implements OnInit {
             "AttachmentsProcessLastInstanceID": workflow.AttachmentsProcessLastInstanceID,
             "InstanceID": workflow.InstanceID
           }
-  
+
           this.fulltask = {
             Documents: JSON.parse(process[0].Documents),
             actions: JSON.parse(process[0].actions),
@@ -209,11 +209,11 @@ export class ExpedienteDetailPage implements OnInit {
             workflowInstanceID: process[0].workflowInstanceID,
             workflowName: process[0].workflowName,
           }
-  
+
         })
       })
     }
-    
+
   }
 
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index ef4423096..0ad78d367 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -11,7 +11,7 @@
   <div class="main-content d-flex height-100 border-t-radius">
 
       <!-- Aside left -->
-      <div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
+      <div *ngIf="p.per([permission.Agenda])" class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
         <div class="title-container">
           <div class="title">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 285af08d2..fa90ee7a4 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -22,7 +22,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 //import { NotificationsService } from 'src/app/services/notifications.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 
 
@@ -115,6 +115,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
   customTaskPipe = new CustomTaskPipe()
 
+  permissions = {
+    Agenda: 530
+  }
   @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;
   @ViewChild(PendentesPage) pendentesListPage: PendentesPage;
   @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
@@ -256,7 +259,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
           let date = new Date(element.taskStartDate);
           date.setMonth(date.getMonth() + 1);
           let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-    
+
           let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
@@ -274,11 +277,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
             "Agenda": element.workflowInstanceDataFields.Agenda,
             "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
           }
-    
+
           this.allProcessesList.push(task);
           this.allProcessesList = removeDuplicate(this.allProcessesList);
           this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-    
+
         });
       })
     } else {
@@ -287,9 +290,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
           let date = new Date(element.taskStartDate);
           date.setMonth(date.getMonth() + 1);
           let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-  
+
           var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
-  
+
           let task = {
             "SerialNumber": element.serialNumber,
             "Folio": workflowInstanceDataFields.Subject,
@@ -306,11 +309,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
             "Agenda": workflowInstanceDataFields.Agenda,
             "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
           }
-  
+
           this.allProcessesList.push(task);
           this.allProcessesList = removeDuplicate(this.allProcessesList)
           this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-  
+
         });
         console.log("All process from db ", allprocess)
       })
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 0874bd07e..79204effd 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -23,7 +23,7 @@ import { PedidoService } from 'src/app/Rules/pedido.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';
diff --git a/src/app/services/permission.service.spec.ts b/src/app/services/permission.service.spec.ts
index 8ddccabff..1a77304d8 100644
--- a/src/app/services/permission.service.spec.ts
+++ b/src/app/services/permission.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
-import { PermissionService } from './worker/permission.service';
+import { PermissionService } from './permission.service';
 
 describe('PermissionService', () => {
   let service: PermissionService;
diff --git a/src/app/services/worker/permission.service.ts b/src/app/services/permission.service.ts
similarity index 58%
rename from src/app/services/worker/permission.service.ts
rename to src/app/services/permission.service.ts
index e093625c9..9ff448f36 100644
--- a/src/app/services/worker/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { SessionStore } from '../../store/session.service';
+import { SessionStore } from '../store/session.service';
 
 @Injectable({
   providedIn: 'root'
@@ -15,12 +15,26 @@ export class PermissionService {
     if(!Array.isArray(args)) {
       args = [args]
     }
-    
-    return args.includes(this.SessionStore.user.Profile) 
+
+    return args.includes(this.SessionStore.user.Profile)
+  }
+
+  userPermission(args) {
+
+    if(!Array.isArray(args)) {
+      args = [args]
+    }
+    for(let permission of this.SessionStore.user.UserPermissions){
+      if (args.includes(permission)){
+        return true;
+      }
+    }
+    return false;
+
   }
 
   role(args: any) {
-    
+
     let UserRoleIsValid = this.userRole(args)
 
     return {
@@ -39,4 +53,4 @@ export class PermissionService {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts
index c066e5223..a4f4e1be3 100644
--- a/src/app/services/rules/event.service.ts
+++ b/src/app/services/rules/event.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { AttachmentsService } from '../attachments.service';
 import { EventsService } from '../events.service';
-import { PermissionService } from '../worker/permission.service';
+import { PermissionService } from '../permission.service';
 
 
 
@@ -18,7 +18,7 @@ export class EventService {
 
 
   create({body, calendar}) {
-    
+
 
     if(this.p.userRole(['PR'])) {
       return this.eventService.postEventPr(body, calendar)
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index bab69b979..d0db46512 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -76,7 +76,7 @@
             <span>Início</span>
           </div>
 
-          <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
+          <div *ngIf="p.userPermission([permissionList.Agenda])" class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
             [class.active]="locationPathname() == '/home/agenda'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-agenda-inactive.svg'></ion-icon>
@@ -85,7 +85,7 @@
             <span>Agenda</span>
           </div>
 
-          <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
+          <div *ngIf="p.userPermission([permissionList.Gabinete])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
             [class.active]="locationPathname() == '/home/gabinete-digital'">
 
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
@@ -94,7 +94,7 @@
             <span>Gabinete</span>
           </div>
 
-          <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
+          <div *ngIf="p.userPermission([permissionList.Actions])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
             [class.active]="locationPathname() == '/home/publications'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-a-es-inactive.svg'></ion-icon>
@@ -102,7 +102,7 @@
             <span>Acções</span>
           </div>
 
-          <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
+          <div *ngIf="p.userPermission([permissionList.Chat])" class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
             [class.active]="locationPathname() == '/home/chat'">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index d71c5512f..c92feddb9 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -12,6 +12,7 @@ import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
 import { interval } from 'rxjs';
 import { RouteService } from 'src/app/services/route.service';
+import { PermissionList } from 'src/app/models/permissionList';
 
 @Component({
   selector: 'app-header',
@@ -29,6 +30,7 @@ export class HeaderPage implements OnInit {
   notificationLength: 0;
   SessionStore = SessionStore
   check: boolean;
+  permissionList = new PermissionList();
 
   production = environment.production
 
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index 8d3fa6e25..6d7fe5146 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Location } from '@angular/common'
 import { RouteService } from 'src/app/services/route.service';
@@ -35,7 +35,7 @@ export class DespachosOptionsPage implements OnInit {
     public p: PermissionService,
     public ThemeService: ThemeService,
     private RouteService: RouteService,
-    ) { 
+    ) {
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
 
@@ -84,7 +84,7 @@ export class DespachosOptionsPage implements OnInit {
       this.toastService._badRequest('Processo não encontrado')
     });
   }
-  
+
   async distartExpedientModal(){
     this.popoverController.dismiss();
     console.log(this.fulltask);
@@ -98,7 +98,7 @@ export class DespachosOptionsPage implements OnInit {
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false
     });
-    
+
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
@@ -127,7 +127,7 @@ export class DespachosOptionsPage implements OnInit {
     await modal.present();
     modal.onDidDismiss();
   }
-  
+
   async openDelegarModal(task: any) {
     this.popoverController.dismiss();
     let classs;
@@ -157,8 +157,8 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async generateDiploma(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
@@ -198,20 +198,20 @@ export class DespachosOptionsPage implements OnInit {
       cssClass: classs,
       backdropDismiss: true
     });
-  
+
     await modal.present();
-  
+
     modal.onDidDismiss().then(async (res) => {
       console.log(res);
       if(res.data) {
-        
+
         const DocumentToSave = res.data.documents.map((e) => {
           return {
             ApplicationId: e.ApplicationType,
             SourceId: e.Id,
           }
         });
-    
+
         let docs = {
           ProcessInstanceID: "",
           Attachments: DocumentToSave,
@@ -235,11 +235,11 @@ export class DespachosOptionsPage implements OnInit {
         this.goBack();
       }
     });
-  } 
+  }
 
   async arquivar(note:string, documents:any) {
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -259,14 +259,14 @@ export class DespachosOptionsPage implements OnInit {
     }     finally {
       loader.remove()
     }
-    
+
 
   }
 
 
   async executado(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Conhecimento",
       "ActionTypeId": 104,
       "dataFields": {
@@ -290,10 +290,10 @@ export class DespachosOptionsPage implements OnInit {
   }
 
 
- 
+
   async reexecutar(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Reexecutar",
       "ActionTypeId": 100000010,
       "dataFields": {
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index f77c7996e..ddf480f2e 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common'
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
 
@@ -36,11 +36,11 @@ export class DespachosPrOptionsPage implements OnInit {
     private RouteService: RouteService,
     public p: PermissionService,
     public ThemeService: ThemeService,
-    
+
   ) { }
 
   ngOnInit() {
-    
+
     this.profile = "mdgpr";
 
     this.activatedRoute.queryParams.subscribe(params => {
@@ -86,7 +86,7 @@ export class DespachosPrOptionsPage implements OnInit {
       console.log(res['data']);
       if(res['data']=='openDiscart') {
         console.log('open discart');
-        
+
         this.distartExpedientModal();
 
       } else {
@@ -108,7 +108,7 @@ export class DespachosPrOptionsPage implements OnInit {
       this.toastService._badRequest('Processo não encontrado')
     });
   }
-  
+
   async distartExpedientModal() {
     this.popoverController.dismiss();
     console.log(this.fulltask);
@@ -122,7 +122,7 @@ export class DespachosPrOptionsPage implements OnInit {
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false
     });
-    
+
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
@@ -132,7 +132,7 @@ export class DespachosPrOptionsPage implements OnInit {
         this.openMenu(); */
       }
       this.popoverController.dismiss('close')
-      
+
     });
   }
 
@@ -157,7 +157,7 @@ export class DespachosPrOptionsPage implements OnInit {
     modal.onDidDismiss()
 
   }
-  
+
   async openDelegarModal(task: any) {
     this.popoverController.dismiss();
     let classs;
@@ -187,8 +187,8 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   async generateDiploma(note:string, documents:any) {
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
@@ -227,22 +227,22 @@ export class DespachosPrOptionsPage implements OnInit {
       cssClass: classs,
       backdropDismiss: true
     });
-  
+
     await modal.present();
-  
+
     modal.onDidDismiss().then(async (res) => {
       console.log(res);
       if(res.data){
 
 
-        
+
         const DocumentToSave = res.data.documents.map((e) => {
           return {
             ApplicationId: e.ApplicationType,
             SourceId: e.Id,
           }
         });
-    
+
         let docs = {
           ProcessInstanceID: "",
           Attachments: DocumentToSave,
@@ -259,15 +259,15 @@ export class DespachosPrOptionsPage implements OnInit {
         }
         else if(actionName == 'Reexecução') {
           await this.reexecutar(res.data.note, docs);
-        } 
+        }
         else if(actionName == 'Concluido') {
           await this.concluir(res.data.note, docs);
         }
-        
+
         this.goBack();
       }
     });
-  } 
+  }
 
 
   async concluir(note:string, documents:any){
@@ -297,8 +297,8 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   async arquivar(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -323,8 +323,8 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   async executado(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Conhecimento",
       "ActionTypeId": 104,
       "dataFields": {
@@ -347,10 +347,10 @@ export class DespachosPrOptionsPage implements OnInit {
 
   }
 
-  
+
   async reexecutar(note:string, documents:any){
-    let body = { 
-      "serialNumber": this.serialNumber, 
+    let body = {
+      "serialNumber": this.serialNumber,
       "action": "Reexecutar",
       "ActionTypeId": 100000010,
       "dataFields": {
diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts
index bda7c7d7f..7afa5feea 100644
--- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts
+++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts
@@ -7,7 +7,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common';
 import { TaskService } from 'src/app/Rules/task.service'
 import { ExpedienteService } from 'src/app/Rules/expediente.service';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-event-details-documents-options',
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index bf2c55c37..10e656a02 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -15,7 +15,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common';
 import { TaskService } from 'src/app/Rules/task.service'
 import { ExpedienteService } from 'src/app/Rules/expediente.service';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
 import { RouteService } from 'src/app/services/route.service';
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index f59911563..9ea60decb 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { PedidoService } from 'src/app/Rules/pedido.service';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 import { DataService } from 'src/app/services/data.service';
 import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
 
diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts
index b74b48a0a..8a3259c0f 100644
--- a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts
+++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import {PopoverController } from '@ionic/angular';
-import { PermissionService } from 'src/app/services/worker/permission.service';
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-searched-document-options',

From 2fab7e01d50f5de7a2820f7a26fa0929540fbc8a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 16:37:32 +0100
Subject: [PATCH 24/27] fix

---
 src/app/models/beast-orm.ts                   | 10 +++---
 src/app/services/chat/message.service.ts      |  3 --
 src/app/services/chat/room.service.ts         | 35 ++++++++++---------
 .../services/chat/ws-chat-methods.service.ts  | 11 ++++--
 src/environments/environment.ts               | 10 +++---
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index a09954a36..b6f130385 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -12,12 +12,12 @@ export class MessageModel extends models.Model {
 	rid =  models.CharField()
 	ts =  JsonField({blank:true})
 	u =  JsonField()
-	_id =  models.CharField({unique:true, blank:true})
+	_id =  models.CharField({blank:true})
 	_updatedAt =  models.IntegerField()
 	messageSend =  models.BooleanField()
 	offline =  models.BooleanField()
-	viewed =  ArrayField() 
-	received =  ArrayField()
+	viewed =  ArrayField({blank:true})
+	received =  ArrayField({blank:true})
 	localReference =  models.CharField({blank:true})
 	attachments =  ArrayField({blank:true})
 	file =  JsonField({blank:true})
@@ -28,10 +28,8 @@ export class DeleteMessageModel extends models.Model {
 
 	messageId = models.CharField()
 	rid =  models.CharField()
-	ts =  JsonField()
 	u =  JsonField()
 	needToReceiveBy = ArrayField()
-
 }
 
 
@@ -39,6 +37,6 @@ export class DeleteMessageModel extends models.Model {
 models.register({
   databaseName: 'chat-storage',
   type: 'indexedDB',		
-  version: 1,
+  version: 4,
   models: [MessageModel, DeleteMessageModel]
 })
\ No newline at end of file
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 0cc33911f..fb7f144b2 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -222,7 +222,6 @@ export class MessageService {
 
       if (event.type === HttpEventType.DownloadProgress) {
 
-        console.log('FILE TYPE 33', this.file.type)
       } else if (event.type === HttpEventType.Response) {
         if (this.file.type == "application/img") {
           downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
@@ -242,7 +241,6 @@ export class MessageService {
           ts: this.attachments[0].ts
         }
 
-        console.log(this.attachments)
         // save the changes to the storage
         this.save()
       }
@@ -262,7 +260,6 @@ export class MessageService {
 
   async delateDB() {
 
-    // alert('delete data')
     const message = await MessageModel.get({_id: this._id})
     await message.delete()
 
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 910c80f1e..3147642de 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -394,13 +394,13 @@ export class RoomService {
         
         this.messages[i]?.delateDB()
 
-        console.log(_id,'==',this.messages[i]?._id, true)
+        // console.log(_id,'==',this.messages[i]?._id, true)
         this.messages.splice(i, 1)
 
         return true
 
       } else {
-        console.log(_id,'==',this.messages[i]?._id, false)
+        // console.log(_id,'==',this.messages[i]?._id, false)
       }
     }
 
@@ -430,19 +430,20 @@ export class RoomService {
     await message.delateStatusFalse()
 
     this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
-      (response: any) => {
+      async (response: any) => {
 
         message.delateRequest = true
-        message.save()
+        await message.save()
         this.deleteMessage(msgId)
 
       },
-      (response) => {
+      async (response) => {
 
         if (response.error.error.startsWith('No message found with the id of')) {
           
           this.deleteMessage(msgId)
           message.delateRequest = true
+          await message.save()
 
         } else {
           this.WsChatService.registerCallback({
@@ -626,25 +627,25 @@ export class RoomService {
       await this.restoreMessageFromDB()
     }
 
-    await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
+    // await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
 
-      console.log('load chatHistory', JSON.stringify(chatHistory))
+    //   console.log('load chatHistory', JSON.stringify(chatHistory))
 
-      const messagesId =  this.messages.map((message)=> message._id)
+    //   const messagesId =  this.messages.map((message)=> message._id)
 
-      chatHistory.result.messages.reverse().forEach(async(message: any) => {
+    //   chatHistory.result.messages.reverse().forEach(async(message: any) => {
 
-        if (!messagesId.includes(message._id)) {
-          const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
-          if(messagesToSave) {
-            await messagesToSave.addMessageDB()
-          }
-        }
+    //     if (!messagesId.includes(message._id)) {
+    //       const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
+    //       if(messagesToSave) {
+    //         await messagesToSave.addMessageDB()
+    //       }
+    //     }
         
-      })
+    //   })
 
 
-    })
+    // })
 
     setTimeout(() => {
       this.scrollDown()
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 8bf0bed1f..db3e320d7 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -160,7 +160,10 @@ export class WsChatMethodsService {
 
     } catch(e){}
 
-    this.sortRoomList()
+    setTimeout(()=>{
+      this.sortRoomList()
+    }, 1000)
+
   }
 
   async getAllRooms () {
@@ -204,7 +207,11 @@ export class WsChatMethodsService {
     console.log('save rooms', rooms)
     await this.storage.set('Rooms', rooms);
 
-    this.sortRoomList()
+    
+    setTimeout(()=>{
+      this.sortRoomList()
+    }, 1000)
+    
     this.loadingWholeList = false
   }
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 2c9100ef6..b1b64de1a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,12 +4,12 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
-  /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
+  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
   defaultuserpwd: 'tabteste@006', //tabteste@006,

From 105280cfe74201b31186cf6a41a8a48614bb62d6 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 16:39:54 +0100
Subject: [PATCH 25/27] fix

---
 src/app/services/chat/room.service.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 3147642de..11dd10f93 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -627,25 +627,25 @@ export class RoomService {
       await this.restoreMessageFromDB()
     }
 
-    // await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
+    await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
 
-    //   console.log('load chatHistory', JSON.stringify(chatHistory))
+      console.log('load chatHistory', JSON.stringify(chatHistory))
 
-    //   const messagesId =  this.messages.map((message)=> message._id)
+      const messagesId =  this.messages.map((message)=> message._id)
 
-    //   chatHistory.result.messages.reverse().forEach(async(message: any) => {
+      chatHistory.result.messages.reverse().forEach(async(message: any) => {
 
-    //     if (!messagesId.includes(message._id)) {
-    //       const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
-    //       if(messagesToSave) {
-    //         await messagesToSave.addMessageDB()
-    //       }
-    //     }
+        if (!messagesId.includes(message._id)) {
+          const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
+          if(messagesToSave) {
+            await messagesToSave.addMessageDB()
+          }
+        }
         
-    //   })
+      })
 
 
-    // })
+    })
 
     setTimeout(() => {
       this.scrollDown()

From c35d14d970f8216cc596bd7b76af098f03f1aeff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 21:47:10 +0100
Subject: [PATCH 26/27] fix

---
 package-lock.json                      | 6 +++---
 package.json                           | 2 +-
 src/app/models/beast-orm.ts            | 7 +++++--
 src/app/services/permission.service.ts | 6 ++++--
 src/app/shared/header/header.page.ts   | 1 -
 src/environments/environment.prod.ts   | 5 ++++-
 src/environments/environment.ts        | 8 ++++----
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd3ac05e9..80c0d2804 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6230,9 +6230,9 @@
       }
     },
     "beast-orm": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.1.tgz",
-      "integrity": "sha512-6RNJuVs4Kk4T/nb+Jbtwi5AR+Fd109yuoM0us/eZkuEPPG/QTst4wrukOIH3cf1HZjtcpsZJ7qySNw2U0ZEl2Q=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.3.tgz",
+      "integrity": "sha512-kSTc8Sosm1CbLjSGc+nA1s9i4QmGQoF1rfWDmhTrHOvH+uZAtRXbZAypzscMmF67g04mK5XAuB+TUoKV5XmNiQ=="
     },
     "big-integer": {
       "version": "1.6.49",
diff --git a/package.json b/package.json
index eb0f54efe..39938b7c9 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "angular-svg-icon": "^12.0.0",
     "angular-tag-cloud-module": "^5.2.2",
     "base64-js": "^1.5.1",
-    "beast-orm": "1.0.1",
+    "beast-orm": "^1.0.3",
     "bootstrap": "^4.5.0",
     "build": "0.1.4",
     "capacitor-voice-recorder": "^2.1.0",
diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index 56ec5b874..4e795c7a0 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -1,4 +1,4 @@
-import { models } from '../../plugin/beast-orm/'
+import { models } from 'beast-orm'
 import { AESEncrypt } from '../services/aesencrypt.service'
 
 const _AESEncrypt  = new AESEncrypt() 
@@ -39,4 +39,7 @@ models.register({
   type: 'indexedDB',		
   version: 4,
   models: [MessageModel, DeleteMessageModel]
-})
\ No newline at end of file
+})
+
+
+window['MessageModel'] = MessageModel
\ No newline at end of file
diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts
index 9ff448f36..01b46da8d 100644
--- a/src/app/services/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -24,12 +24,14 @@ export class PermissionService {
     if(!Array.isArray(args)) {
       args = [args]
     }
-    for(let permission of this.SessionStore.user.UserPermissions){
+
+
+    for(let permission of (this.SessionStore.user.UserPermissions || [])){
       if (args.includes(permission)){
         return true;
       }
     }
-    return false;
+    return true;
 
   }
 
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 1fca4f00d..36a61ad9c 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -6,7 +6,6 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { ProfilePage } from 'src/app/modals/profile/profile.page';
 import { StorageService } from '../../services/storage.service';
 import { SessionStore } from 'src/app/store/session.service';
-//import { NotificationsService } from '../../services/notifications.service';
 import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index e5f72e4c6..0a5b0df12 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,8 +1,11 @@
 export const environment = {
-  production: true,
+
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
+  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  
+  production: true,
   domain: 'gabinetedigital.local',
   defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local
   defaultuserpwd: '', //tabteste@006,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b1b64de1a..942a9e5a9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,11 +4,11 @@
 
 export const environment = {
   production: false,
-  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local

From 3598d7c8510258c1c4593bff0120ee4fc4a9ed7b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 22:10:08 +0100
Subject: [PATCH 27/27] fix

---
 src/app/services/permission.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts
index 01b46da8d..3587a5dc6 100644
--- a/src/app/services/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -31,7 +31,7 @@ export class PermissionService {
         return true;
       }
     }
-    return true;
+    return false;
 
   }