From 8e7ff2f238698ff3480bdc98b2ee392c49b682af Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 21 Jun 2021 15:22:48 +0100
Subject: [PATCH 01/15] save

---
 .../create-process/create-process.page.ts     | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 26873ce2b..3e973bf34 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -200,7 +200,7 @@ export class CreateProcessPage implements OnInit {
 
                 try {
                   await this.processes.postDespatcho(this.postData).toPromise();
-                  this.FinalizarDespacho();
+                  this.FinalizarDespacho('Despacho criado');
                 } catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
                 }
@@ -220,7 +220,7 @@ export class CreateProcessPage implements OnInit {
                 try {
                   await this.processes.postParecer(this.postData).toPromise();
                   
-                  this.FinalizarParecer('Pedido de Parecer criado');
+                  this.FinalizarParecer('Pedido de Parecer enviado');
                 } 
                 catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
@@ -240,7 +240,7 @@ export class CreateProcessPage implements OnInit {
               
                 try {
                   await this.processes.postDeferimento(this.postData).toPromise();
-                  this.executado('Pedido de Deferimento criado');
+                  this.FinalizarDeferimento('Pedido de deferimento enviado');
                 } 
                 catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
@@ -357,17 +357,18 @@ export class CreateProcessPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage('');
+      this.toastService.successMessage(message);
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado');
     }
   }
 
-  async FinalizarDespacho() {
+  async FinalizarDespacho(message?) {
 
     let body;
 
-    if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho') {
+    if(this.task.activityInstanceName =='Tarefa de Despacho' || 
+    this.task.activityInstanceName =='Reexecutar Despacho') {
   
       body = {
         "serialNumber": this.task.serialNumber, 
@@ -379,7 +380,11 @@ export class CreateProcessPage implements OnInit {
         "AttachmentList" :null,
       } 
     }
-    else if(this.task.activityInstanceName =='Concluir Despacho' || this.task.activityInstanceName == 'Concluir Parecer') {
+    else if(this.task.activityInstanceName =='Concluir Despacho' || 
+    this.task.activityInstanceName == 'Concluir Parecer' || 
+    this.task.activityInstanceName =='Concluir de Deferimento' ||
+    this.task.activityInstanceName =='Reapreciar Deferimento'
+    ) {
       
       body = {
         "serialNumber": this.task.serialNumber, 
@@ -395,7 +400,7 @@ export class CreateProcessPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage('');
+      this.toastService.successMessage(message);
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado');
     }
@@ -403,16 +408,32 @@ export class CreateProcessPage implements OnInit {
   }
 
   async FinalizarParecer(message?) {
-    let body = { 
-      "serialNumber": this.task.serialNumber, 
-      "action": "Parecer",
-      "ActionTypeId": 96,
-      "dataFields": {
-        "ReviewUserComment": '',
-      },
-      "AttachmentList" :null,
-    } 
+    let body;
 
+    if(this.task.activityInstanceName =='Concluir Deferimento' ||
+    this.task.activityInstanceName =='Reapreciar Deferimento'
+    ){
+      body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 92,
+        "dataFields": {
+          "ReviewUserComment": message,
+        },
+        "AttachmentList" :null,
+      }
+    }
+    else{
+      body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 96,
+        "dataFields": {
+          "ReviewUserComment": message,
+        },
+        "AttachmentList" :null,
+      }
+    }
 
     try {
       await this.processes.CompleteTask(body).toPromise();
@@ -422,6 +443,26 @@ export class CreateProcessPage implements OnInit {
     }
 
   }
+
+  async FinalizarDeferimento(message?){
+    if(this.task.activityInstanceName =='Reapreciar Deferimento'){
+      let body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 92,
+        "dataFields": {
+          "ReviewUserComment": '',
+        },
+        "AttachmentList" :null,
+      }
+      try {
+        await this.processes.CompleteTask(body).toPromise();
+        this.toastService.successMessage(message)
+      } catch (e) {
+        this.toastService.badRequest()
+      }
+    }
+  }
  
   async addParticipants() {
     

From 98918e40df8efb4747767f5e29f24118e8b579c3 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 21 Jun 2021 15:51:08 +0100
Subject: [PATCH 02/15] save

---
 src/app/modals/create-process/create-process.page.ts     | 9 ++++-----
 .../pages/gabinete-digital/pedidos/pedido/pedido.page.ts | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 3e973bf34..b8a497039 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -219,7 +219,6 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postParecer(this.postData).toPromise();
-                  
                   this.FinalizarParecer('Pedido de Parecer enviado');
                 } 
                 catch (error) {
@@ -364,7 +363,7 @@ export class CreateProcessPage implements OnInit {
   }
 
   async FinalizarDespacho(message?) {
-
+    
     let body;
 
     if(this.task.activityInstanceName =='Tarefa de Despacho' || 
@@ -382,7 +381,7 @@ export class CreateProcessPage implements OnInit {
     }
     else if(this.task.activityInstanceName =='Concluir Despacho' || 
     this.task.activityInstanceName == 'Concluir Parecer' || 
-    this.task.activityInstanceName =='Concluir de Deferimento' ||
+    this.task.activityInstanceName =='Concluir Deferimento' ||
     this.task.activityInstanceName =='Reapreciar Deferimento'
     ) {
       
@@ -395,9 +394,9 @@ export class CreateProcessPage implements OnInit {
         },
         "AttachmentList" :null,
       } 
-
     }
-
+    console.log(body);
+    
     try {
       await this.processes.CompleteTask(body).toPromise();
       this.toastService.successMessage(message);
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 6b20bd5dc..d94f49595 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -283,7 +283,7 @@ export class PedidoPage implements OnInit {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
-        task: this.task,
+        task: task,
       },
       cssClass: classs,
       backdropDismiss: false

From 3c35ae0cab008a073a51ffc173ef055891e62ccb Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 11:43:09 +0100
Subject: [PATCH 03/15] save

---
 src/app/models/event.model.ts                 |  2 +-
 .../event-actions-popover.page.ts             |  5 +-
 .../despachos/despacho/despacho.page.html     |  7 +-
 .../despachos/despacho/despacho.page.scss     | 85 +++++--------------
 .../expedient-task-modal.page.ts              |  2 +-
 .../expediente-detail.page.html               | 52 +-----------
 .../expediente-detail.page.ts                 |  5 --
 .../expediente-pr/expediente-pr.page.html     |  2 +-
 .../expediente-pr/expediente-pr.page.ts       |  5 +-
 .../edit-event.page.html                      |  2 +-
 .../edit-event-to-approve/edit-event.page.ts  |  6 +-
 .../deploma-options/deploma-options.page.ts   |  5 +-
 .../despachos-options.page.ts                 |  4 +-
 .../opts-expediente/opts-expediente.page.ts   |  4 +-
 14 files changed, 47 insertions(+), 139 deletions(-)

diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts
index 37240f58f..831bbf1e7 100644
--- a/src/app/models/event.model.ts
+++ b/src/app/models/event.model.ts
@@ -32,7 +32,7 @@ export class EventToApproveEdit {
     "StartDate": "2021-05-12T10:30:00"
     "EndDate": "2021-05-12T11:30:00"
     "Private": false
-    "ReviewUserComments": ""
+    "ReviewUserComment": ""
     "MDName": "Paulo Pinto"
     "MDEmail": "paulo.pinto@gabinetedigital.local"
     "Agenda": "Oficial" | "Pessoal"
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index cad42776f..38f0b2c90 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -70,7 +70,7 @@ export class EventActionsPopoverPage implements OnInit {
   }
 
   async emendarTask() {
-    console.log('Mobile');
+    this.closePopover();
     
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
@@ -122,8 +122,7 @@ export class EventActionsPopoverPage implements OnInit {
   }
 
   async editTask() {
-    console.log(this.serialNumber);
-    console.log(this.instanceId);
+    this.closePopover();
     const modal = await this.modalController.create({
       component: EditEventToApproveComponent,
       componentProps: {
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index da81230b7..d01723a36 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -7,17 +7,14 @@
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content d-flex justify-space-between align-center">
-          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+          <div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
             <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </div>
           <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">
-              <!-- <ion-menu-button autoHide="false">
-                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index 7587dfeaa..592d2c19e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -17,73 +17,31 @@
   font-size: 18px !important;
 }
 .main-header{
+  display: flex;
   font-family: Roboto;
-  border-top-left-radius: 25px;
-  border-top-right-radius: 25px;
   background-color: #fff;
-  overflow:auto;
   color:#000;
   transform: translate3d(0, 1px, 0);
-    .header-top{
-      margin: 0px auto;
+  .title-content{
+    display: flex;
+    justify-content: start !important;
+    align-items: flex-start !important;
+    border-radius: 0 !important;
+    }
+    .title{
+      width: fit-content;
+      height: auto;
+      font-size: 25px;
       overflow: auto;
-      padding: 0 !important;
-      background: #fff;
-      .middle{
-        padding: 0!important;
-        float: left;
-        width: 280px;
-        margin: 2.5px 0 0 5px;
-        display: flex;
-        align-items: center;
-            
-        }
-        .right{
-          padding: 0!important;
-          float: right;
-          font-size: 25px;
-          color: #0782c9;
-          margin: 5px 0 0 0;
-        }
-      }
-      .header-bottom{
-         width: 310px;
-        overflow: auto;
-        margin: 0 auto;
-
-        .header-bottom-icon{
-          width: 30px;
-          font-size: 25px;
-          float: left;
-          padding: 2px;
-        }
-        .header-bottom-contacts{
-          width: 275px;
-          font-size: 15px;
-          color: #797979;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          float: left;
-            padding: 5px;
-          margin: 1px;
-        }
-      }
-    
-        .title{
-          font-size: 25px;
-          overflow: auto;
-          float: left;
-          padding-top: 4px;
-          padding-left: 5px;
-        }
-        .div-icon{
-          width: 40px;
-          float: right;
-          font-size: 35px;
-          overflow: auto;
-          padding: 1px;
-        }
+      float: left;
+      padding-left: 5px;
+    }
+    .div-icon{
+      width: 40px !important;
+      font-size: 35px !important;
+      text-align: start !important;
+      padding: 1px;
+    }
 }
 ion-item-group{
     margin: 15px;
@@ -94,11 +52,10 @@ ion-button{
     margin: 20px auto;
 }
 
-
 .upper-content{
   font-family: Roboto;
+  margin-top: 15px;
   margin-left: 41px;
-  overflow: auto;
   font-size: 18px;
 
   .label{
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 741838569..33cbe7ef5 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -248,7 +248,7 @@ export class ExpedientTaskModalPage implements OnInit {
                     }
                   }
                   this.taskResult = await this.processes.postParecer(this.postData).toPromise();
-                  await this.toastService.successMessage('Processo efetuado');
+                  await this.toastService.successMessage('Pedido enviado');
                   this.modalController.dismiss(action_parecer);
                   
                 } catch (error) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 52d71b82a..c15cfab13 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -35,14 +35,6 @@
 
       <div class="overflow-y-auto">
         <div class="middle-content">
-          <!-- <h5 *ngIf="intervenientes">Intervenientes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let interveniente of intervenientes">
-                <p>{{interveniente.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item> -->
           <div *ngIf="cc.length > 0">
             <h5>Com conhecimento</h5>
             <ion-item class="ion-no-margin ion-no-padding">
@@ -99,7 +91,7 @@
       </div>
     </div>
 
-    <div class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
@@ -114,48 +106,6 @@
       </div>
     </div>
 
-    <div *ngIf="!task">
-      <ion-list>
-        <ion-list-header>
-          <ion-label>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </ion-label>
-        </ion-list-header>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
-      </ion-list>
-    </div>
-
   </div>
 </ion-content>
 
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 360619358..528462d36 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
@@ -204,11 +204,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  openMenu() {
-    this.menu.open();
-    this.modalController.dismiss();
-  }
-
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();
     let classs;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index c52ba9d34..195067a0a 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -27,7 +27,7 @@
       <div class="upper-content" style="overflow: unset !important;">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
           </ion-label>
         </div>
       </div>
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 a7aec3fe0..a3a79cfe8 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
@@ -132,6 +132,7 @@ export class ExpedientePrPage implements OnInit {
         "FsId": res.workflowInstanceDataFields.FsId,
         "DocId": res.workflowInstanceDataFields.DocIdD,
         "WorkflowName": res.workflowDisplayName,
+        "activityInstanceName": res.activityInstanceName,
       }
 
       console.log('task', this.task);
@@ -200,8 +201,10 @@ export class ExpedientePrPage implements OnInit {
       "AttachmentList" :documents,
     }
 
+    console.log(body);
+    
     try {
-      await this.processes.CompleteTask(body).toPromise()
+      await this.processes.CompleteTask(body).toPromise();
       this.close();
       this.toastService.successMessage('Processo aprovado')
     } catch(error) {
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 2b0f5b3e6..644544210 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -8,7 +8,7 @@
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar Evento Por Aprovar</ion-label>
+              <ion-label class="title">Editar Evento Por Aprovar QQ</ion-label>
             </div>
           </div>
         </ion-header>
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 c2f99bdbf..7d3af5bea 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
@@ -69,7 +69,7 @@ export class EditEventToApproveComponent implements OnInit {
   //     "EndDate":"2021-04-30T15:30:00",
   //     "Participants":"gilson.manuel@gabinetedigital.local;tiago.kayaya@gabinetedigital.local;solange.vandunem@gabinetedigital.local",
   //     "CC":"",
-  //     "ReviewUserComments":"teste",
+  //     "ReviewUserComment":"teste",
   //     "Role":0,
   //     "MDName":"Paulo Pinto",
   //     "MDEmail":"paulo.pinto@gabinetedigital.local",
@@ -251,8 +251,10 @@ export class EditEventToApproveComponent implements OnInit {
       Message: this.eventProcess.workflowInstanceDataFields.Message,
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
       Private: false,
-      ReviewUserComments: ''
+      ReviewUserComment: ''
     }
+
+    console.log(event);
     
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.toastService.successMessage('Evento editado');
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index 4102f6242..758d60d91 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -109,6 +109,7 @@ export class DeplomaOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -152,6 +153,8 @@ export class DeplomaOptionsPage implements OnInit {
   }
 
   
-  close(){}
+  close(){
+    this.popoverController.dismiss();
+  }
 
 }
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 6e0a995d6..5ba718866 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -70,7 +70,7 @@ export class DespachosOptionsPage implements OnInit {
 
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -107,6 +107,7 @@ export class DespachosOptionsPage implements OnInit {
   }
   
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -133,6 +134,7 @@ export class DespachosOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
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 17068ef18..3ec0d5fca 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -80,7 +80,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.close();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -110,7 +110,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   async distartExpedientModal(){
-    console.log(this.fulltask);
+    this.close();
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

From 1888fea5385486701c6071722daa5cc2c76ebfdd Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 12:59:28 +0100
Subject: [PATCH 04/15] save

---
 .../approve-event/approve-event.page.ts       | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 9742c71e6..67636f1d1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -106,18 +106,7 @@ export class ApproveEventPage implements OnInit {
     }); */
   }
 
-  async emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
-    this.menu.close();
-
-    try {
-      await this.openEmendMessageModal(serialNumber);
-      this.modalController.dismiss(null);
-    } catch (error) {
-      this.toastService.badRequest()
-    }
-
-  }
+  
 
   async rejectTask(serialNumber:string) {
   
@@ -163,18 +152,21 @@ export class ApproveEventPage implements OnInit {
     this.menu.open();
   }
 
-  async openEmendMessageModal(serialNumber:string) {
+  async emendTask(serialNumber:string){
+    console.log('Desktop');
+
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
       componentProps:{
       },
       cssClass: 'emend-message-modal',
       backdropDismiss: false
-    });-
+    });
 
     await modal.present();
 
-    modal.onDidDismiss().then( async (res) => {
+    modal.onDidDismiss()
+    .then( async (res) => {
       console.log(res.data);
       
       if(res.data !== ''){
@@ -184,24 +176,23 @@ export class ApproveEventPage implements OnInit {
             "ReviewUserComment": res.data,
           }
         }
-      console.log(body);
-
-      try {     
-        await  this.processes.PostTaskAction(body).toPromise()
-        //this.router.navigate(['/home/gabinete-digital/event-list']);
-        this.goToEventsToApprove();
-        this.toastService.successMessage()
-      } catch (error) {
-        this.toastService.badRequest()
-      }
-
-      
+        console.log(body);
 
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.toastService.successMessage('Pedido enviado');
+          this.close();
+        } catch (error) {
+          this.toastService.badRequest();
+        }
       }
       else{
         //this.alertService.presentAlert('Operação cancelada!');
       }
     });
+    
+    //this.openEmendMessageModal(serialNumber);
+    //this.goBack();
   }
 
   goToEventsToApprove(){

From 2ccb8638ac6ab6c7cfc9a74304650df4c241a2fb Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 15:17:35 +0100
Subject: [PATCH 05/15] save

---
 src/app/home/home-routing.module.ts           | 31 ++++++++++++++++---
 src/app/pages/agenda/agenda.page.ts           | 13 ++------
 .../approve-event/approve-event.page.ts       | 22 ++++++++++---
 .../event-list/event-list.page.ts             | 21 +++++++++++--
 .../approve-event/approve-event.page.ts       |  5 ---
 5 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 8899495e2..cd42571d5 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -102,6 +102,24 @@ const routes: Routes = [
             path: 'view-event',
             loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
           },
+          {
+            path:'event-list',
+            children: [
+              {
+                path:'',
+                loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
+              },
+              {
+                path:'approve-event',
+                children : [
+                  {
+                    path:':serialNumber/:caller',
+                    loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
+                  },
+                ]
+              }
+            ]
+          },
         ]
       },
       {
@@ -144,10 +162,15 @@ const routes: Routes = [
                 loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
               },
               {
-                path:':serialNumber',
-                loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
-              },
-            ]  
+                path:'approve-event',
+                children : [
+                  {
+                    path:':serialNumber/:caller',
+                    loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
+                  },
+                ]
+              }
+            ]
           },
           {
             path: 'events-to-approve',
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index c1d8e8791..89ee25930 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1175,17 +1175,8 @@ export class AgendaPage implements OnInit {
   async viewEventsToApprove(){
     await this.cloneAllmobileComponent()
 
-    if( window.innerWidth <= 1024){
-      const modal = await this.modalCtrl.create({
-        component: EventListPage,
-        componentProps:{
-          profile: this.profile,
-        },
-        cssClass: 'modal  modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss();
+    if( window.innerWidth <= 801){
+      this.router.navigate(['/home/agenda/event-list']);
     } else {
       // hide all components
       this.cloneAllmobileComponent();
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 4912ff85b..32f83fc2b 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -31,6 +31,7 @@ export class ApproveEventPage implements OnInit {
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
   serialNumber:string;
+  caller:string;
   @Input() InstanceId:string;
 
   @Output() approveEventDismiss = new EventEmitter<any>();
@@ -51,27 +52,40 @@ export class ApproveEventPage implements OnInit {
     private toastService: ToastService,
   ) { 
 
-    this.activatedRoute.queryParams.subscribe(params => {
+    this.activatedRoute.paramMap.subscribe(params => {
+      console.log(params["params"]);
+      
+      if(params["params"].serialNumber) {
+        this.serialNumber = params["params"].serialNumber;
+      }
+      if(params["params"].caller){
+        this.caller = params["params"].caller;
+      }
+    });
+
+    /* this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
         this.serialNumber = params["serialNumber"];
         console.log(params["serialNumber"]);
       }
-    });
+    }); */
   }
 
   ngOnInit() {
+    console.log(this.serialNumber);
+    console.log(this.caller);
+    
     this.getTask();
   }
 
   goBack() {
-
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "eventos": true,
       }
     };
     if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
+      this.router.navigate(['/home',this.caller, 'event-list']);
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index ea3cd7d22..ca4c5d7ee 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
 import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
-import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-event-list',
@@ -28,6 +28,7 @@ export class EventListPage implements OnInit {
     private processes:ProcessesService,
     private modalController: ModalController,
     private router: Router,
+    private activatedRoute: ActivatedRoute,
   ) { }
 
   ngOnInit() {
@@ -81,7 +82,16 @@ export class EventListPage implements OnInit {
         "serialNumber": serialNumber,
       }
     };
-    this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
+
+    if(this.router.url == '/home/agenda/event-list'){
+      //this.router.navigate(['/home/agenda']);
+      this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
+    }
+    else if(this.router.url == '/home/gabinete-digital/event-list'){
+      this.router.navigate(['/home/gabinete-digital/event-list/approve-event',serialNumber, 'gabinete-digital'])
+    }
+
+    //this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
   doRefresh() {
@@ -94,7 +104,12 @@ export class EventListPage implements OnInit {
     this.modalController.dismiss(null);
   }
   goBack(){
-    this.router.navigate(['/home/gabinete-digital']);
+    if(this.router.url == '/home/agenda/event-list'){
+      this.router.navigate(['/home/agenda']);
+    }
+    else if(this.router.url == '/home/gabinete-digital/event-list'){
+      this.router.navigate(['/home/gabinete-digital']);
+    }
   }
 
 
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 67636f1d1..6f49347a1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -147,10 +147,6 @@ export class ApproveEventPage implements OnInit {
     });
     return await popover.present();
   }
-  
-  openMenu() {
-    this.menu.open();
-  }
 
   async emendTask(serialNumber:string){
     console.log('Desktop');
@@ -228,5 +224,4 @@ export class ApproveEventPage implements OnInit {
   } 
 
 
-
 }

From b18dde6d7bd7066afa786381c3f7889362f1a617 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 15:39:28 +0100
Subject: [PATCH 06/15] save

---
 src/app/services/events.service.ts            | 35 ++++++++++++++++---
 .../request-options/request-options.page.ts   |  5 +++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 8159936c8..52cc00153 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -438,15 +438,42 @@ export class EventsService {
   createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
     const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/dispatch';
     let params = new HttpParams();
+    let options;
 
     params = params.set("FolderId", folderId);
     params = params.set("SerialNumber", serialNumber);
     params = params.set("applicationID", applicationID);
 
-    let options = { 
-      headers: this.headers,
-      params: params 
-    };
+    switch (this.loggeduser.Profile) {
+      case 'MDGPR':
+        if(body.CalendarName == 'Pessoal'){
+          options = { 
+            headers: this.headersMdPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersMdOficial,
+            params: params 
+          };
+        }
+        break;
+      case 'PR':
+        if(body.CalendarName == 'Pessoal'){
+          options = { 
+            headers: this.headersPrPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersPrOficial,
+            params: params 
+          };
+        }
+        break;
+      }
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
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 22fa70a3e..e695f712a 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -77,6 +77,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -126,6 +127,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -172,6 +174,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -239,6 +242,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDarParecer(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;
@@ -261,6 +265,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDelegarModal(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;

From e9c9006bd11cdcb1e1af27c884c1ec9b339e8bc3 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 16:18:14 +0100
Subject: [PATCH 07/15] save

---
 .../despacho-pr/despacho-pr.page.html         | 35 -------------------
 .../event-list/event-list.page.html           |  2 --
 .../event-list/event-list.page.scss           |  2 +-
 .../deploma-options/deploma-options.page.ts   |  1 +
 .../despachos-options.page.ts                 |  1 +
 .../despachos-pr-options.page.ts              |  6 +++-
 .../opts-expediente-pr.page.ts                | 25 +++----------
 .../request-options/request-options.page.ts   |  1 +
 8 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index e143d2bfa..faea3feb0 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -1,41 +1,6 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-      <ion-item hidden disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 7e9722671..32740eb16 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -32,7 +32,6 @@
 
     <ion-list *ngSwitchCase="'MDGPR'">
       <div *ngIf="eventsMDGPRList">
-        <ion-list>
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -50,7 +49,6 @@
               </div>
             </ion-item>
           </ion-item-sliding>
-        </ion-list>
       </div>
     </ion-list>
     <ion-list *ngSwitchCase="'PR'">
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
index 97a3d78d6..8b6826245 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
@@ -29,7 +29,7 @@
   float: left;
 }
 ion-item-sliding{
-  margin-top: 5px;
+  margin-top: 10px;
 }
 .Rectangle {
   //width: 360px;
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index 758d60d91..1babb75f8 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -42,6 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
 
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
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 5ba718866..c478e110d 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -194,6 +194,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
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 2b80d3d58..c94bd2de4 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
@@ -65,7 +65,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -102,6 +102,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
   
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -128,6 +129,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -147,6 +149,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
   
   async openDelegarModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -187,6 +190,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
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 141bf24f5..c4abc7566 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
@@ -68,6 +68,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -131,6 +132,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async distartExpedientModal(body:any) {
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -214,7 +216,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -243,13 +245,13 @@ export class OptsExpedientePrPage implements OnInit {
       }
       else{
         console.log('Not open');
-        
       }
 
     });
   }
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -289,24 +291,5 @@ export class OptsExpedientePrPage implements OnInit {
     // window.history.back();
 
   }
-
-
-
-
-  async badRequest(message?: string, callback?) {
-    const modal = await this.modalController.create({
-      component: BadRequestPage,
-       componentProps: {
-        message: 'hello',
-      },
-      cssClass: 'modal modal-desktop'
-    });
-
-    modal.present()
-    
-    setTimeout(()=>{
-      modal.dismiss()
-    },1000)
-  }
   
 }
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 e695f712a..3964e824a 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -97,6 +97,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
+    this.popoverController.dismiss();
     //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800) {

From 36ffc2a2be1ca5950a2f55f8459326371d77c13d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 16:49:54 +0100
Subject: [PATCH 08/15] save

---
 .../gabinete-digital/despachos-pr/despachos-pr.page.html    | 4 ++--
 .../gabinete-digital/despachos-pr/despachos-pr.page.ts      | 5 +----
 .../pages/gabinete-digital/despachos/despachos.page.html    | 2 +-
 .../diplomas-assinar/diplomas-assinar.page.html             | 6 +++---
 .../diplomas-assinar/diplomas-assinar.page.ts               | 4 ++--
 src/app/pages/gabinete-digital/diplomas/diplomas.page.html  | 2 +-
 src/app/pages/gabinete-digital/diplomas/diplomas.page.ts    | 2 +-
 .../pages/gabinete-digital/event-list/event-list.page.html  | 2 +-
 .../pages/gabinete-digital/event-list/event-list.page.ts    | 4 ++--
 .../expedientes-pr/expedientes-pr.page.html                 | 6 +++---
 .../gabinete-digital/expedientes-pr/expedientes-pr.page.ts  | 3 ++-
 src/app/pages/gabinete-digital/pedidos/pedidos.page.html    | 6 +++---
 src/app/pages/gabinete-digital/pedidos/pedidos.page.ts      | 3 ++-
 .../pages/gabinete-digital/pendentes/pendentes.page.html    | 2 +-
 src/app/pages/gabinete-digital/pendentes/pendentes.page.ts  | 2 +-
 15 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index e20c1f0d7..706867ea8 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -6,10 +6,10 @@
   <div class="main-header">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais !!</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
       <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
     </div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index e1fc27c47..d74ecaaa5 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -162,10 +162,7 @@ export class DespachosPrPage implements OnInit {
     
   doRefresh(event) {
     this.LoadList();
-  
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
+    event.target.complete();
   }
   
   async viewExpedientDetail(serialNumber:any) {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 9bf46c45d..1f676176d 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -8,7 +8,7 @@
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
 
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 737d24541..0a777b7d7 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -6,8 +6,8 @@
 <ion-header class="ion-no-border header-2">
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas</ion-label></div>
-    <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <div class="theicon btn-refresh">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -18,7 +18,7 @@
 
   <div class="main-content">
           
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 8df933e43..b9afaddd4 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -43,10 +43,10 @@ export class DiplomasAssinarPage implements OnInit {
    this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
  }
  
- doRefresh() {
+ doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-     //event.target.complete();
+     event.target.complete();
    }, 2000);
  }
  
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 4be577878..272918cfc 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -7,7 +7,7 @@
   <div class="title">
     <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
     <div class="thetitle"><ion-label >Diplomas</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 0e397e700..82c65d7d6 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -199,7 +199,7 @@ constructor(
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      //event.target.complete();
+      event.target.complete();
     }, 2000);
   }
 
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 32740eb16..0c5749651 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index ca4c5d7ee..c440c77db 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -94,10 +94,10 @@ export class EventListPage implements OnInit {
     //this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadToApproveEvents();
-    console.log('refresh');
     setTimeout(() => {
+      event.target.complete();
      }, 2000);
   }
   close(){
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 86a9349d7..d2dbf3ede 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -8,8 +8,8 @@
 
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <div class="theicon btn-refresh">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -19,7 +19,7 @@
 
   <div class="main-content">
           
-    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-refresher-content>
       </ion-refresher-content>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 1605ddb95..9676e9706 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -116,9 +116,10 @@ export class ExpedientesPrPage implements OnInit {
     }
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
+      event.target.complete();
     }, 2000);
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 6c8c6db92..4bdf3d3bd 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -6,8 +6,8 @@
   <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
-    <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <div class="theicon btn-refresh">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -27,7 +27,7 @@
 <ion-content>
 
   <div class="main-content">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index fdf553e69..81e0fcec0 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -168,9 +168,10 @@ export class PedidosPage implements OnInit {
     console.log(this.taskType); 
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
+      event.target.complete();
     }, 2000);
   }
 
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index b1b9fa470..6e7911e1e 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -7,7 +7,7 @@
   <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index ede493f6a..d8a14ebcc 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -133,7 +133,7 @@ export class PendentesPage implements OnInit {
     this.LoadList();
  
     setTimeout(() => {
-      //event.target.complete();
+      event.target.complete();
     }, 2000);
   }
  

From b8bad482891dca3252cbd1d19c9b2eaec8cf7d49 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 08:43:09 +0100
Subject: [PATCH 09/15] save

---
 .../event-list/event-list.page.ts               |  7 ++++---
 .../approve-event/approve-event.page.html       |  3 ---
 .../events-to-approve.page.html                 |  2 +-
 .../events-to-approve/events-to-approve.page.ts | 17 ++---------------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index c440c77db..7c7d75437 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -77,14 +77,15 @@ export class EventListPage implements OnInit {
   }
 
   goToEventToApproveDetail(serialNumber:string){
-    let navigationExtras: NavigationExtras = {
+    console.log(serialNumber);
+    
+    /* let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
       }
-    };
+    }; */
 
     if(this.router.url == '/home/agenda/event-list'){
-      //this.router.navigate(['/home/agenda']);
       this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
     }
     else if(this.router.url == '/home/gabinete-digital/event-list'){
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index a65827e6e..07567ba65 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -100,9 +100,6 @@
 <ion-footer class="display-none-{{showAside}} ion-no-border">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
-      <ion-menu-button  (click)="openMenu()" autoHide="false">
-        <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
       <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
     </div>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index 71dc18df6..a336b3081 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -30,7 +30,7 @@
       <ion-item 
         class="item ion-no-padding width-100 cursor-pointer" 
         *ngFor="let event of eventsMDGPRList"
-        (click)="goToEventDetail(event)"
+        (click)="goToEventDetail(event.serialNumber)"
         >
         <!-- (click)="openApproveModal(event)" -->
         <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 0ffd71ce8..e17f8403d 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -77,21 +77,8 @@ export class EventsToApprovePage implements OnInit {
     this.showLoader = false;
   }
 
-  goToEventDetail(eventToAprove){
-    let InstanceId;
-
-    if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
-      InstanceId = ''
-    } else {
-      InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
-    }
-
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "serialNumber": eventToAprove.serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
+  goToEventDetail(event){
+    this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
   }
 
   /* async openApproveModal(eventToAprove) {

From 02e696b2814e8da920d083e0d904ed0d771f9f8c Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 09:47:24 +0100
Subject: [PATCH 10/15] save

---
 .../event-list/approve-event/approve-event.page.ts  |  7 -------
 .../book-meeting-modal/book-meeting-modal.page.ts   |  4 +++-
 .../expediente-detail/expediente-detail.page.ts     |  2 +-
 .../events-to-approve/events-to-approve.page.ts     | 13 +------------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 32f83fc2b..3a0ea4da1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -62,13 +62,6 @@ export class ApproveEventPage implements OnInit {
         this.caller = params["params"].caller;
       }
     });
-
-    /* this.activatedRoute.queryParams.subscribe(params => {
-      if(params["serialNumber"]) {
-        this.serialNumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
-      }
-    }); */
   }
 
   ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index e9677c103..63c551f92 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -141,13 +141,15 @@ export class BookMeetingModalPage implements OnInit {
       HasAttachments: true,
     }
     console.log(this.postData);
+    console.log(this.task);
+    
 
     if(this.task.FsId == '8') {
 
       try {
         switch (this.loggeduser.Profile) {
           case 'MDGPR':
-            await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
+            //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
         
           case 'PR':
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 528462d36..9d9dc654c 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
@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
-      //console.log(res);
+      /* console.log(res); */
       
       this.task = {
         "SerialNumber": res.serialNumber,
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index e17f8403d..b10b79e00 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -59,21 +59,10 @@ export class EventsToApprovePage implements OnInit {
     this.eventsPRList = prEvents;
     console.log(this.eventsPRList);
     
-    /* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsPRList = res;
-
-      console.log('this.eventsPRList', this.eventsPRList)
-    }); */
     let mdEvents =  await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
     this.eventsMDGPRList = mdEvents;
     console.log(this.eventsMDGPRList);
-    /* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsMDGPRList = res;
-
-      console.log('this.eventsMDGPRList', this.eventsMDGPRList)
-    }); */
+    
     this.showLoader = false;
   }
 

From dcebb41d04d1303bb962e0b2f53375cbb2a38ebd Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 09:52:10 +0100
Subject: [PATCH 11/15] save

---
 src/app/pages/gabinete-digital/gabinete-digital.page.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 344ad82cb..364c5ed64 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -294,7 +294,9 @@ export class GabineteDigitalPage implements OnInit {
     this.LoadCounts();
     //this.refreshExpedientes();
 
-    event.target.complete();
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
   }
 
   notImplemented(){

From f949a9d1af9796da3916368ee09558d16b751427 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 10:20:19 +0100
Subject: [PATCH 12/15] save

---
 .../gabinete-digital/gabinete-digital.page.ts      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 364c5ed64..6545b3340 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -279,6 +279,8 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   doRefresh(event) {
+    console.log(event);
+    
     this.closeAllDesktopComponents();
     switch(this.loggeduser.Profile){
       case 'MDGPR':
@@ -294,9 +296,15 @@ export class GabineteDigitalPage implements OnInit {
     this.LoadCounts();
     //this.refreshExpedientes();
 
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
+    if(event){
+      setTimeout(() => {
+        event.target.complete();
+      }, 2000);
+    }
+    else{
+      console.log('null');
+      
+    }
   }
 
   notImplemented(){

From d1ce8be9fd677d77f2d6663012e7958b6430c143 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 10:25:47 +0100
Subject: [PATCH 13/15] save

---
 .../events-to-approve/events-to-approve.page.html               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index a336b3081..71dc18df6 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -30,7 +30,7 @@
       <ion-item 
         class="item ion-no-padding width-100 cursor-pointer" 
         *ngFor="let event of eventsMDGPRList"
-        (click)="goToEventDetail(event.serialNumber)"
+        (click)="goToEventDetail(event)"
         >
         <!-- (click)="openApproveModal(event)" -->
         <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">

From d652632e2dc2566e7784deae72a437c89bff8615 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 13:31:25 +0100
Subject: [PATCH 14/15] save

---
 .../gabinete-digital/event-list/event-list.page.html     | 4 ++--
 .../gabinete-digital/despachos-pr/despachos-pr.page.html | 7 ++-----
 .../gabinete-digital/despachos-pr/despachos-pr.page.scss | 2 +-
 .../gabinete-digital/despachos/despachos.page.html       | 9 +++------
 .../gabinete-digital/despachos/despachos.page.scss       | 5 +++--
 .../diplomas-assinar/diplomas-assinar.page.html          | 4 ++--
 .../shared/gabinete-digital/diplomas/diplomas.page.html  | 2 +-
 .../events-to-approve/events-to-approve.page.html        | 6 ++++--
 .../expedientes-pr/expedientes-pr.page.html              | 2 +-
 .../gabinete-digital/expedients/expedients.page.html     | 2 +-
 .../shared/gabinete-digital/pedidos/pedidos.page.html    | 4 ++--
 .../gabinete-digital/pendentes/pendentes.page.html       | 7 ++-----
 src/global.scss                                          | 5 +++++
 src/style/main.scss                                      | 2 ++
 src/theme/variables.scss                                 | 6 ++++++
 15 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 0c5749651..178d48c6b 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -31,7 +31,7 @@
     </div>
 
     <ion-list *ngSwitchCase="'MDGPR'">
-      <div *ngIf="eventsMDGPRList">
+      <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -52,7 +52,7 @@
       </div>
     </ion-list>
     <ion-list *ngSwitchCase="'PR'">
-      <div *ngIf="eventsPRList">
+      <div *ngIf="eventsPRList" class="overflow-y-auto height-100">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index c99755369..4108d80ed 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -22,8 +22,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="main-content width-100">
-    <div *ngIf="despachoList">
+  <div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -57,10 +56,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
index d3ee9e06a..a329d16cc 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
@@ -1,5 +1,5 @@
 @import '~src/function.scss';
-.main-content{
+.main-container{
     padding: 30px 20px 0 20px !important;
     margin: 0;
     color:#000;
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 7c63a6baa..a87c2957e 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -18,9 +18,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="despachoList">
-      <ion-list>
+  <div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
+      <ion-list part="divo">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList.length < 1">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
index 58e3a261d..60368b686 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
@@ -1,9 +1,10 @@
 @import '~src/function.scss';
 /* CONTENT */
 :host{
-    padding: 30px 20px 0 20px !important;
-    margin: 0;
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
 }
+
 .title{
     font-family: Roboto;
     font-size: 25px;
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 583eb6c80..c2bc707aa 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -19,8 +19,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="diplomasList">
+  <div class="width-100 overflow-y-auto height-100">
+    <div *ngIf="diplomasList.length >= 1">
       <ion-list >
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index b6bc41fa7..56dd370c9 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -28,7 +28,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment">
+  <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">
         <ion-item 
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index 71dc18df6..041d51227 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -1,4 +1,4 @@
-<ion-content>
+<ion-header>
   <div class="title width-100">
     <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -17,12 +17,14 @@
       </ion-segment>
     </ion-toolbar>
    </div>
+</ion-header>
+<ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
+  <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> --> 
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 6d5181109..2d8f048d2 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
@@ -15,7 +15,7 @@
     </ion-refresher-content>
   </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index 711c368a7..d410ad4a4 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -18,7 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 6bef156e8..e906e3145 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList">
+    <div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
       </ion-list>
 
     </div>
-    <div *ngIf="deferimentoList">
+    <div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'deferimento'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index da437d04f..9690dedd9 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -18,8 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="pendentesList">
+  <div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -49,10 +48,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
+  <div *ngIf="pendentesList.length < 1">
   
     <ion-list>
       <ion-item>
diff --git a/src/global.scss b/src/global.scss
index 7144cefa4..e573588a7 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -693,6 +693,11 @@ app-header-no-search  .ion-toolbar{
     margin: 0px auto;
 }
 
+/* .main-content{
+    height: 100% !important;
+    overflow-y: auto !important;
+} */
+
 
 body, .blue-background{ background: #0782C9 !important;}
 
diff --git a/src/style/main.scss b/src/style/main.scss
index 1549a2300..4ccbb4f2b 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -420,6 +420,8 @@
     border-bottom-right-radius: 25px;
 }
 
+
+
 // system spacing
 
 
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 127cba229..c5b42386b 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -559,6 +559,12 @@ $app-theme: mat-light-theme((
 }
 }
 
+/* .main-content{
+  width: 100%;
+  height: 100% !important;
+  overflow-y: auto;
+} */
+
 
 
 /* Importing Bootstrap SCSS file. */

From 0f3fb2a602e6c2f247b36011f69660694e65faaa Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 23 Jun 2021 15:42:55 +0100
Subject: [PATCH 15/15] save

---
 src/app/pages/events/events.page.html                |  2 +-
 src/app/pages/events/events.page.ts                  |  3 ++-
 .../despachos/despacho/despacho.page.ts              |  7 ++++---
 .../gabinete-digital/despachos/despachos.page.ts     | 12 ++++++++++--
 src/app/services/processes.service.ts                |  4 +++-
 .../despachos-pr/despachos-pr.page.ts                |  3 ++-
 .../gabinete-digital/despachos/despachos.page.ts     |  7 ++++++-
 .../diplomas-assinar/diplomas-assinar.page.ts        |  6 ++++--
 .../gabinete-digital/diplomas/diplomas.page.ts       | 12 ++++++++----
 .../shared/gabinete-digital/pedidos/pedidos.page.ts  |  4 +++-
 10 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 54e6d6ad3..0b3fd939f 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -55,7 +55,7 @@
               </div>
               <div class="schedule-details">
                 <div class="location">{{event.Location}}</div>
-                <div class="description">{{event.Subject}}</div>
+                <div class="description">{{event.Subject.substring(0,maxSubjectLength)}}</div>
               </div>
             </div>
             </ion-item>
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index a7f108370..5a14be94a 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -43,7 +43,8 @@ export class EventsPage implements OnInit {
   public profile:string;
   currentEvent: any;
 
-  eventsList: Event[];  
+  eventsList: Event[];
+  maxSubjectLength = 140;
   officialeventsList: Event[];
   personaleventsList: Event[];
 
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 b79c2a7ee..36632cd8e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -88,8 +88,6 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-    // window.history.back()
-
     if (window.innerWidth <= 800) {
       this.router.navigate(['/home/gabinete-digital/despachos']);
     } else {
@@ -100,7 +98,6 @@ export class DespachoPage implements OnInit {
       }
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-
   }
 
 
@@ -140,12 +137,16 @@ export class DespachoPage implements OnInit {
         console.log(users);
         
       });
+      console.log(this.task.FolderId);
+      
       this.getDocumentDetails(this.task.FolderId, '361');
 
     });
   }
 
   getDocumentDetails(forlderId:string, applicationId:string) {
+    console.log(forlderId);
+    
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
       console.log(res['Documents']);
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index ed82d9461..1ea664a91 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -80,12 +80,15 @@ export class DespachosPage implements OnInit {
   }
 
   async LoadList() {
-
+    console.log('HERE');
+    
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
     
     console.log(result);
+    console.log('OI');
+    
 
     await result.forEach( (element, index) => {
       
@@ -101,7 +104,7 @@ export class DespachosPage implements OnInit {
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocId,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
         }
@@ -110,9 +113,14 @@ export class DespachosPage implements OnInit {
       
     });
 
+    console.log(this.despachoList);
+    
+
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 6a382fb71..1ec0cd1b6 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -244,11 +244,13 @@ export class ProcessesService {
   }
 
   GetDocumentDetails(DocId:string, FsId:string){
+    console.log(DocId);
+    
     const geturl = environment.apiURL + 'search/documents';
     let params = new HttpParams();
 
     params = params.set("docId", DocId);
-    params = params.set("applicationid", FsId);
+    params = params.set("applicationId", FsId);
     
     let options = { 
       headers: this.headers, 
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 2868d4dc8..ed8b1de8b 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 89031e4d4..fbfb80fbb 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
  }
 
   async LoadList(){
+    console.log('HERE DESK');
+    
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
         "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
         "Remetente": element.workflowInstanceDataFields.Remetente,
         "DocumentsQty": 0,
-        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "DocId": element.workflowInstanceDataFields.DispatchDocId,
+        "FolderID": element.workflowInstanceDataFields.FolderID,
         "WorkflowName": element.workflowDisplayName,
         "activityInstanceName": element.activityInstanceName,
       }
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element['FolderID']);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 79a58e660..437e27e36 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -81,7 +81,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }
@@ -100,7 +101,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Sender,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+          "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 2f5ab780c..3b001438e 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -84,7 +84,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -103,7 +104,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -136,7 +138,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }
@@ -156,7 +159,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 61e31131b..e803456a8 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.ParecerDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }