From 07622147bae60018494c5a4b9c8b8212816677bb Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Thu, 14 Jul 2022 11:46:43 +0100
Subject: [PATCH 01/24] fixed date start and date end add 1 hour

---
 .../edit-event-to-approve/edit-event.page.ts   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index 95d4a0d6c..9db2446d8 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -278,6 +278,12 @@ export class EditEventToApproveComponent implements OnInit {
       }
     })
 
+    this.startDate = new Date(this.startDate);
+    this.startDate.setHours(this.startDate.getHours() + 1);
+
+    this.endDate = new Date(this.endDate);
+    this.endDate.setHours(this.endDate.getHours() + 1);
+
     const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
@@ -304,9 +310,9 @@ export class EditEventToApproveComponent implements OnInit {
 
 
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
-      this.toastService.successMessage('Evento editado');
+      this.toastService._successMessage('Evento editado');
     }, error =>{
-      this.toastService.badRequest('Evento não editado');
+      this.toastService._badRequest('Evento não editado');
     })
 
 
@@ -314,16 +320,16 @@ export class EditEventToApproveComponent implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          this.toastService.successMessage();
+          this.toastService._successMessage();
         }, error =>{
-          this.toastService.badRequest();
+          this.toastService._badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          this.toastService.successMessage()
+          this.toastService._successMessage()
         }, error =>{
-          this.toastService.badRequest()
+          this.toastService._badRequest()
         })
       }
 

From 8fbb0f16f61da3a0077b63c35bd21f34cc2895b9 Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Thu, 14 Jul 2022 16:35:42 +0100
Subject: [PATCH 02/24] put placeholder in date field initial and final on
 agenda

---
 .../pages/agenda/new-event/new-event.page.html   |  8 ++++----
 src/app/pages/agenda/new-event/new-event.page.ts | 15 ---------------
 .../shared/agenda/new-event/new-event.page.html  |  8 ++++----
 .../shared/agenda/new-event/new-event.page.ts    | 16 ----------------
 4 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index b38f22fc6..0392785eb 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -117,9 +117,9 @@
 
         <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date"
+              placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
               [min]="currentDate"
@@ -149,9 +149,9 @@
          -->
         <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
-              placeholder="Choose a date"
+              placeholder="Data de fim*"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
               [min]="currentDate"
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index 69db82f7a..a0e472091 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -104,21 +104,6 @@ export class NewEventPage implements OnInit {
     this.selectedDate = this.navParams.get('eventSelectedDate');
     this.taskParticipants = this.navParams.get('attendees');
 
-    let now = new Date();
-
-    if(now.getMinutes() <= 30){
-      this.autoStartTime = new Date(now.setMinutes(30));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
-    else{
-      this.autoStartTime = new Date(now.setHours(now.getHours()+1));
-      this.autoStartTime = new Date(this.autoStartTime.setMinutes(0));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
   }
 
   ngOnInit() {
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 1ea144c69..e106b4154 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -123,9 +123,9 @@
 
         <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date"
+              placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
               [min]="currentDate"
@@ -155,9 +155,9 @@
          -->
         <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
-              placeholder="Choose a date"
+              placeholder="Data de fim*"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
               [min]="currentDate"
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 63b0667f0..b4bea48e0 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -133,22 +133,6 @@ export class NewEventPage implements OnInit {
     this.loggeduser = userService.ValidatedUser;
     this.postEvent = new Event();
 
-    let now = new Date();
-
-    if(now.getMinutes() <= 30) {
-      this.autoStartTime = new Date(now.setMinutes(30));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
-    else {
-      this.autoStartTime = new Date(now.setHours(now.getHours()+1));
-      this.autoStartTime = new Date(this.autoStartTime.setMinutes(0));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
-
   }
 
   ngOnInit() {

From d6f41829b17a8840f1a6c6d1293cd924196f9217 Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Thu, 14 Jul 2022 17:04:21 +0100
Subject: [PATCH 03/24] put placeholder in date field initial and final on
 accoes

---
 .../pages/publications/new-action/new-action.page.html | 10 +++++-----
 .../pages/publications/new-action/new-action.page.ts   |  6 +++---
 .../shared/publication/new-action/new-action.page.html |  8 ++++----
 .../shared/publication/new-action/new-action.page.ts   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index 647d570dd..a235279df 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -31,7 +31,7 @@
         <ion-datetime
           [(ngModel)]="folder.DateBegin"
           class="d-block d-md-none"
-          placeholder="Início"
+          placeholder="Data início*"
           displayFormat="D MMM YYYY H:mm"
           minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -41,7 +41,7 @@
 
         <mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
           <input matInput [ngxMatDatetimePicker]="picker1"
-            placeholder="Choose a date"
+            placeholder="Data inicio*"
             [formControl]="dateControlStart"
             [min]="minDate"
             [disabled]="disabled"
@@ -70,7 +70,7 @@
         <ion-datetime
           class="d-block d-md-none"
           [(ngModel)]="folder.DateEnd"
-          placeholder="Fim"
+          placeholder="Data de fim*"
           displayFormat="D MMM YYYY H:mm"
           minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -78,9 +78,9 @@
           max="2025">
         </ion-datetime>
 
-        <mat-form-field class="date-hour-picker d-none d-md-block">
+        <mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
           <input matInput [ngxMatDatetimePicker]="fim"
-            placeholder="Choose a date"
+            placeholder="Data de fim*"
             [formControl]="dateControlEnd"
             [min]="endMinDate"
             [disabled]="disabled"
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index 34c7f3dd9..3a2fdca85 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -75,14 +75,14 @@ export class NewActionPage implements OnInit {
     this.dateControlStart = new FormControl(moment(new Date()));
     this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
 
-    this.folder.DateBegin =  new Date().toISOString()
-    this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
+    // this.folder.DateBegin =  new Date().toISOString()
+    // this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
 
   }
 
   ngOnInit() {
     this.segment = "Evento";
-    this.setDefaultTime()
+    // this.setDefaultTime()
   }
 
   setDefaultTime() {
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index 1304afdd1..ade0c46c2 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -41,9 +41,9 @@
           </ion-datetime>
 
 
-          <mat-form-field  appearance="none" class="width-100 date-hour-picker  d-md-block">
+          <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date*"
+              placeholder="Data inicio*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
               [min]="currentDate"
@@ -80,12 +80,12 @@
 
           <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker2"
-              placeholder="Choose a date*"
+              placeholder="Data de fim*"
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
               [min]="currentDate"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index 420fb18d2..32b81ec7f 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -45,10 +45,10 @@ export class NewActionPage implements OnInit {
     this.folder = new PublicationFolder();
 
 
-    this.folder = Object.assign(this.folder, {
+    /* this.folder = Object.assign(this.folder, {
       DateBegin: new Date().toISOString(),
       DateEnd: (new Date(new Date().getTime() + 15 * 60000)).toISOString(),
-    })
+    }) */
 
   }
 

From 345ca084f10105d459aff07356f19852efad4129 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 15 Jul 2022 10:06:55 +0100
Subject: [PATCH 04/24] fix message order

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

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 314f640d5..2ed102439 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -39,6 +39,7 @@ export class RoomService {
   name = ''
   _updatedAt = {}
   hasLoadHistory = false
+  hasLoadHistoryMessageRF = []
   restoreFromOffline = false
   duration = ''
   isTyping = false
@@ -516,7 +517,7 @@ export class RoomService {
    */
   async send({file = null, attachments = null, temporaryData = {}}) {
 
-    const localReference = uuidv4()
+    const localReference = uuidv4();
 
     let offlineChatMessage = {
       rid: this.id,
@@ -547,7 +548,9 @@ export class RoomService {
       this.sortRoomList()
     }
 
-    
+    if(this.hasLoadHistory == false) {
+      this.hasLoadHistoryMessageRF.push(localReference)
+    }
   }
 
 
@@ -703,6 +706,28 @@ export class RoomService {
     }, 50)
 
     this.hasLoadHistory = true
+    this.messageReorder();
+  }
+
+  async messageReorder() {
+    const reorderMessage: MessageService[] = this.messages.filter((message) => 
+      this.hasLoadHistoryMessageRF.includes(message?.localReference)
+    );
+
+    await this.messages.forEach( async (message, i) => {
+
+      if(this.hasLoadHistoryMessageRF.includes(message?.localReference)) {
+        this.messages.splice(i, 1)
+      }
+
+    })
+
+    this.hasLoadHistoryMessageRF = [];
+
+    reorderMessage.forEach((message) => {
+      this.messages.push(message)
+    });
+
   }
 
 

From 275bcf0eaf47add2a721fbe77742fe7c90be7690 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 15 Jul 2022 12:01:14 +0100
Subject: [PATCH 05/24] add loader

---
 .../diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts    | 3 +++
 .../expediente/expediente-detail/expediente-detail.page.ts  | 3 +++
 .../expedientes-pr/expediente-pr/expediente-pr.page.ts      | 3 +++
 .../expedientes-pr/expedientes-pr.page.html                 | 2 +-
 .../gabinete-digital/expedientes-pr/expedientes-pr.page.ts  | 1 +
 .../shared/gabinete-digital/expedients/expedients.page.ts   | 1 +
 .../popover/despachos-options/despachos-options.page.ts     | 6 ++++--
 .../despachos-pr-options/despachos-pr-options.page.ts       | 3 +++
 .../diplomas-gerar-options/diplomas-gerar-options.page.ts   | 4 +++-
 .../popover/opts-expediente-pr/opts-expediente-pr.page.ts   | 4 +++-
 .../shared/popover/request-options/request-options.page.ts  | 3 +++
 11 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
index 85244b415..04e91a389 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -184,11 +184,14 @@ export class DiplomasGerarPage implements OnInit {
 
   async sendExpedienteToPending() {
 
+    const loader = this.toastService.loading()
     this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
       this.goBack();
       this.toastService.successMessage()
+      loader.remove()
     },
       error => {
+        loader.remove()
         this.toastService.badRequest("Processo não enviado para despacho")
       });
 
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 1538e4712..00ad27dc3 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
@@ -324,12 +324,15 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.serialNumber).subscribe(res => {
       
       this.toastService._successMessage('Processo enviado para pendentes')
       this.goBack();
+      loader.remove()
     },
       (error) => {
+        loader.remove()
         this.toastService._badRequest('Processo não enviado para pendentes')
       });
   }
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index ec0bd3d52..e8307c131 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -133,12 +133,15 @@ export class ExpedientePrPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       
       this.toastService._successMessage('Processo enviado para pendentes')
       this.goBack();
+      loader.remove()
     },
     (error)=>{
+      loader.remove()
       this.toastService._badRequest('Processo não enviado para pendentes')
     });
   }
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 41db8b1e4..86cf760b1 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -2,7 +2,7 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <div class="theicon">
+    <div class="theicon" (click)="refreshing()">
       <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button>
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index a1a615484..16b8b7159 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -84,6 +84,7 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   refreshing() {
+
     setTimeout(() => {
       this.LoadList();
     }, 1000);
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index db561036f..fff5fee73 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -95,6 +95,7 @@ export class ExpedientsPage implements OnInit {
   }
 
     doRefresh() {
+
       setTimeout(() => {
         this.LoadList();
       }, 1000)
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 7778a3276..338ce1ec3 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -72,14 +72,16 @@ export class DespachosOptionsPage implements OnInit {
     });
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       this.toastService._successMessage()
+      loader.remove()
       
       this.close();
     },()=>{
-
+      loader.remove()
       this.toastService._badRequest('Processo não encontrado')
     });
   }
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 cfd057251..17f217a5c 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
@@ -98,11 +98,14 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
       
       this.toastService._successMessage()
       this.popoverController.dismiss('close')
+      loader.remove()
     },()=>{
+      loader.remove()
 
       this.toastService._badRequest('Processo não encontrado')
     });
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
index 639e43881..ed58b09f3 100644
--- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -107,12 +107,14 @@ export class DiplomasGerarOptionsPage implements OnInit {
   }
 
   async sendExpedienteToPending() {
-
+    const loader = this.toastService.loading()
     this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
       this.goBack();
       this.toastService.successMessage()
+      loader.remove()
     },
       error => {
+        loader.remove()
         this.toastService.badRequest("Processo não enviado para despacho")
       });
 
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 9e9eaad65..39797fed3 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -252,12 +252,14 @@ export class OptsExpedientePrPage implements OnInit {
 
   sendExpedienteToPending(){
     this.popoverController.dismiss();
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
-      
+      loader.remove()
       this.close();
     },()=>{
 
       this.toastService._badRequest('Processo não encontrado')
+      loader.remove()
     });
   }
 
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 f79faa471..2d51a1a8d 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -81,11 +81,14 @@ export class RequestOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       
       this.toastService._successMessage()
       this.close();
+      loader.remove()
     },()=>{
+      loader.remove()
 
       this.toastService._badRequest('Processo não encontrado')
     });

From 970cf7e541a4f3a32136241dc22413311690d1b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Fri, 15 Jul 2022 13:40:11 +0100
Subject: [PATCH 06/24] Bug on chat teake picture solve

---
 src/app/pages/chat/messages/messages.page.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 9299ace5c..2d78790c8 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -40,6 +40,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
+import { Filesystem, Directory } from '@capacitor/filesystem';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -162,6 +163,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.createDirectoryImage()
     this.wsChatMethodsService.getAllRooms();
     this.chatService.refreshtoken();
     this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
@@ -1075,6 +1077,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   //   });
   // }
 
+  async createDirectoryImage() {
+    await Filesystem.mkdir({
+      path: IMAGE_DIR,
+      directory: Directory.Data,
+      recursive: true
+    });
+  }
 
 }
 

From 48eb19b1a1790f9660210ab86173d8e96a83c588 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 18 Jul 2022 15:46:24 +0100
Subject: [PATCH 07/24] fix repetition

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

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 2ed102439..90fd2413f 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -180,7 +180,7 @@ export class RoomService {
 
     if(difference < 0) {
 
-      this.deleteRoom()
+      this.deleteRoom();
 
     } else {
       setTimeout(() => {
@@ -494,8 +494,8 @@ export class RoomService {
       
       this.WsChatService.deleteMessage(msgId).then(async() => {
         message.delateRequest = true
-        await message.save()
-        this.deleteMessage(msgId)
+        await message.save();
+        this.deleteMessage(msgId);
       })
 
     } else {
@@ -682,17 +682,17 @@ export class RoomService {
     }
 
     await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
-
+      // console.log('load history', chatHistory)
       // 
 
       const messagesId =  this.messages.map((message)=> message._id)
 
-      chatHistory.result.messages.reverse().forEach(async(message: any) => {
+      await 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()
+            messagesToSave.addMessageDB()
           }
         }
         
@@ -865,7 +865,7 @@ export class RoomService {
     message = this.fix_updatedAt(message)
 
     const found = this.messages.find((MessageService, index) => {
-      if (MessageService._id == message._id ) {
+      if (MessageService._id == message._id) {
         return true
       } else {
         return false

From 5533116e9dbcde857e30a472d055fcf2926a4472 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 21 Jul 2022 18:05:29 +0100
Subject: [PATCH 08/24] fix logout

---
 src/app/pages/chat/chat.page.html              |  1 +
 src/app/pages/chat/chat.page.ts                |  2 ++
 src/app/pages/login/login.page.ts              | 10 +++++++++-
 src/app/services/auth.service.ts               | 10 ++++++++--
 src/app/services/chat.service.ts               | 18 +++++++++---------
 src/app/services/chat/room.service.ts          |  4 ++--
 .../services/chat/ws-chat-methods.service.ts   | 17 +++++------------
 src/app/services/chat/ws-chat.service.ts       | 14 ++++++++++++--
 .../shared/chat/messages/messages.page.html    |  1 +
 src/app/shared/chat/messages/messages.page.ts  |  3 ---
 10 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 27c49e4f1..c08544c4c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -37,6 +37,7 @@
             </ion-segment-button>
           </ion-segment>
         </ion-toolbar>
+        
         <div class=" aside overflow-y-auto d-flex flex-wrap flex-grow-1">
         <div class="width-100" [ngSwitch]="segment">
           <ion-list *ngSwitchCase="'Contactos'">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 636c72896..9aa2f37b2 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -125,6 +125,8 @@ export class ChatPage implements OnInit {
 
     this.showLoader = true;
 
+    this.segment = 'Contactos'
+
   }
 
   ngOnInit() {
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 74519ab76..d79528541 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -13,7 +13,10 @@ import { ThemeService } from 'src/app/services/theme.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { PermissionList } from 'src/app/models/permission/permissionList';
-import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'
+import { MessageModel, DeleteMessageModel } from '../../models/beast-orm';
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
+import { Storage } from '@ionic/storage';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 @Component({
   selector: 'app-login',
   templateUrl: './login.page.html',
@@ -46,6 +49,9 @@ export class LoginPage implements OnInit {
     public ThemeService: ThemeService,
     private storageservice: StorageService,
     public p: PermissionService,
+    private WsChatService: WsChatService,
+    private storage: Storage,
+    public WsChatMethodsService: WsChatMethodsService,
   ) {}
 
   ngOnInit() {
@@ -134,7 +140,9 @@ export class LoginPage implements OnInit {
 
           } else {
 
+            this.WsChatService.logout();
             this.clearStoreService.clear();
+            this.WsChatMethodsService.clearChat();
             SessionStore.delete();
             window.localStorage.clear();
             await MessageModel.deleteAll()
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index c55f09766..908324f5c 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -20,7 +20,7 @@ import { RoomService } from './chat/room.service';
 import { Storage } from '@ionic/storage';
 import { InitialsService } from './functions/initials.service';
 import { PermissionService } from './permission.service';
-
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -48,7 +48,8 @@ export class AuthService {
     private AttachmentsService: AttachmentsService,
     private storage: Storage,
     private initialsService: InitialsService,
-    public p: PermissionService, ) {
+    public p: PermissionService,
+    public WsChatMethodsService: WsChatMethodsService, ) {
 
       this.headers = new HttpHeaders();
 
@@ -201,6 +202,11 @@ export class AuthService {
 
 
           this.WsChatService.setStatus('online')
+
+          setTimeout(() => {
+            this.WsChatMethodsService.getAllRooms();
+          }, 200);
+          
           // alert('wsLogin')
 
         }).catch((message) => {
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index e21c11ab5..6d402df58 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -1,14 +1,13 @@
 import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AuthService } from './auth.service';
 import { HttpService } from './http.service';
 import { StorageService } from './storage.service';
-import { HttpClient, HttpHeaderResponse } from '@angular/common/http';
+import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { Storage } from '@ionic/storage';
 import { PermissionService } from './permission.service';
 import { SessionStore } from '../store/session.service';
-
+import { ChangeProfileService } from 'src/app/services/change-profile.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -24,19 +23,21 @@ export class ChatService {
   constructor(
     private http: HttpClient,
     private httpService: HttpService,
-    private authService: AuthService,
     private storage: Storage,
     private storageService: StorageService,
-    public p: PermissionService) {
+    public p: PermissionService,
+    private changeProfileService: ChangeProfileService,) {
 
-    this.setheader()
+    this.changeProfileService.registerCallback(() => {
+      this.setheader();
+    })
 
   }
 
   getDocumentDetails(url: string) {
     let headersc = new HttpHeaders();
-    headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
-    headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
+    headersc = headersc.set('X-User-Id', SessionStore.user.ChatData.data.userId);
+    headersc = headersc.set('X-Auth-Token', SessionStore.user.ChatData.data.authToken);
     headersc = headersc.set('Sec-Fetch-Dest', 'attachment');
     headersc = headersc.set('Sec-Fetch-Mode', 'navigate');
     headersc = headersc.set('Cookie', 'rc_uid=fsMwcNdufWvdnChj7');
@@ -342,7 +343,6 @@ export class ChatService {
   setheader() {
     try {
       if (this.p.userPermission(this.p.permissionList.Chat.access)) {
-        this.loggedUserChat = this.authService.ValidatedUserChat;
         this.headers = new HttpHeaders();
   
         if (this.p.userPermission(this.p.permissionList.Chat.access)) {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 90fd2413f..2104ed689 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -469,7 +469,7 @@ export class RoomService {
 
 
   deleteAll() {
-    this.messages.forEach((message)=>{
+    this.messages.forEach((message) => {
       if(message?._id) {
         this.sendDeleteRequest(message._id)
       }
@@ -478,7 +478,7 @@ export class RoomService {
 
   async delateMessageToSendToOthers(userId) {
     
-    const deleteMessage = await DeleteMessageModel.all()
+    const deleteMessage = await DeleteMessageModel.all();
 
     const toSend = deleteMessage.filter((DeleteMessage:string[])=> ! DeleteMessage.includes(userId))
 
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 87976f395..d12c22731 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -14,7 +14,6 @@ import { SortService } from '../functions/sort.service';
 import { chatUser } from 'src/app/models/chatMethod';
 import { NfService } from 'src/app/services/chat/nf.service'
 import { ChangeProfileService } from '../change-profile.service';
-import { AuthService } from '../auth.service';
 import { ChatStorageService } from './chat-storage.service';
 import { ChatMethodsService } from './chat-methods.service';
 import { AESEncrypt } from '../aesencrypt.service'
@@ -41,7 +40,7 @@ export class WsChatMethodsService {
   users: chatUser[] = []
   sessionStore = SessionStore
 
-  loggedUser: any;
+
 
   delete = []
   
@@ -56,7 +55,6 @@ export class WsChatMethodsService {
     private NfService: NfService,
     private changeProfileService: ChangeProfileService,
     private chatService: ChatService,
-    private authService: AuthService,
     private ChatStorageService: ChatStorageService,
     private ChatMethodsService:ChatMethodsService,
     private AESEncrypt: AESEncrypt,
@@ -64,7 +62,7 @@ export class WsChatMethodsService {
     private NetworkServiceService: NetworkServiceService,
   ) {
 
-    this.loggedUser = authService.ValidatedUserChat['data'];
+
 
     this.loadChat()
 
@@ -93,13 +91,6 @@ export class WsChatMethodsService {
     })
 
 
-    // on change profile remove a rooms
-    this.changeProfileService.registerCallback(() => {
-      this.clearChat()
-      this.ReLoadChat()
-      this.storage.remove('Rooms');
-    })
-
   }
 
   private loadChat() {
@@ -173,8 +164,10 @@ export class WsChatMethodsService {
   async getAllRooms () {
     this.loadingWholeList = true
     const rooms = await this.WsChatService.getRooms();
+    try {
+      await this.storage.remove('Rooms');
+    } catch(e) {}
     
-    await this.storage.remove('Rooms');
 
     await rooms.result.update.forEach( async (roomData: room, index) => {
       const roomId = this.getRoomId(roomData);
diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 173a9f167..2bc758e80 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -78,7 +78,6 @@ export class WsChatService {
           // 
           if(message.result) {
             if(message.result.token) {
-
               this.isLogin = true
               this.loginResponse = message
 
@@ -106,6 +105,7 @@ export class WsChatService {
 
   getRooms(roomOlder = 1480377601) {
 
+    
     //const requestId = uuidv4()
     const requestId = uuidv4()
     const message = {
@@ -121,7 +121,6 @@ export class WsChatService {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId) { // same request send
           resolve(message)
-          // 
           return true
         }
       }})
@@ -186,6 +185,7 @@ export class WsChatService {
   logout() {
     this.isLogin = false
     this.ws.connected = false
+    this.ws.disconnect()
   }
 
   // send message to room
@@ -749,6 +749,7 @@ export class WsChatService {
       const data = JSON.parse(event.data)
 
       // 
+      // console.log(data)
 
       for (const [key, value] of Object.entries(this.wsCallbacks)) {
         if(value.type== 'Onmessage') {
@@ -777,6 +778,15 @@ export class WsChatService {
 
     onerror: (event: any) =>  {
       
+    },
+    disconnect:() => {
+      if(this.socket) {
+        this.socket.onopen = (event: any) =>  {}
+        this.socket.onmessage = (event: any) =>  {}
+        this.socket.onclose = (event: any) =>  {}
+        this.socket.onerror = (event: any) =>  {}
+        this.socket.close()
+      }
     }
 
   }}
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 66482dde6..58b1211e1 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -49,6 +49,7 @@
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
+          {{msg._id}}
         </div>
         <div class="d-flex justify-space-between">
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 2a91751fb..f5fd8e696 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -49,8 +49,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
   @ViewChild('message-item') messageContainer: ElementRef;
 
-  loggedUser: any;
-
   messages: any;
   dm: any;
   userPresence = '';
@@ -126,7 +124,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private platform: Platform,
     private fileOpener: FileOpener,
   ) {
-    this.loggedUser = authService.ValidatedUserChat['data'];
 
     this.checkAudioPermission()
   }

From 3a6b23b5f5f933b80f08070c351ccc96f8ed2a13 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 22 Jul 2022 15:52:10 +0100
Subject: [PATCH 09/24] improve

---
 src/app/modals/profile/profile.page.html      |  3 +-
 src/app/pages/login/login.page.ts             |  4 ++
 src/app/services/chat.service.ts              | 38 +++++++++++--------
 .../shared/chat/messages/messages.page.html   |  2 +-
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 0b4d029e5..7b4c9a65b 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -45,7 +45,8 @@
       </ion-buttons>
     </div>
     <div class="line"></div>
-    <ion-label (click)="asyncNotification()">{{notificationdata.length}} novas notificações</ion-label>
+    <ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationdata.length}} novas notificações</ion-label>
+    <ion-label (click)="asyncNotification()" *ngIf="!notificationdata">0 novas notificações</ion-label>
   </div>
 </ion-header>
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index d79528541..6a576a779 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -17,6 +17,7 @@ import { MessageModel, DeleteMessageModel } from '../../models/beast-orm';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { Storage } from '@ionic/storage';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
+import { ChatService } from 'src/app/services/chat.service';
 @Component({
   selector: 'app-login',
   templateUrl: './login.page.html',
@@ -52,6 +53,7 @@ export class LoginPage implements OnInit {
     private WsChatService: WsChatService,
     private storage: Storage,
     public WsChatMethodsService: WsChatMethodsService,
+    private ChatService: ChatService
   ) {}
 
   ngOnInit() {
@@ -130,6 +132,7 @@ export class LoginPage implements OnInit {
               await this.authService.loginChat(attempt.ChatData.data); 
               
               await this.authService.loginToChatWs();
+              this.ChatService.setheader()
           
             }
 
@@ -156,6 +159,7 @@ export class LoginPage implements OnInit {
             if(attempt.ChatData) {
               await this.authService.loginChat(attempt.ChatData.data); 
               await this.authService.loginToChatWs();
+              this.ChatService.setheader()
             }
 
             this.getToken();
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 6d402df58..70978415c 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -360,24 +360,30 @@ export class ChatService {
   }
 
   refreshtoken() {
-    this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
-    let options = {
-      headers: this.headers
-    };
-    return this.http.get(environment.apiURL + 'UserAuthentication/RegenereChatToken', options).subscribe(async res => {
-      let data = {
-        status: res['status'],
-        data: {
-          userId: res['data'].userId,
-          authToken: res['data'].authToken
+
+    if(this.headers) {
+      this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
+      let options = {
+        headers: this.headers
+      };
+      return this.http.get(environment.apiURL + 'UserAuthentication/RegenereChatToken', options).subscribe(async res => {
+        let data = {
+          status: res['status'],
+          data: {
+            userId: res['data'].userId,
+            authToken: res['data'].authToken
+          }
         }
-      }
-      SessionStore.user.ChatData = data
-      SessionStore.save()
+        SessionStore.user.ChatData = data
+        SessionStore.save()
+        this.setheader()
+        // console.log(res)
+        // console.log(SessionStore.user.ChatData)
+      });
+    } else {
       this.setheader()
-      // console.log(res)
-      // console.log(SessionStore.user.ChatData)
-    });
+    }
+
   }
 
 }
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 58b1211e1..483e86441 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
-          {{msg._id}}
+          <!-- {{msg._id}} -->
         </div>
         <div class="d-flex justify-space-between">
 

From bc85eb6e1a0520b0837676055495df09ef33b5bb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 22 Jul 2022 16:07:25 +0100
Subject: [PATCH 10/24] dont open document on delete message

---
 src/app/shared/chat/messages/messages.page.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index f5fd8e696..705e3445f 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -445,15 +445,15 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     }
     else {
       
-      var str = msg.attachments[0].image_url;
-      str = str.substring(1, ((str.length) - 1));
+      // var str = msg.attachments[0].image_url;
+      // str = str.substring(1, ((str.length) - 1));
 
-      const encodedData = btoa(str);
+      // const encodedData = btoa(str);
 
-      let file = this.base64toBlob(encodedData, 'application/pdf')
-      let fileURL = URL.createObjectURL(file)
+      // let file = this.base64toBlob(encodedData, 'application/pdf')
+      // let fileURL = URL.createObjectURL(file)
       
-      window.open(fileURL);
+      // window.open(fileURL);
   
     }
   }

From f0c8de79f2d7ff1919d3bf6aca09087e0deaa69d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 22 Jul 2022 17:15:32 +0100
Subject: [PATCH 11/24] remove duplicate

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

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index a2603d28c..17c28b795 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -77,7 +77,7 @@ export class MessageService {
     this.ts = ts
     this.u = u || { name: this.usernameToDisplayName(SessionStore.user.UserName), username: SessionStore.user.UserName, _id: ""}
     this.t = t
-    this._id = _id
+    this._id = _id || ""
     this._updatedAt = _updatedAt || new Date().getTime()
     this.file = file
     this.temporaryData = temporaryData
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 2104ed689..310361ec0 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -530,9 +530,9 @@ export class RoomService {
 
     this.message= ''
     
+    this.messagesLocalReference.push(localReference)
     const message: MessageService = await this.prepareCreate({message:offlineChatMessage, save: environment.chatOffline})
 
-    this.messagesLocalReference.push(localReference)
     await message.addMessageDB()
     message.send()
     
@@ -822,7 +822,33 @@ export class RoomService {
     wewMessage.setData(message)
     wewMessage.loadHistory = this.hasLoadHistory
 
-    this.messages.push(wewMessage)
+
+    let found;
+
+    if(wewMessage.localReference != null) {
+      found = this.messages.find((MessageService, index) => {
+        if ( MessageService.localReference == wewMessage.localReference ) {
+          return true
+        } else {
+          return false
+        }
+      })
+    } else {
+      found = this.messages.find((MessageService, index) => {
+        if ( MessageService._id == wewMessage._id) {
+          return true
+        } else {
+          return false
+        }
+      })
+    }
+    
+
+    if (!found) {
+      this.messages.push(wewMessage)
+      return  wewMessage
+    }
+
     return wewMessage
 
   }
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 483e86441..58b1211e1 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -49,7 +49,7 @@
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
-          <!-- {{msg._id}} -->
+          {{msg._id}}
         </div>
         <div class="d-flex justify-space-between">
 

From 341be0060e4d282ddf374457bb1c0bc9edacc8a1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 25 Jul 2022 12:29:34 +0100
Subject: [PATCH 12/24] Improve chat list

---
 src/app/pages/chat/chat.page.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 9aa2f37b2..f5e5315ce 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -322,7 +322,6 @@ export class ChatPage implements OnInit {
 
   async setIntervenient(data) {
     this.taskParticipants = removeDuplicate(data)
-
   }
 
   async setIntervenientCC(data) {
@@ -341,12 +340,11 @@ export class ChatPage implements OnInit {
   }
 
   onSegmentChange() {
-    //this.load();
+    this.wsChatMethodsService.getAllRooms();
   }
 
   doRefresh(event) {
     setTimeout(() => {
-      //this.load();
       event.target.complete();
     }, 1000);
   }

From 4e387c9f9394f34cef2d3519dc5df4cab9c28d51 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 25 Jul 2022 14:48:28 +0100
Subject: [PATCH 13/24] remove duplicate

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

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 17c28b795..c0ee74133 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -310,7 +310,7 @@ export class MessageService {
 
   async addMessageDB() {
     if(!this.addToDb) {
-      this.addToDb= true
+      this.addToDb = true
       const message = this.getChatObj()
 
       delete message.id
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 310361ec0..4b16880ed 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -237,18 +237,20 @@ export class RoomService {
         let IncomingChatMessageArgs = IncomingChatMessage.fields.args[0]
         let ChatMessage : ChatMessageInterface = this.fix_updatedAt(IncomingChatMessageArgs)
         
-        if(!this.messagesLocalReference.includes(ChatMessage.localReference)) {
+        const allMessageIds = this.messages.map((e)=> e._id);
+
+        if(!this.messagesLocalReference.includes(ChatMessage.localReference) && !allMessageIds.includes(ChatMessage?._id)) {
 
           this.messagesLocalReference.push(ChatMessage.localReference);
           
-          const message = await this.prepareCreate({message: ChatMessage, save: true})
+          const message = await this.prepareCreate({message: ChatMessage, save: true});
           message.messageSend = true
 
-          this.lastMessage = message
-          this.calDateDuration(ChatMessage._updatedAt)
+          this.lastMessage = message;
+          this.calDateDuration(ChatMessage._updatedAt);
   
           if (message.t == 'r') {
-            this.name = message.msg
+            this.name = message.msg;
           }
   
           if(this.isSenderIsNotMe(ChatMessage)) {
@@ -739,10 +741,10 @@ export class RoomService {
 
 
     await this.messages.forEach( async (message, index) => {
-      if(message._id) { 
+      if(message._id) {
         if(message.viewed.length == 0) {
-          this.messages[index].viewed = membersIds
-          this.messages[index].received = membersIds
+          this.messages[index].viewed = membersIds;
+          this.messages[index].received = membersIds;
 
           await this.messages[index].save()
         }

From 1e3b4c30280743e0a4f4150cf2b39c01715bca2b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 14:11:12 +0100
Subject: [PATCH 14/24] improve

---
 src/app/pages/chat/chat.page.ts                          | 1 -
 src/app/pages/chat/group-messages/group-messages.page.ts | 1 -
 src/app/pages/chat/messages/contacts/contacts.page.ts    | 2 --
 src/app/pages/chat/messages/messages.page.ts             | 2 --
 src/app/services/chat/room.service.ts                    | 8 +++-----
 src/app/shared/chat/messages/messages.page.html          | 1 -
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index f5e5315ce..7af4f7fa5 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -357,7 +357,6 @@ export class ChatPage implements OnInit {
     });
   }
 
-
   getDirectMessagesDB() {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       this.storageservice.get("rooms").then((rooms) =>{
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 092058387..980185f06 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -150,7 +150,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       
     })
     
-    //this.loadFiles();
   }
 
   setStatus(status: string) {
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 1c4bc1b2b..2e0777fdf 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -104,7 +104,6 @@ export class ContactsPage implements OnInit {
       
       this.room = res['room'];
       
-
       await this.WsChatMethodsService.getAllRooms();
       this.getDirectMessage(this.room._id);
     });
@@ -148,7 +147,6 @@ export class ContactsPage implements OnInit {
     /* this.getDirectMessage(this.room._id); */
     
 
-
     /* const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'group-messages',
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 9299ace5c..febeaddaa 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -125,7 +125,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private sqlservice: SqliteService,
     public wsChatMethodsService: WsChatMethodsService,
     private AttachmentsService: AttachmentsService,
-
     private CameraService: CameraService,
     private processesService: ProcessesService,
     private storage: Storage,
@@ -149,7 +148,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
 
 
-
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
     this.wsChatMethodsService.openRoom(this.roomId)
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 4b16880ed..1969b7d7f 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -315,19 +315,17 @@ export class RoomService {
           this.otherUserType = args[1]
           this.readAllMessage()
 
-          // 
-          // alert(JSON.stringify(args))
+
         } else if(args[0]?.method == 'viewMessage' || args[1]?.method == 'viewMessage') {
           
           this.readAllMessage()
         } else if(args[0]?.method == 'deleteMessage' || args[1]?.method == 'deleteMessage') {
           
-          // alert('delete')
-          // 
+
           this.deleteMessage(args[1]?.method?._id)
           
         } else {
-          // alert('miss')
+
         }
 
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 58b1211e1..66482dde6 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -49,7 +49,6 @@
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
-          {{msg._id}}
         </div>
         <div class="d-flex justify-space-between">
 

From ae281ab2f7d4258002a6647e1d6bb21dc4a40c95 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 16:37:05 +0100
Subject: [PATCH 15/24] add time

---
 .../shared/chat/new-group/new-group.page.ts   | 98 +++++++++++++------
 1 file changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index f2f013e5d..2c11354f5 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -76,9 +76,8 @@ export class NewGroupPage implements OnInit{
     }
   }
 
-  close(){
-    //this.modalController.dismiss();
-    
+  close() {
+
     this.addGroupMessage.emit();
   }
 
@@ -109,36 +108,71 @@ export class NewGroupPage implements OnInit{
       this.addGroupMessage.emit(res.result.rid);
       await this.wsChatMethodsService.getAllRooms();
 
-      setTimeout(()=> {
-        this.documents.forEach(element => {
-          this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
-            file: {
-              "name": element.Assunto,
-              "type": "application/webtrix",
-              "ApplicationId": element.ApplicationId,
-              "DocId": element.DocId,
-              "Assunto": element.Assunto,
-            },
-            temporaryData: {
-              data: {
-                selected: {
-                  Id: element.DocId,
-                  ApplicationType: element.ApplicationId
+      if(this.wsChatMethodsService.getGroupRoom(res.result.rid)) {
+        setTimeout(()=> {
+          this.documents.forEach(element => {
+            this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
+              file: {
+                "name": element.Assunto,
+                "type": "application/webtrix",
+                "ApplicationId": element.ApplicationId,
+                "DocId": element.DocId,
+                "Assunto": element.Assunto,
+              },
+              temporaryData: {
+                data: {
+                  selected: {
+                    Id: element.DocId,
+                    ApplicationType: element.ApplicationId
+                  }
                 }
-              }
-            },
-            attachments: [{
-              "title": element.Assunto,
-              "description": element.Assunto,
-              "title_link_download": true,
-              "type": "webtrix",
-              "text": element.Assunto,
-              "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-            }],
-          })
-        });
-        
-      }, 500)
+              },
+              attachments: [{
+                "title": element.Assunto,
+                "description": element.Assunto,
+                "title_link_download": true,
+                "type": "webtrix",
+                "text": element.Assunto,
+                "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+              }],
+            })
+          });
+          
+        }, 1500)
+      } else {
+        setTimeout(()=> {
+          this.documents.forEach(element => {
+            this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
+              file: {
+                "name": element.Assunto,
+                "type": "application/webtrix",
+                "ApplicationId": element.ApplicationId,
+                "DocId": element.DocId,
+                "Assunto": element.Assunto,
+              },
+              temporaryData: {
+                data: {
+                  selected: {
+                    Id: element.DocId,
+                    ApplicationType: element.ApplicationId
+                  }
+                }
+              },
+              attachments: [{
+                "title": element.Assunto,
+                "description": element.Assunto,
+                "title_link_download": true,
+                "type": "webtrix",
+                "text": element.Assunto,
+                "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+              }],
+            })
+          });
+          
+        }, 500)
+      }
+
+
       
     } else {
       

From 3906abcd34197351c2a0f8abc57a888785c07cef Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 16:39:12 +0100
Subject: [PATCH 16/24] add time

---
 src/app/shared/chat/new-group/new-group.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 2c11354f5..311d5e962 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -108,7 +108,7 @@ export class NewGroupPage implements OnInit{
       this.addGroupMessage.emit(res.result.rid);
       await this.wsChatMethodsService.getAllRooms();
 
-      if(this.wsChatMethodsService.getGroupRoom(res.result.rid)) {
+      if(!this.wsChatMethodsService.getGroupRoom(res.result.rid)) {
         setTimeout(()=> {
           this.documents.forEach(element => {
             this.wsChatMethodsService.getGroupRoom(res.result.rid).send({

From b23511c8443861c7638329d6f136ec9fbe466638 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 16:54:21 +0100
Subject: [PATCH 17/24] add time

---
 .../shared/chat/new-group/new-group.page.ts   | 100 ++++++++----------
 1 file changed, 43 insertions(+), 57 deletions(-)

diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 311d5e962..7a3625799 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -109,65 +109,11 @@ export class NewGroupPage implements OnInit{
       await this.wsChatMethodsService.getAllRooms();
 
       if(!this.wsChatMethodsService.getGroupRoom(res.result.rid)) {
-        setTimeout(()=> {
-          this.documents.forEach(element => {
-            this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
-              file: {
-                "name": element.Assunto,
-                "type": "application/webtrix",
-                "ApplicationId": element.ApplicationId,
-                "DocId": element.DocId,
-                "Assunto": element.Assunto,
-              },
-              temporaryData: {
-                data: {
-                  selected: {
-                    Id: element.DocId,
-                    ApplicationType: element.ApplicationId
-                  }
-                }
-              },
-              attachments: [{
-                "title": element.Assunto,
-                "description": element.Assunto,
-                "title_link_download": true,
-                "type": "webtrix",
-                "text": element.Assunto,
-                "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-              }],
-            })
-          });
-          
-        }, 1500)
+        this.createGroupWithAttachmentsCath(res)
       } else {
         setTimeout(()=> {
-          this.documents.forEach(element => {
-            this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
-              file: {
-                "name": element.Assunto,
-                "type": "application/webtrix",
-                "ApplicationId": element.ApplicationId,
-                "DocId": element.DocId,
-                "Assunto": element.Assunto,
-              },
-              temporaryData: {
-                data: {
-                  selected: {
-                    Id: element.DocId,
-                    ApplicationType: element.ApplicationId
-                  }
-                }
-              },
-              attachments: [{
-                "title": element.Assunto,
-                "description": element.Assunto,
-                "title_link_download": true,
-                "type": "webtrix",
-                "text": element.Assunto,
-                "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-              }],
-            })
-          });
+
+          this.createGroupWithAttachments(res)
           
         }, 500)
       }
@@ -182,6 +128,46 @@ export class NewGroupPage implements OnInit{
 
   }
 
+  createGroupWithAttachmentsCath(res: any) {
+    if(!this.wsChatMethodsService.getGroupRoom(res.result.rid)) {
+      setTimeout(()=>{
+        this.createGroupWithAttachmentsCath(res)
+      }, 1500)
+    } else {
+      this.createGroupWithAttachments(res)
+    }
+  }
+
+  createGroupWithAttachments(res: any) {
+    this.documents.forEach(element => {
+      this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
+        file: {
+          "name": element.Assunto,
+          "type": "application/webtrix",
+          "ApplicationId": element.ApplicationId,
+          "DocId": element.DocId,
+          "Assunto": element.Assunto,
+        },
+        temporaryData: {
+          data: {
+            selected: {
+              Id: element.DocId,
+              ApplicationType: element.ApplicationId
+            }
+          }
+        },
+        attachments: [{
+          "title": element.Assunto,
+          "description": element.Assunto,
+          "title_link_download": true,
+          "type": "webtrix",
+          "text": element.Assunto,
+          "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+        }],
+      })
+    });
+  }
+
   async addContacts(){
     this.close();
 

From 86ada928837a61e706947c1a7ef9784faae16f52 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 17:18:52 +0100
Subject: [PATCH 18/24] add time

---
 src/app/services/chat/room.service.ts           | 3 +++
 src/app/shared/chat/new-group/new-group.page.ts | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 1969b7d7f..b30ae57ab 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -243,6 +243,7 @@ export class RoomService {
 
           this.messagesLocalReference.push(ChatMessage.localReference);
           
+          alert('server add')
           const message = await this.prepareCreate({message: ChatMessage, save: true});
           message.messageSend = true
 
@@ -531,6 +532,7 @@ export class RoomService {
     this.message= ''
     
     this.messagesLocalReference.push(localReference)
+    alert('local add')
     const message: MessageService = await this.prepareCreate({message:offlineChatMessage, save: environment.chatOffline})
 
     await message.addMessageDB()
@@ -690,6 +692,7 @@ export class RoomService {
       await chatHistory.result.messages.reverse().forEach(async(message: any) => {
 
         if (!messagesId.includes(message._id)) {
+          alert('local history add')
           const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
           if(messagesToSave) {
             messagesToSave.addMessageDB()
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 7a3625799..fce7f84fa 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -59,7 +59,6 @@ export class NewGroupPage implements OnInit{
       }
     });
 
-    
   }
 
 
@@ -112,7 +111,7 @@ export class NewGroupPage implements OnInit{
         this.createGroupWithAttachmentsCath(res)
       } else {
         setTimeout(()=> {
-
+          
           this.createGroupWithAttachments(res)
           
         }, 500)
@@ -139,6 +138,8 @@ export class NewGroupPage implements OnInit{
   }
 
   createGroupWithAttachments(res: any) {
+    this.wsChatMethodsService.getGroupRoom(res.result.rid).hasLoadHistory = true;
+
     this.documents.forEach(element => {
       this.wsChatMethodsService.getGroupRoom(res.result.rid).send({
         file: {

From 531eaeecf2d86167c30aa20bdbfe2d0eaa7a4a29 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 17:40:41 +0100
Subject: [PATCH 19/24] remove alert

---
 .../chat/messages/contacts/contacts.page.ts     | 17 +----------------
 src/app/services/chat/room.service.ts           |  3 ---
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 2e0777fdf..81c7a3d71 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -138,25 +138,10 @@ export class ContactsPage implements OnInit {
   }
 
   async openMessages(username:string){
-    /* this.close(); */
 
     let dm:any;
-    //Create new room
-     this.createRoom(username);
-    //Get direct messages (dm)
-    /* this.getDirectMessage(this.room._id); */
-    
+    this.createRoom(username);
 
-    /* const modal = await this.modalController.create({
-      component: MessagesPage,
-      cssClass: 'group-messages',
-      backdropDismiss: false,
-      componentProps: {
-        dm: dm,
-      },
-    });
-    await modal.present();
-    modal.onDidDismiss(); */
   }
 
 }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index b30ae57ab..1969b7d7f 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -243,7 +243,6 @@ export class RoomService {
 
           this.messagesLocalReference.push(ChatMessage.localReference);
           
-          alert('server add')
           const message = await this.prepareCreate({message: ChatMessage, save: true});
           message.messageSend = true
 
@@ -532,7 +531,6 @@ export class RoomService {
     this.message= ''
     
     this.messagesLocalReference.push(localReference)
-    alert('local add')
     const message: MessageService = await this.prepareCreate({message:offlineChatMessage, save: environment.chatOffline})
 
     await message.addMessageDB()
@@ -692,7 +690,6 @@ export class RoomService {
       await chatHistory.result.messages.reverse().forEach(async(message: any) => {
 
         if (!messagesId.includes(message._id)) {
-          alert('local history add')
           const messagesToSave  = await this.prepareMessageCreateIfNotExist_iD({message: message});
           if(messagesToSave) {
             messagesToSave.addMessageDB()

From 5b1b8e372a61d79a1a0245cb5dbfe9410ac56971 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 26 Jul 2022 17:48:33 +0100
Subject: [PATCH 20/24] all loader

---
 src/app/shared/chat/new-group/new-group.page.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index fce7f84fa..8898b563e 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -89,6 +89,9 @@ export class NewGroupPage implements OnInit{
     let customFields = {}
     let res:any;
 
+
+    const loader = this.toastService.loading();
+
     if(this.thedate) {
       let customFields = {
         "countDownDate":this.thedate
@@ -100,6 +103,8 @@ export class NewGroupPage implements OnInit{
     }
     
 
+    loader.remove();
+
     // FsId
     // DocId
 

From e0b5d0ccfc7f1c2b688890fcf78582d35b3968d2 Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Wed, 27 Jul 2022 10:35:58 +0100
Subject: [PATCH 21/24] fixed zoom image in mobile and web on chat and accoes
 presidenciais

---
 .../modals/view-media/view-media.page.html    | 30 +++++++++++--------
 src/app/modals/view-media/view-media.page.ts  | 17 ++++++-----
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/app/modals/view-media/view-media.page.html b/src/app/modals/view-media/view-media.page.html
index 63ccfcd8c..d34bc1d4d 100644
--- a/src/app/modals/view-media/view-media.page.html
+++ b/src/app/modals/view-media/view-media.page.html
@@ -14,28 +14,32 @@
   </div>
 </ion-header>
 <ion-content fullscreen>
-  <div class="media d-flex align-items-center justify-center">
+  <div *ngIf="view" class="media d-flex align-items-center justify-center">
     <div class="media-content w-100 d-flex align-items-center justify-center">
 
       <ion-slides style="width: 100%; height: 100%;" [options]="sliderOpts">
         <ion-slide>
-          <div class="swiper-zoom-container">
-            <div>
+          <div class="swiper-zoom-container" >
+            <div style="overflow: scroll; width: 100%; height:100%;">
               <img src="{{image}}">
             </div>
-            <!-- <div *ngIf="type == 'application/pdf'">
-              <iframe width="100%" height="100%" [src]="base64Sanitize" type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"></iframe> -->
-              
-              <!-- <pdf-viewer [src]="image"
-              [render-text]="true"
-              [original-size]="false"
-              style="width: 400px; height: 500px"
-  ></pdf-viewer> -->
-            <!-- </div> -->
+          </div>
+
+          <div *ngIf="!view" class="swiper-zoom-container" >
+            <img src="{{image}}">
           </div>
         </ion-slide>
       </ion-slides>
 
     </div>
   </div>
-</ion-content>
+  <ion-slides *ngIf="!view" style="width: 100%; height: 100%;" [options]="sliderOpts">
+    <ion-slide>
+      <div  class="swiper-zoom-container" >
+        <img src="{{image}}">
+      </div>
+    </ion-slide>
+  </ion-slides>
+       
+      
+</ion-content>
\ No newline at end of file
diff --git a/src/app/modals/view-media/view-media.page.ts b/src/app/modals/view-media/view-media.page.ts
index 66e49deca..b65c4f58c 100644
--- a/src/app/modals/view-media/view-media.page.ts
+++ b/src/app/modals/view-media/view-media.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController, NavParams, Platform } from '@ionic/angular';
 import { DomSanitizer} from '@angular/platform-browser';
 import { pdfDefaultOptions } from 'ngx-extended-pdf-viewer';
 
@@ -14,10 +14,10 @@ export class ViewMediaPage implements OnInit {
   type: any;
   name: string
   _updatedAt: string
+  view: boolean
 
   sliderOpts = {
-    zoom: true,
-    maxRation: 2
+    zoom: true
   };
 
   base64Sanitize:any = "";
@@ -26,6 +26,7 @@ export class ViewMediaPage implements OnInit {
     private modalController: ModalController,
     private navParams:NavParams,
     public sanitizer: DomSanitizer,
+    private platform: Platform,
     
   ) {
     this.image = this.navParams.get('image')
@@ -38,6 +39,12 @@ export class ViewMediaPage implements OnInit {
   ngOnInit() {
       
       this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(this.image);
+
+      if (this.platform.is('desktop')) {
+        this.view = true;
+      } else {
+        this.view = false;
+      }
     
   }
 
@@ -60,10 +67,6 @@ export class ViewMediaPage implements OnInit {
     const blob = new Blob(byteArrays, { type: contentType });
     return blob;
   };
-  
-
-
-
 
   close(){
     this.modalController.dismiss()

From f21f4e281d663476d5950540c363490c5e2ea5b0 Mon Sep 17 00:00:00 2001
From: "gilson.manuel" <gilson.manuel@equilibrium.co.ao>
Date: Wed, 27 Jul 2022 14:18:57 +0100
Subject: [PATCH 22/24] save

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

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4629781ad..fef6ebb15 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -22,12 +22,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://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
-  //apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
+  apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
+  //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+  //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
   domain: 'gabinetedigital.local', //gabinetedigital.local

From 130c7fad88340c148f344b307b4468525d9e59bc Mon Sep 17 00:00:00 2001
From: "gilson.manuel" <gilson.manuel@equilibrium.co.ao>
Date: Wed, 27 Jul 2022 15:02:14 +0100
Subject: [PATCH 23/24] save

---
 src/environments/environment.prod.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index fbce3d375..81dcd4f1d 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,12 +1,12 @@
 export const environment = {
 
   //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  apiURL: 'https://gdapi-dev.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://gdchat-dev.dyndns.info/api/v1/',
-  apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
+  //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
+  apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
+  //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+  //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',

From 75b07415a2f8e1e4f57855a750be0b86baa0259c Mon Sep 17 00:00:00 2001
From: "gilson.manuel" <gilson.manuel@equilibrium.co.ao>
Date: Thu, 28 Jul 2022 13:26:08 +0100
Subject: [PATCH 24/24] save

---
 src/environments/environment.prod.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 81dcd4f1d..f00cf848e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,12 +1,12 @@
 export const environment = {
 
   //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
-  apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
-  //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
-  //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
+  apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  //apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
+  //apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
+  apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',