From 53e3908fffca57dc033a535b42ee57fbfe270449 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 09:32:17 +0100
Subject: [PATCH 01/20] save

---
 src/app/pages/events/events.page.ts           |  3 +-
 .../discart-expedient-modal.page.html         |  2 +-
 .../book-meeting-modal.page.html              | 10 +++---
 src/app/pages/search/search.page.html         |  6 ++--
 src/app/pages/search/search.page.ts           | 31 ++++++++++++++++++-
 .../approve-event.component.html              | 14 ++++-----
 6 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 8359be511..3f3d5c133 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.RefreshEvents();
+        this.LoadList();
       }
     });
     /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{
@@ -106,8 +107,8 @@ export class EventsPage implements OnInit {
 
   doRefresh(event) {
     this.RefreshEvents();
-    event.target.complete();
     this.LoadList();
+    event.target.complete();
   }
 
   onSegmentChange(){
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
index 0ca41e81b..05fe484c6 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-title">
-      <label>Deseja eliminar este espediente?</label>
+      <label>Deseja eliminar este expediente?</label>
     </div>
     <div class="header-icon-left">
       <ion-icon (click)="close()" name="close-outline"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index bd36576bc..a37497c9f 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -6,8 +6,8 @@
   </div>
 </ion-header> -->
 
-<ion-content class="height-100">
-  <div class="main-content d-flex height-100">
+<ion-content>
+  <div class="main-content d-flex">
     <div class="content d-flex flex-column width-100">
       <div class="header-content">
         <div class="header-title">
@@ -150,12 +150,12 @@
     </div>
 
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
-          <ion-input [(ngModel)]="postData.Body.Text" placeholder="Detalhes"></ion-input>
+        <div class="ion-input-class-no-height width-100">
+          <ion-textarea [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 2955e13d4..ad083af1b 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -105,7 +105,7 @@
   
           <!-- most searched word-->
           <div class="most-searched-words d-md-flex flex-md-column">
-            <p class="title ion-text-center">Assunto mais pesquisado</p>
+            <p class="title ion-text-center">Assuntos mais recebidos</p>
             <div class="most-searched-word-container height-100 overflow-y-auto">
             </div>
           </div>
@@ -121,8 +121,8 @@
                   <div class="d-flex sort-by ion-justify-content-center">
                     <p>
                       <span class="order">Order por:</span>
-                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recente</span>
-                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigo</span>
+                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recentes</span>
+                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigos</span>
                     </p>
                   </div>
                   <div>
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index b394d7491..6b200e616 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -9,6 +9,7 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e
 import  WordCloud from 'src/plugin/wordcloud2.js';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
+import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
@@ -421,6 +422,8 @@ export class SearchPage implements OnInit {
 
 
   async viewDetail(id:any) {
+    console.log(id);
+    
     
     if(window.location.pathname  == '/home/agenda'){
 
@@ -430,7 +433,6 @@ export class SearchPage implements OnInit {
           eventId: id
         },
         cssClass: 'modal modal-desktop',
-        backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss().then((res)=>{});
@@ -439,6 +441,10 @@ export class SearchPage implements OnInit {
         
       this.viewPublicationDetail(id);
     }
+    else if(window.location.pathname == '/home/gabinete-digital'){
+      console.log('OPEN DOC');
+      
+    }
 
   }
 
@@ -456,5 +462,28 @@ export class SearchPage implements OnInit {
     modal.onDidDismiss().then(()=>{});
 
   }
+
+  async viewExpedientDetail(serialNumber:any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        serialNumber: serialNumber,
+        profile: 'mdgpr',
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+    });
+  }
   
 }
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index 5b868267f..bcc6ea3d2 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -68,13 +68,13 @@
       <div class="line"></div>
       <div class="middle-content">
         <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
-        <h5>Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-          </ion-label>
-        </ion-item>
-      </div>
+          <h5>Intervenientes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label>
+              <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
+            </ion-label>
+          </ion-item>
+        </div>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
             <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>

From 7e0b4bea7ee22fef4a46c43306504a34623c74cb Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 09:37:19 +0100
Subject: [PATCH 02/20] save

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

diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 2b379371f..1363d9c4d 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -40,8 +40,9 @@ export class ExpedientePage implements OnInit {
 
   LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      let tasksListReverse = result.reverse();
       this.taskslist = new Array();
-      result.forEach(element => {
+      tasksListReverse.forEach(element => {
         let task: DailyWorkTask = {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceDataFields.Subject,

From 9718a9f98d8ee87754f847cfcaf3e9be189bacd9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Apr 2021 10:04:58 +0100
Subject: [PATCH 03/20] Add attendees for edit event modal

---
 .../pages/agenda/edit-event/edit-event.page.html |  3 +--
 .../pages/agenda/edit-event/edit-event.page.ts   | 16 ++++++++--------
 .../pages/agenda/new-event/new-event.page.html   |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 7e3974aae..f4a7d4e74 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -61,7 +61,7 @@
                 <div class="ion-input-class">
                   <ion-select  placeholder="Selecione tipo" 
                   [(ngModel)]="postEvent.Categories[0]"
-                  selectedText="{{postEvent.Categories[0]}}" 
+                  selectedText="{{postEvent.Categories[0]}}"
                   interface="action-sheet" 
                   Cancel-text="Cancelar" required>
                     <ion-select-option value="Reunião">Reunião</ion-select-option>
@@ -203,7 +203,6 @@
           </div>
         </div>
 
-
         <div hidden>
           <ion-item>
             <ion-label>Documentos Anexados</ion-label>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 5d5245903..ceeebcdd1 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -37,7 +37,7 @@ export class EditEventPage implements OnInit {
     private eventsService: EventsService,
     private alertService: AlertService,
     public alertController: AlertController,
-  ) { 
+  ) {
     this.isEventEdited = false;
     this.postEvent = this.navParams.get('event');
 
@@ -75,7 +75,6 @@ export class EditEventPage implements OnInit {
     this.modalController.dismiss();
   }
   save(){
-    console.log(this.postEvent);
     
     this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
       const alert = await this.alertController.create({
@@ -89,12 +88,11 @@ export class EditEventPage implements OnInit {
     this.modalController.dismiss(this.isEventEdited);
   }
 
-  async openAttendees()
-  {
+  async openAttendees() {
 
     this.adding = 'intervenient';
 
-    if(window.innerWidth == 1024) {
+    if(window.innerWidth <= 1024) {
       const modal = await this.modalController.create({
         component: AttendeesPage,
          componentProps: {
@@ -115,7 +113,6 @@ export class EditEventPage implements OnInit {
       });
     }
 
-
   }
 
   async dynamicSetIntervenient(data){
@@ -125,7 +122,6 @@ export class EditEventPage implements OnInit {
 
   async setIntervenient(data){
     this.taskParticipants = data;
-
     this.postEvent.Attendees = data;
   }
   
@@ -135,11 +131,15 @@ export class EditEventPage implements OnInit {
 
   async addParticipants(){
     this.adding = 'intervenient'
+
+    this.openAttendees();
   }
 
   async addParticipantsCC(){
     this.adding = 'CC'
+
+    this.openAttendees();
   }
 
   async closeComponent(){}
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 85fdc97a4..00c5a0d15 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -15,6 +15,7 @@
     <div class="ion-item-container">
       <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
+    
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">

From 370dce7bf9c7dc3195c32a45e0223ca3318f8a87 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 10:08:52 +0100
Subject: [PATCH 04/20] save

---
 src/app/pages/publications/new-action/new-action.page.html       | 1 -
 .../pages/publications/new-publication/new-publication.page.html | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index 1fb650f72..5a8ff7e6d 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -15,7 +15,6 @@
 </ion-header>
 
 <ion-content>
-  <div class="content-top"></div>
   <div class="content-container">
     <div class="title-content">
       <div class="div-title">
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index 5df45dc6c..2afd16c36 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -15,7 +15,6 @@
 </ion-header>
 
 <ion-content>
-  <div class="content-top"></div>
   <div class="content-container">
     <div class="title-content">
       <div class="div-title">

From 59f768488fe38a6bc6b57552da5e79db5614d1ce Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 10:20:01 +0100
Subject: [PATCH 05/20] save

---
 .../publication-detail/publication-detail.page.ts              | 3 +--
 .../publications/view-publications/view-publications.page.ts   | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 418dfb844..e2e7785d3 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -22,7 +22,7 @@ export class PublicationDetailPage implements OnInit {
     private publications:PublicationsService,
     ) { 
       this.publicationId = this.navParams.get('publicationId');
-      /* this.folderId = this.navParams.get('folderIdId'); */
+      this.folderId = this.navParams.get('folderId');
       this.publication = {
         DateIndex: null,
         DocumentId: '',
@@ -78,7 +78,6 @@ export class PublicationDetailPage implements OnInit {
   deletePost(){
     this.publications.DeletePublication(this.folderId, this.publicationId).then(res =>{
       console.log(res);
-      
     });
     this.close();
   }
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index ceae35606..64e32b201 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -107,13 +107,14 @@ export class ViewPublicationsPage implements OnInit {
       component: PublicationDetailPage,
       componentProps:{
         publicationId: publicationId,
+        folderId: this.folderId,
       },
       cssClass: 'publication-detail',
       backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then(()=>{
-      this.doRefresh(event);
+      this.getPublications();
     });
   }
 

From d4bb2a0a99b2d378e00f7bfef943f734a233a475 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 10:38:53 +0100
Subject: [PATCH 06/20] fix discart method

---
 .../discart-expedient-modal/discart-expedient-modal.page.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
index 7acf42a74..65f0ace3e 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
@@ -40,7 +40,7 @@ export class DiscartExpedientModalPage implements OnInit {
   }
   
   save(){
-    /* if(this.action != 'discart'){
+    if(this.action != 'discart'){
       let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
       console.log(body);
       this.processes.PostTaskAction(body);
@@ -49,7 +49,7 @@ export class DiscartExpedientModalPage implements OnInit {
       let body = { "serialNumber": this.serialNumber, "action": "Passivo" }
       console.log(body);
       this.processes.PostTaskAction(body);
-    } */
+    }
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss('close');
   }

From b7b55332606e690eff46c325e2ae7d4e40a64d45 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Apr 2021 11:52:28 +0100
Subject: [PATCH 07/20] Improve add event and edit event

---
 src/app/pages/agenda/agenda.page.ts           |   9 +-
 .../approve-event-modal.page.ts               |   9 +-
 .../agenda/edit-event/edit-event.page.html    |   6 +-
 .../agenda/edit-event/edit-event.page.ts      |  36 ++--
 .../agenda/new-event/new-event.page.html      |  34 ++--
 .../pages/agenda/new-event/new-event.page.ts  |  57 ++++--
 .../events/attendees/attendees.page.html      |  95 ++++++----
 .../pages/events/attendees/attendees.page.ts  | 169 +++++++++++++-----
 .../expedient-task-modal.page.html            |   2 +-
 9 files changed, 277 insertions(+), 140 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 1e7874633..b66a79c7d 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -112,7 +112,6 @@ export class AgendaPage implements OnInit {
 
   // this will make  toggle add event and.
   showEventEditOrOpen:  "edit" | "add" | "" = ""
-
   prEventList: Event[];
   mdEventList: Event[]
 
@@ -894,7 +893,8 @@ export class AgendaPage implements OnInit {
     const modal = await this.modalCtrl.create({
       component: ViewEventPage,
       componentProps:{
-        eventId: eventId
+        eventId: eventId,
+        adding: this.adding
       },
       cssClass: 'modal  modal-desktop',
       backdropDismiss: false
@@ -986,7 +986,6 @@ export class AgendaPage implements OnInit {
   }
 
   async AproveEventEditEvent(data){
-    console.log(data)
     this.postEvent =data;
     this.mobileComponent.transparentEventToApprove= true;
     this.mobileComponent.showAddNewEvent = true;
@@ -997,9 +996,7 @@ export class AgendaPage implements OnInit {
 
     if(Array.isArray(data)){
       if(data.length >= 1){
-       
-        console.log('save!!!',data.length);
-        console.log(data);
+      
         this.contacts = data ;
       }
     }
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
index b8fa2eef2..0ed22b7f7 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
@@ -34,10 +34,9 @@ export class ApproveEventModalPage implements OnInit {
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
-    )
-    {
+    ) {
       this.serialNumber = this.navParams.get('serialNumber');
-     }
+    }
 
   ngOnInit() {
     this.getTask();
@@ -72,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
   }
   approveTask(serialNumber:string){
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
-    console.log(body);
     this.processes.PostTaskAction(body);
     this.alertService.presentAlert('Operação realizada com sucesso!');
     this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -80,7 +78,6 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.modalController.dismiss(null);
@@ -89,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
   rejectTask(serialNumber:string){
   
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    console.log(body);
     this.processes.PostTaskAction(body);
     this.alertService.presentAlert('Operação realizada com sucesso!');
     this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -134,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
        "ReviewerComments": res.data,
        }
       }
-    console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.alertService.presentAlert('Operação realizada com sucesso!');
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index f4a7d4e74..501d7f7ea 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -144,7 +144,7 @@
                     <div class="list-people">
                       <ion-item lines="none">
                         <ion-list>
-                          <ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
+                          <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
                           <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                         </ion-list>
                       </ion-item>
@@ -164,7 +164,7 @@
                     <div class="list-people">
                       <ion-item lines="none">
                         <ion-list>
-                          <ion-label *ngIf="!taskParticipantsCc" class="list-people-title">Adicionar intervenientes</ion-label>
+                          <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
                           <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                         </ion-list>
                       </ion-item>
@@ -224,7 +224,7 @@
       [taskParticipants]="taskParticipants"
       [taskParticipantsCc]="taskParticipantsCc"
       [adding]="adding"
-      (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
+
     ></app-attendee-modal>
 
   </div>    
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index ceeebcdd1..240c75cc7 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -71,9 +71,11 @@ export class EditEventPage implements OnInit {
     };
     
   }
+  
   close(){
     this.modalController.dismiss();
   }
+
   save(){
     
     this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
@@ -90,13 +92,13 @@ export class EditEventPage implements OnInit {
 
   async openAttendees() {
 
-    this.adding = 'intervenient';
-
     if(window.innerWidth <= 1024) {
       const modal = await this.modalController.create({
         component: AttendeesPage,
          componentProps: {
-          eventAttendees: this.postEvent.Attendees
+          adding: this.adding,
+          taskParticipants: this.taskParticipants,
+          taskParticipantsCc: this.taskParticipantsCc
         },
         cssClass: 'attendee',
         backdropDismiss: false
@@ -105,41 +107,39 @@ export class EditEventPage implements OnInit {
       await modal.present();
   
       modal.onDidDismiss().then((data) => {
-        if (data['data'] != null)
-        { 
-          let newattendees: EventPerson[] = data['data'];
-          this.setIntervenient(newattendees);
+        
+        if(data){
+          data = data['data'];
+
+          const newAttendees: EventPerson[] = data['taskParticipants'];
+          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+          this.setIntervenient(newAttendees);
+          this.setIntervenientCC(newAttendeesCC);
         }
       });
     }
 
   }
 
-  async dynamicSetIntervenient(data){
-    this.taskParticipants = data['taskParticipants'];
-    this.taskParticipantsCc = data['taskParticipantsCc'];
-  }
-
-  async setIntervenient(data){
+  setIntervenient(data){
     this.taskParticipants = data;
     this.postEvent.Attendees = data;
   }
   
-  async setIntervenientCC(data){
+  setIntervenientCC(data){
     this.taskParticipantsCc = data;
   }
 
-  async addParticipants(){
+  addParticipants(){
     this.adding = 'intervenient'
 
     this.openAttendees();
   }
 
-  async addParticipantsCC(){
+  addParticipantsCC(){
     this.adding = 'CC'
-
     this.openAttendees();
   }
 
-  async closeComponent(){}
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 00c5a0d15..51efa7332 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -15,7 +15,6 @@
     <div class="ion-item-container">
       <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
-    
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -130,22 +129,30 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div (click)="openAttendees()" class="ion-input-class-no-height">
+        <div  class="ion-input-class-no-height">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <ion-label class="list-people-title">Adicionar participantes</ion-label>
-                <ion-label hidden >Text</ion-label>
-              </ion-list>
+              <ion-label  *ngIf="taskParticipants.length == 0"  class="list-people-title">Adicionar interveniente</ion-label>
+                <div class="list-people">
+                    <ion-item lines="none">
+                      <ion-list>
+                        <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
+                      </ion-list>
+                    </ion-item>
+                  </div>
+                </ion-list>
             </ion-item>
           </div>
-          <div class="add-people">
+          <div (click)="addParticipants()" class="add-people">
             <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
       </div>
     </div>
     
+
+    <!-- HIDDEN -->
     <div hidden class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -155,12 +162,19 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <ion-label class="list-people-title">Com conhecimento</ion-label>
-                <ion-label hidden >Text</ion-label>
-              </ion-list>
+              <ion-label class="list-people-title">Com conhecimento</ion-label>
+                <div class="list-people">
+                    <ion-item lines="none">
+                      <ion-list>
+                        <ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
+                          <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
+                      </ion-list>
+                    </ion-item>
+                  </div>
+                </ion-list>
             </ion-item>
           </div>
-          <div class="add-people">
+          <div (click)="addParticipantsCC()" class="add-people">
             <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index df72417e4..996aa1e9b 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -11,6 +11,7 @@ import { AttendeesPage } from '../../events/attendees/attendees.page';
   templateUrl: './new-event.page.html',
   styleUrls: ['./new-event.page.scss'],
 })
+
 export class NewEventPage implements OnInit {
   postEvent: Event;
   eventBody: EventBody;
@@ -21,6 +22,11 @@ export class NewEventPage implements OnInit {
   selectedDate: Date;
   minDate: string;
 
+  adding: "intervenient" | "CC";
+
+  taskParticipants: any = [];
+  taskParticipantsCc: any = [];
+
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,
@@ -28,7 +34,7 @@ export class NewEventPage implements OnInit {
   ) { 
     this.postEvent = new Event();
     this.eventBody = { BodyType : "1", Text : ""};
-      this.postEvent.Body = this.eventBody;
+    this.postEvent.Body = this.eventBody;
     this.profile = this.navParams.get('profile');
 
     this.selectedSegment = this.navParams.get('segment');
@@ -88,21 +94,19 @@ export class NewEventPage implements OnInit {
       };
     }
 
-
     window.onresize = (event) => {
       // if not mobile remove all component
       if( window.innerWidth >= 1024){
         this.modalController.dismiss();
       }
     };
-
   }
   close(){
     this.modalController.dismiss();
   }
   save(){
-    console.log(this.postEvent);
-    console.log(this.profile);
+/*     console.log(this.postEvent);
+    console.log(this.profile); */
     
     
     if(this.profile=='mdgpr'){
@@ -114,12 +118,13 @@ export class NewEventPage implements OnInit {
     this.modalController.dismiss(this.postEvent);
   }
 
-  async openAttendees()
-  {
+  async openAttendees() {
     const modal = await this.modalController.create({
       component: AttendeesPage,
        componentProps: {
-        eventAttendees: this.postEvent.Attendees
+        eventAttendees: this.postEvent.Attendees,
+        adding: this.adding,
+        taskParticipants: this.taskParticipants
       },
       cssClass: 'attendee',
       backdropDismiss: false
@@ -128,12 +133,36 @@ export class NewEventPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then((data) => {
-      if (data['data'] != null)
-      { 
-        let newattendees: EventPerson[] = data['data'];
-        this.postEvent.Attendees = newattendees;
+      
+      if(data){
+        data = data['data'];
+
+        const newAttendees: EventPerson[] = data['taskParticipants'];
+        const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+        this.setIntervenient(newAttendees);
+        this.setIntervenientCC(newAttendeesCC);
       }
     });
-}
+  }
 
-}
+  setIntervenient(data){
+    this.taskParticipants = data;
+    this.postEvent.Attendees = data;
+  }
+  
+  setIntervenientCC(data){
+    this.taskParticipantsCc = data;
+  }
+
+  addParticipants(){
+    this.adding = 'intervenient'
+    this.openAttendees();
+  }
+
+  addParticipantsCC(){
+    this.adding = 'CC'
+    this.openAttendees();
+  }
+
+}
\ No newline at end of file
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index 380e808b5..d3090535a 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -1,55 +1,84 @@
-<ion-header class="ion-no-border">
-  <ion-toolbar>
-    <ion-title>Participantes</ion-title>
-  </ion-toolbar>
-  <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
-      <ion-segment-button value="true">
-        Intervenientes
-      </ion-segment-button>
-      <ion-segment-button value="false">
-        Com Conhecimento
-      </ion-segment-button>
-    </ion-segment>
+<ion-header class="ion-no-border px-20">
+  <ion-toolbar class="px-10">
+    <ion-title class="pa-0">Adicionar intervenientes</ion-title>
   </ion-toolbar>
+  <ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
+  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 </ion-header>
-<ion-content>
-  <ion-item-group>
-    <ion-button class="btn-ok-no-width" fill="clear" color="#fff" shape="round" (click)="addAttendees()" expand="block">
-      <ion-label>Adicionar participantes</ion-label>
-    </ion-button>
-  </ion-item-group>
-  <ion-item-group [ngSwitch]="segment" *ngFor="let attendee of eventAttendees">
-    <ion-list *ngSwitchCase="attendee.IsRequired.toString()">
-      <ion-item-sliding>
-        <ion-item-options side="end">
-          <ion-item-option color="danger" (click)="removeAttendee(attendee)">Apagar</ion-item-option>
-        </ion-item-options>
-        <ion-item lines="none">
-          <ion-icon slot="start" name="person"></ion-icon>
+
+<ion-content class="height-100 overflow-y-auto">
+  
+  <ion-item-group class="d-flex flex-column height-100 ">
+    <ion-list lines="none"  class="flex-grow-1 overflow-y-auto height-100" >
+      <ion-item-sliding class="px-20">
+        <div *ngFor="let attendee of contacts;">
+          <ion-item lines="none" (click)="selectContact(attendee)" *ngIf="filterSearchList(attendee)" >
+            <div class="pr-10">
+              <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
+            </div>
+            <ion-label>
+              <h3>{{ attendee.Name }}</h3>
+              <p>{{ attendee.EmailAddress }}</p>
+            </ion-label>
+          </ion-item>
+        </div>
+
+      </ion-item-sliding>
+    </ion-list>
+    <hr/>
+
+    
+    <ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+      <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
+      <ion-item-sliding class="px-20"> 
+        <ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
+          <div class="pr-10">
+            <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
+          </div>
           <ion-label>
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
-          </ion-label>       
+          </ion-label>
+          <div style="color:red" (click)="remove(attendee)">
+            X
+          </div>
+        </ion-item>
+      </ion-item-sliding>
+    </ion-list>
+    <ion-list lines="none" *ngIf="taskParticipantsCc.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+      <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
+      
+      <ion-item-sliding  class="px-20"> 
+        <ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex">
+          <div class="pr-10">
+            <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
+          </div>
+          <ion-label>
+            <h3>{{ attendee.Name }}</h3>
+            <p>{{ attendee.EmailAddress }}</p>
+          </ion-label>
+          <div style="color:red" (click)="remove(attendee)">
+            X
+          </div>
         </ion-item>
       </ion-item-sliding>
     </ion-list>
   </ion-item-group>
+
 </ion-content>
 
-
-<ion-footer class="ion-no-border">
-  <ion-toolbar class="btn-div">
+<!-- Hide footer in gabinete-digital -->
+<ion-footer class="ion-no-border" *ngIf="currentPath != '/home/gabinete-digital' ">
+  <ion-toolbar class="width-100 d-flex justify-space-between px-20">
     <ion-buttons slot="start">
       <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>
         <ion-icon name="close" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
-    <ion-title></ion-title>
     <ion-buttons slot="end">
       <ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>OK</ion-label>
+        <ion-label>Gravar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
index 381044836..0f4ad656d 100644
--- a/src/app/pages/events/attendees/attendees.page.ts
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { EventPerson } from 'src/app/models/eventperson.model';
-import { EventsService } from 'src/app/services/events.service';
-import { ModalController, NavController } from '@ionic/angular';
-import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
+import { ModalController, NavParams } from '@ionic/angular';
+import { ContactsService } from 'src/app/services/contacts.service';
 
 @Component({
   selector: 'app-attendees',
@@ -11,69 +10,143 @@ import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
 })
 export class AttendeesPage implements OnInit {
 
-  eventAttendees: EventPerson[];
-  segment:string = "true";
-  shouldShowCancel:boolean = true;
-
-  searchCountryString = ''; // initialize your searchCountryString string empty
-
-  constructor(private eventService: EventsService, private modalCtrl: ModalController, 
-    private navCtrl: NavController) { 
-  }
+  // Defined by the API
+  contacts: EventPerson[];
+  showLoader: boolean = false;
+  selectedContact: EventPerson[] =[];
+  eventPersons: EventPerson[];
+  adding: "intervenient" | "CC";
+  currentPath = window.location.pathname;
+  
+  taskParticipants:EventPerson[] = [];
+  taskParticipantsCc:EventPerson[] = [];
 
+  constructor(
+    private modalCtrl: ModalController, 
+    private contactsService: ContactsService,
+    private navParams: NavParams,
+    private modalController: ModalController) {
+      this.adding = this.navParams.get('adding');
+      this.taskParticipants = this.navParams.get('taskParticipants');
+      this.taskParticipantsCc = this.navParams.get('taskParticipantsCc');
+    }
 
   ngOnInit() {
+    this.fetchContacts("");
+    
+    if(this.taskParticipants == null || this.taskParticipants == undefined){
+      this.taskParticipants = [];
+    }
+
+    if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){
+      this.taskParticipantsCc = [];
+    }
+    
   }
+  
+  ngOnChanges(event){}
 
   save(){
-    this.modalCtrl.dismiss(this.eventAttendees);
+
+    this.modalController.dismiss({
+      'taskParticipants': this.taskParticipants,
+      'taskParticipantsCc': this.taskParticipantsCc
+    });
   }
 
   close(){
-    this.modalCtrl.dismiss(null);
+    this.modalController.dismiss(false);
   }
 
-  removeAttendee(attendee: EventPerson)
-  {
-    let index: number = this.eventAttendees.findIndex((att) => {
-      return att.EmailAddress == attendee.EmailAddress
-    });
-
-    this.eventAttendees.splice(index, 1);
+  onChange(evt: any) {
+    this.fetchContacts(evt.detail.value);
   }
+
+  filterSearchList(itm: EventPerson): boolean {
+
+    if(this.adding == "intervenient"){
+      const result = this.taskParticipants.find((contact, index)=>{
+        
+        if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
+          index = index;
+          return contact;
+        }
+      });
+      return undefined == result;
+
+    } else if (this.adding == "CC") {
+
+      const result = this.taskParticipantsCc.find((contact, index)=>{
+        
+      if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
+          index = index;
+          return contact;
+        }
+      });
+
+      return undefined == result;
+    }
+    
+  }
+
+  remove(itm: EventPerson){
+
+    if(this.adding == "intervenient"){
+
+      this.taskParticipants = this.taskParticipants.filter((contact, index) =>{
+
+        if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
+          return contact;
+        }
+        return false;
   
-  async addAttendees()
-  {
-    const modal = await this.modalCtrl.create({
-      component: AttendeeModalPage,
-      componentProps: {
-        eventPersons: this.eventAttendees
-      },
-      cssClass: 'attendee-modal',
-      backdropDismiss: false
-    });
+      });
 
-    await modal.present();
+    } else if (this.adding == "CC") {
 
-    modal.onDidDismiss().then((data) => {
-      let newattendees: EventPerson[] = data['data'];
+      this.taskParticipantsCc = this.taskParticipantsCc.filter((contact, index) =>{
+
+        if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
+          return contact;
+        }
+        return false;
+  
+      });
+    }
+
+  }
+
+  async selectContact(itm: EventPerson){
+    if(this.adding == "intervenient"){
+
+      this.taskParticipants.push(itm);
       
-      if (newattendees != null)
+    } else if (this.adding == "CC") {
+      
+      this.taskParticipantsCc.push(itm);
+    }
+  }
+
+  async fetchContacts(filter: string) {
+    this.showLoader = true;
+
+    this.contactsService.getContacts(filter).subscribe(result =>
       {
-        newattendees.forEach(newattendee => {
-          let att = {
-            "EmailAddress": newattendee.EmailAddress,
-            "Name": newattendee.Name,
-            "IsRequired": (this.segment == "true")
-          };
-          if (this.eventAttendees == null)
-          {
-            this.eventAttendees = new Array();
-          }
-          this.eventAttendees.push(att);
-        });
+        if (this.eventPersons != null)
+        {
+          this.eventPersons.forEach(attendee => {
+            const index: number = result.findIndex((cont) => {
+              return cont.EmailAddress == attendee.EmailAddress
+            });
+  
+            result.splice(index, 1);
+          });
+        }
+
+        this.contacts = result;
+        this.showLoader = false;
       }
-    });
+    );
   }
 
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 402f4f98a..bb2c41c9d 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -134,4 +134,4 @@
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
     <button class="btn-ok" shape="round" (click)="saveTask()">Gravar</button>
   </div>
-</ion-footer>
+</ion-footer>
\ No newline at end of file

From f19b1a3397c3c1dd2e647463835db0aa4d7c3c2c Mon Sep 17 00:00:00 2001
From: "gilson.manuel" <gilson.manuel@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 12:27:20 +0100
Subject: [PATCH 08/20] save

---
 src/app/pages/events/events.page.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 9e42d1831..3263e4690 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -34,7 +34,6 @@
     <ion-label>
       <p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
     </ion-label>
-
     <div class="next-meeting">
       <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
       <div class="meeting-description"> "{{currentEvent}}"</div>

From 4f0ee6047a96ef7cb75f76efee93ddcd7f6c694d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 14:07:50 +0100
Subject: [PATCH 09/20] save

---
 src/app/pages/gabinete-digital/gabinete-digital.page.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index d29307cc4..4c8e1798a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -13,6 +13,7 @@
       <!-- Aside left -->
       <div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
         <p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
+        
         <div class="aside overflow-y-auto d-flex d-md-block  flex-wrap justify-center width-100 px-20">
           <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
             <div class="d-flex justify-center">

From ffe95fc190b847c5300f0ee1ffbf7c98a18a58cd Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 14:08:05 +0100
Subject: [PATCH 10/20] save

---
 src/app/home/home-routing.module.ts           |  4 +++
 .../emend-message-modal.page.ts               |  6 ++--
 .../gabinete-digital/gabinete-digital.page.ts | 31 ++++++++++++++++---
 .../approve-event/approve-event.component.ts  | 16 ++++++++--
 .../agenda/new-event/new-event.component.ts   |  2 +-
 5 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 75c242352..34837370e 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -76,6 +76,10 @@ const routes: Routes = [
             path: 'edit-event',
             loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
           },
+          {
+            path: 'emend-message-modal',
+            loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
+          },
         ]
       },
       {
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index 937b1c0f2..bec2232f3 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -11,12 +11,14 @@ export class EmendMessageModalPage implements OnInit {
 
   constructor(
     private modalController: ModalController,
-  ) { }
+  ) {
+    this.emendMessage = '';
+   }
 
   ngOnInit() {
   }
   close(){
-    this.modalController.dismiss(this.emendMessage);
+    this.modalController.dismiss();
   }
   save(){
     this.modalController.dismiss(this.emendMessage);
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 692d35783..07e3f3810 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { ModalController } from '@ionic/angular';
 import { EventListPage } from './event-list/event-list.page';
 import { ExpedientePage } from './expediente/expediente.page';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -44,7 +44,8 @@ export class GabineteDigitalPage implements OnInit {
     private processesbackend:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
-    private route: ActivatedRoute,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
     ) { 
 
       window.onresize = (event) => {
@@ -57,10 +58,23 @@ export class GabineteDigitalPage implements OnInit {
 
       this.adjastModalHeight();
 
-      this.route.queryParams.subscribe(params => {
+      /* this.activatedRoute.queryParams.subscribe(params => {
         if(params["show"]){
           this.openExpedientListPage();
-        } 
+        }
+        else if(params["events-to-approve"]){
+          this.openEventsToApprovePage("MDGPR");
+        }
+      }); */
+
+      this.activatedRoute.paramMap.subscribe(paramMap =>{
+        if (paramMap.has("show")){
+          this.openExpedientListPage();
+        }
+        else if(paramMap.has("events")){
+          this.openEventsToApprovePage("MDGPR");
+          this.LoadCounts();
+        }
       });
       
     }
@@ -93,6 +107,15 @@ export class GabineteDigitalPage implements OnInit {
   ngOnInit() {
     //Initialize profile as mdgpr
     this.profile = "MDGPR";
+
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadCounts();
+      }
+    });
+
+
+    
     this.LoadCounts();
     /* this.eventService.getAllMdEvents.subscribe(res=>{
       console.log(res);
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts
index b67787367..3c2eb46e0 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
@@ -136,6 +136,8 @@ export class ApproveEventComponent implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
+      console.log(res.data);
+      
       if(res.data !== ''){
         let body = { "serialNumber": serialNumber, 
         "action": "Emendar",
@@ -145,8 +147,9 @@ export class ApproveEventComponent implements OnInit {
         }
       console.log(body);
       this.processes.PostTaskAction(body);
-      this.router.navigate(['/home/gabinete-digital/event-list']);
+      //this.router.navigate(['/home/gabinete-digital/event-list']);
       this.alertService.presentAlert('Operação realizada com sucesso!');
+      this.goToEventsToApprove();
       }
       else{
         this.alertService.presentAlert('Operação cancelada!');
@@ -154,4 +157,13 @@ export class ApproveEventComponent implements OnInit {
     });
   }
 
+  goToEventsToApprove(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "events": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  }
+
 }
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index 1e0375581..91a55acca 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -58,7 +58,7 @@ export class NewEventPage implements OnInit {
           Body: this.eventBody,
           Location: '',
           CalendarId: '',
-          CalendarName: this.selectedSegment,
+          CalendarName: '',
           StartDate: selectedStartdDate,
           EndDate: new Date(selectedEndDate),
           EventType: 'Reunião',

From 87b17e09f3ad495e5c4f8c40f0b6cd943d00ce66 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 15:01:03 +0100
Subject: [PATCH 11/20] save

---
 .../emend-message-modal/emend-message-modal.page.html  | 10 +++-------
 .../emend-message-modal/emend-message-modal.page.scss  |  9 ++++++++-
 .../emend-message-modal/emend-message-modal.page.ts    |  2 +-
 .../pages/gabinete-digital/gabinete-digital.page.html  |  5 ++++-
 .../pages/gabinete-digital/gabinete-digital.page.scss  |  9 +++++++++
 .../pages/gabinete-digital/gabinete-digital.page.ts    |  2 ++
 .../events-to-approve/events-to-approve.page.html      |  5 ++++-
 .../events-to-approve/events-to-approve.page.scss      |  9 +++++++++
 8 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
index cccbb6bd7..48207f9d6 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
@@ -15,12 +15,8 @@
   </ion-item>
 </ion-content>
 <ion-footer>
-  <ion-toolbar>
-    <div class="buttons">
-      <ion-item lines="none">
-        <ion-button class="button-reject" shape="round" (click)="close()">Cancelar</ion-button>
-        <ion-button class="button-approve" shape="round" (click)="save()">Gravar</ion-button>
-    </ion-item>
+  <div class="buttons width-100">
+    <button class="btn-delete" shape="round" (click)="close()">Cancelar</button>
+    <button class="btn-ok" shape="round" (click)="save()">Gravar</button>
   </div>
-  </ion-toolbar>
 </ion-footer>
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
index 54851ac15..58229d622 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
@@ -1,5 +1,5 @@
 .header-content{
-    width: 360px;
+    //width: 360px;
     overflow: auto;
     margin: 25px auto;
   }
@@ -38,4 +38,11 @@
     border-radius: 22.5px;
     --background: #42b9fe;
     margin: 0 0px 0 12px; 
+  }
+  .buttons{
+    display: flex;
+    width: 100% !important;
+    justify-content: space-between;
+    padding: 15px;
+    overflow: auto;
   }
\ No newline at end of file
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index bec2232f3..241c43cb1 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -18,7 +18,7 @@ export class EmendMessageModalPage implements OnInit {
   ngOnInit() {
   }
   close(){
-    this.modalController.dismiss();
+    this.modalController.dismiss('');
   }
   save(){
     this.modalController.dismiss(this.emendMessage);
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 4c8e1798a..1ead4f280 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -12,7 +12,10 @@
 
       <!-- Aside left -->
       <div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
-        <p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
+        <div class="title-container">
+          <span class="text-center mt-0 aside-title px-20">Gabinete Digital</span>
+          <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+        </div>
         
         <div class="aside overflow-y-auto d-flex d-md-block  flex-wrap justify-center width-100 px-20">
           <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 16aecaf24..438588a29 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -11,6 +11,15 @@ ion-content{
   ion-card-title{
       text-align: center;
   }
+  .title-container{
+    margin-bottom: 15px;
+    .title-icon{
+      float: right;
+      margin-right: 20px;
+      font-size: 30px;
+      color: #0782c9;
+    }
+  }
 
   ion-card{
     background-color: #d4d5ca;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 07e3f3810..be7cb9a58 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -160,6 +160,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   }
 
   doRefresh(event) {
+    this.closeAllDesktopComponents();
+    this.showEmptyContainer = true;
     this.LoadCounts();
 
     setTimeout(() => {
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 77933ac48..dfa1cf7bb 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,6 +1,9 @@
 <ion-content>
   <div class="title width-100">
-    <label>Eventos para Aprovação</label>
+    <div class="title-container">
+      <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
+      <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+    </div>
     <ion-toolbar>
       <ion-segment [(ngModel)]="profile">
         <ion-segment-button value="MDGPR">
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
index 7727a9871..3ccafbb04 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -2,6 +2,15 @@
     padding: 30px 20px 0 20px !important;
     margin: 0;
 }
+.title-container{
+  margin-bottom: 15px;
+  .title-icon{
+    float: right;
+    margin-right: 20px;
+    font-size: 30px;
+    color: #0782c9;
+  }
+}
 .title{
     font-family: Roboto;
     font-size: 25px;

From 3f0bd5de534790b6f566820fdae46cce4c7af0d1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 7 Apr 2021 15:13:31 +0100
Subject: [PATCH 12/20] Fixe bug for create or veiw event

---
 src/app/pages/agenda/agenda.page.html              |  8 +++++++-
 src/app/pages/agenda/agenda.page.ts                | 14 +++++++++-----
 .../agenda/edit-event/edit-event.component.ts      | 12 +++++++++---
 .../agenda/new-event/new-event.component.html      |  5 ++---
 .../shared/agenda/new-event/new-event.component.ts |  8 ++++++++
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 9133595b8..f1cf61d76 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -335,6 +335,7 @@
         [profile]="profile"
         [selectedSegment]=segment
         [taskParticipants]="taskParticipants"
+        [taskParticipantsCc]="taskParticipantsCc"
         [selectedDate]="eventSelectedDate"
         (onAddEvent)="openAddEventDismiss($event)"
         (openAttendeesComponent)="openAttendeesComponent($event)"
@@ -342,7 +343,9 @@
         [eventAttendees]="contacts"
         (clearContact)="clearContact()"
         (setContact)="setContact($event)"
-        
+
+        (setIntervenient)="setIntervenient($event)"
+        (setIntervenientCC)="setIntervenientCC($event)"
       ></app-new-event>
       <!-- Edit -->
       <app-edit-event  *ngIf="mobileComponent.showEditEvent"
@@ -353,6 +356,9 @@
         (openAttendeesComponent)="openAttendeesComponent($event)"
         (setContact)="setContact($event)"
         (closeComponent)="closeComponentEditEventOrAdd()"
+
+        (setIntervenient)="setIntervenient($event)"
+        (setIntervenientCC)="setIntervenientCC($event)"
       ></app-edit-event>
 
       <!-- View -->
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index b66a79c7d..b32ffdcfd 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -992,7 +992,7 @@ export class AgendaPage implements OnInit {
   }
 
   // open component
-  async openAttendeesComponent(data){
+  async openAttendeesComponent(data) {
 
     if(Array.isArray(data)){
       if(data.length >= 1){
@@ -1003,7 +1003,6 @@ export class AgendaPage implements OnInit {
     
     this.cloneAllmobileComponent();
     this.mobileComponent.showAttendees = true;
-
   }
 
   async clearContact(){
@@ -1046,14 +1045,19 @@ export class AgendaPage implements OnInit {
 
   }
 
-  async setIntervenient(data){
+  async setIntervenient(data) {
     this.taskParticipants = data;
 
-    this.postEvent
   }
   
-  async setIntervenientCC(data){
+  async setIntervenientCC(data) {
     this.taskParticipantsCc = data;
   }
 
+  // Emitters
+  // adding
+  async setAdding(adding:  "intervenient" | "CC" = "intervenient") {
+    this.adding =  adding;
+  }
+
 }
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index 0da22289c..080323b92 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -30,6 +30,10 @@ export class EditEventComponent implements OnInit {
 
   @Output() openAttendeesComponent = new EventEmitter<any>();
   @Output() closeComponent = new EventEmitter<any>();
+  
+  @Output() setIntervenient = new EventEmitter<any>();
+  @Output() setIntervenientCC = new EventEmitter<any>();
+
 
   constructor(
     private modalController: ModalController,
@@ -73,14 +77,16 @@ export class EditEventComponent implements OnInit {
 
     this.closeComponent.emit();
     this.clearContact.emit();
+
+    this.setIntervenient.emit([]);
+    this.setIntervenientCC.emit([]);
   }
 
-  async openAttendees()
-  {
+  async openAttendees() {
 
     this.openAttendeesComponent.emit();
     
     this.clearContact.emit();
-}
+  }
 
 }
diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html
index 54fc0b65d..4aba5c53e 100644
--- a/src/app/shared/agenda/new-event/new-event.component.html
+++ b/src/app/shared/agenda/new-event/new-event.component.html
@@ -147,17 +147,16 @@
       </div>
     </div>
     
-    <div hidden class="container-div">
+    <div class="container-div">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1-no-height">
+        <div class="ion-input-class-no-height flex-grow-1">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
                 <ion-label class="list-people-title">Com conhecimento</ion-label>
-                <ion-label hidden >Text</ion-label>
               </ion-list>
             </ion-item>
           </div>
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index 1e0375581..f2012825f 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -21,6 +21,11 @@ export class NewEventPage implements OnInit {
   @Input() selectedSegment: string;
   @Input() selectedDate: Date;
   @Input() taskParticipants: EventPerson[];
+  @Input() taskParticipantsCc: any = [];
+
+  
+  @Output() setIntervenient = new EventEmitter<any>();
+  @Output() setIntervenientCC = new EventEmitter<any>();
 
   @Output() onAddEvent = new EventEmitter<any>();
   @Output() openAttendeesComponent = new EventEmitter<any>();
@@ -122,6 +127,9 @@ export class NewEventPage implements OnInit {
 
     this.onAddEvent.emit(this.postEvent);
     this.GoBackEditOrAdd.emit();
+
+    this.setIntervenient.emit([]);
+    this.setIntervenientCC.emit([]);
   }
 
   async openAttendees(){

From 12c3857d1cd670cdf8536a09bb9b1994636d38e6 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 15:43:12 +0100
Subject: [PATCH 13/20] save

---
 .../approve-event-modal.page.html             | 20 ++++++++++++-------
 .../approve-event-modal.page.scss             |  7 +++++++
 src/theme/variables.scss                      |  3 +++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index b589d9ab9..5bf3fe573 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar1</ion-label>
+        <ion-label>Emendar</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>
@@ -56,11 +56,11 @@
   </div>
   <div class="middle-content">
     <h5>Intervenientes</h5>
-    <ion-item>
+    <ion-item class="ion-no-padding ion-no-margin">
       <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
     </ion-item>
     <h5>Detalhes</h5>
-    <ion-item>
+    <ion-item class="ion-no-padding ion-no-margin">
       <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
     </ion-item>
   </div>
@@ -68,7 +68,7 @@
   <div *ngIf="loadedAttachments" class="bottom-content">
     <ion-list>
       <h3>Documentos Anexados</h3>
-      <ion-item>
+      <ion-item class="ion-no-padding ion-no-margin">
       <ion-label>
         <p class="attach-title-item">Receita por Natureza</p>
         <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
@@ -78,11 +78,11 @@
   </div>
 </ion-content>
 <ion-footer>
-  <ion-toolbar>
+  <!-- <ion-toolbar>
     <div class="buttons">
     <ion-item lines="none">
       <p>
-        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
+        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">11Emendar</ion-button>
       </p>
       <p>
        <ion-menu-button autoHide="false">
@@ -99,5 +99,11 @@
       </p>
     </ion-item>
   </div>
-  </ion-toolbar>
+  </ion-toolbar> -->
+
+  <div class="buttons width-100">
+    <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
+    <button class="btn-no-color" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
+    <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+  </div>
 </ion-footer>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
index 1e8379f6c..b041fc18a 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
@@ -138,3 +138,10 @@ ion-menu{
   border-radius: 22.5px;
   --background: #ffe0e0;
 }
+
+.buttons{
+  display: flex;
+  justify-content: space-between;
+  padding: 20px;
+  overflow: auto;
+}
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 40a49b1da..66fa65889 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -444,6 +444,9 @@
   color: #061b52 !important;
   margin: 0 auto !important;
 }
+.btn-no-color{
+  background-color: #fff;
+}
 .bg-blue{
   --background:#0782c9;
   background:#0782c9;

From b89183f200e83616c0792195b827864631357bc6 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 15:57:44 +0100
Subject: [PATCH 14/20] save

---
 src/app/pages/agenda/agenda.page.ts                          | 1 +
 src/app/pages/gabinete-digital/event-list/event-list.page.ts | 2 ++
 src/app/pages/gabinete-digital/gabinete-digital.page.ts      | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index b66a79c7d..6e6168988 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -931,6 +931,7 @@ export class AgendaPage implements OnInit {
       const modal = await this.modalCtrl.create({
         component: EventListPage,
         componentProps:{
+          profile: this.profile,
         },
         cssClass: 'modal  modal-desktop',
         backdropDismiss: false
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 e40105049..c4ff82d22 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
@@ -32,6 +32,8 @@ export class EventListPage implements OnInit {
 
   ngOnInit() {
     this.profile = this.navParams.get('profile');
+    console.log(this.profile);
+    
     /* console.log(this.navParams.get('md')); */
     if(this.profile == "mdgpr"){
       this.profile = 'MDGPR'
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index be7cb9a58..e54eebe71 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -174,6 +174,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   }
 
   openEventsToApprovePage(profile:any){
+    console.log(profile);
+    
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 1024){
       this.openEventsToApproveList(profile);

From 701a79fd2ff8585de292700aacec7d4a27ca9e2b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 15:59:27 +0100
Subject: [PATCH 15/20] save

---
 src/app/pages/chat/messages/messages.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index c8802c92d..87175f7e1 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -13,7 +13,7 @@
           <ion-icon  (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
-      <div class="header-bottom" (click)="addContacts()">
+      <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
           <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
         </div>

From d6ed1f7faa073eafb71bb518e510421bad6a25c7 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 16:45:49 +0100
Subject: [PATCH 16/20] save

---
 .../view-publications/view-publications.page.scss           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss
index e353cf7ab..8d593e7f9 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.scss
+++ b/src/app/shared/publication/view-publications/view-publications.page.scss
@@ -107,15 +107,21 @@
   }
   
   .actions-icon{
+    display: flex;
     width: 92px;
     float: right;
     overflow: auto;
+    align-items: center;
+    justify-content: flex-end;
   }
   .actions-icon ion-icon{
       margin-left: 10px;
       font-size: 35px;
       float: right;
   }
+  /* .title-icon{
+    font-size: 40px !important;
+  } */
   .item-content-date{
     color: #797979;
     font-size: 13px;

From 44f0d55d832f14c017fb94e42dd5ec6ca330a42a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 16:46:21 +0100
Subject: [PATCH 17/20] add refresh

---
 src/app/pages/publications/publications.page.html        | 1 +
 src/app/pages/publications/publications.page.scss        | 9 ++++++---
 .../view-publications/view-publications.page.scss        | 1 +
 .../view-publications/view-publications.page.html        | 3 ++-
 src/global.scss                                          | 5 +++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index b2c6e612f..0399a0937 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -22,6 +22,7 @@
             </div>
             <div class="div-icon">
               <ion-icon (click)="AddPublicationFolder()" slot="end" src='assets/images/icons-add.svg'></ion-icon>
+              <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
             </div>
           </div>
         </div>
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index c89235c30..733b5e164 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -67,11 +67,14 @@ ion-toolbar{
       font-size: 25px;
     }
     .div-icon{
-      width: 40px;
-      float: right;
+      display: flex;
+      /* width: 45px;
+      float: right; */
       font-size: 35px;
       overflow: auto;
-      padding: 1px;
+      padding: 0 !important;
+      align-items: center;
+      justify-content: flex-end;
     }
     .div-icon ion-icon{
       float: right;
diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss
index 2da9c7ab9..361be3719 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.scss
+++ b/src/app/pages/publications/view-publications/view-publications.page.scss
@@ -113,6 +113,7 @@
     width: 92px;
     float: right;
     overflow: auto;
+    border: 1px solid red;
   }
   .actions-icon ion-icon{
       margin-left: 10px;
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 80f9080b6..08ef10e60 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -13,7 +13,8 @@
       </div>
       <div class="actions-icon">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
-        <ion-icon (click)="AddPublication('2',item.ProcessId)" slot="end" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="AddPublication('2',item.ProcessId)" src='assets/images/icons-add.svg'></ion-icon>
+        <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
       </div>
     </div>
   </div>
diff --git a/src/global.scss b/src/global.scss
index 4321ddc74..cbbd385c4 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -568,4 +568,9 @@ border-top: 1px solid #d8d8d8;
     -moz-border-radius: 3px !important;
     -ms-border-radius: 3px !important;
     -o-border-radius: 3px !important;
+  }
+  .title-icon{
+    font-size: 40px !important;
+    color: #0782c9;
+    overflow: auto;
   }
\ No newline at end of file

From 2f0c04a14584c6bcfd6ec76a5cd7dc00b2cda1f3 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 16:56:59 +0100
Subject: [PATCH 18/20] save

---
 .../view-publications/view-publications.page.scss         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss
index 8d593e7f9..147d06abf 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.scss
+++ b/src/app/shared/publication/view-publications/view-publications.page.scss
@@ -108,16 +108,16 @@
   
   .actions-icon{
     display: flex;
-    width: 92px;
-    float: right;
     overflow: auto;
-    align-items: center;
+    align-items: top;
     justify-content: flex-end;
+    padding: 0 !important;
   }
   .actions-icon ion-icon{
-      margin-left: 10px;
+      margin-left: 5px;
       font-size: 35px;
       float: right;
+      padding: 0 !important;
   }
   /* .title-icon{
     font-size: 40px !important;

From 8a4f296f96d224a8cd9353592910f995d2a3dee4 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 8 Apr 2021 01:56:11 +0100
Subject: [PATCH 19/20] save

---
 src/app/app-routing.module.ts                 |  4 ++++
 .../document-detail-routing.module.ts         | 17 +++++++++++++
 .../document-detail/document-detail.module.ts | 24 +++++++++++++++++++
 .../document-detail/document-detail.page.html | 10 ++++++++
 .../document-detail/document-detail.page.scss |  0
 .../document-detail.page.spec.ts              | 24 +++++++++++++++++++
 .../document-detail/document-detail.page.ts   | 15 ++++++++++++
 .../pages/publications/publications.page.scss |  2 +-
 src/app/services/processes.service.ts         | 14 +++++++++++
 9 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 src/app/modals/document-detail/document-detail-routing.module.ts
 create mode 100644 src/app/modals/document-detail/document-detail.module.ts
 create mode 100644 src/app/modals/document-detail/document-detail.page.html
 create mode 100644 src/app/modals/document-detail/document-detail.page.scss
 create mode 100644 src/app/modals/document-detail/document-detail.page.spec.ts
 create mode 100644 src/app/modals/document-detail/document-detail.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2d637573b..e4573a5ba 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -35,6 +35,10 @@ const routes: Routes = [
     path: 'expedients',
     loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
   },
+  {
+    path: 'document-detail',
+    loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/modals/document-detail/document-detail-routing.module.ts b/src/app/modals/document-detail/document-detail-routing.module.ts
new file mode 100644
index 000000000..db1857b89
--- /dev/null
+++ b/src/app/modals/document-detail/document-detail-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DocumentDetailPage } from './document-detail.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DocumentDetailPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DocumentDetailPageRoutingModule {}
diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts
new file mode 100644
index 000000000..78eb44eb1
--- /dev/null
+++ b/src/app/modals/document-detail/document-detail.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DocumentDetailPageRoutingModule } from './document-detail-routing.module';
+
+import { DocumentDetailPage } from './document-detail.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SharedModule,
+    DocumentDetailPageRoutingModule
+  ],
+  declarations: [
+    DocumentDetailPage,
+    SharedModule,]
+})
+export class DocumentDetailPageModule {}
diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html
new file mode 100644
index 000000000..91323eed8
--- /dev/null
+++ b/src/app/modals/document-detail/document-detail.page.html
@@ -0,0 +1,10 @@
+<ion-header>
+  <app-btn-modal-dismiss></app-btn-modal-dismiss>
+  <ion-toolbar>
+    <ion-title>document-detail</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>
diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modals/document-detail/document-detail.page.spec.ts b/src/app/modals/document-detail/document-detail.page.spec.ts
new file mode 100644
index 000000000..d21f72d70
--- /dev/null
+++ b/src/app/modals/document-detail/document-detail.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DocumentDetailPage } from './document-detail.page';
+
+describe('DocumentDetailPage', () => {
+  let component: DocumentDetailPage;
+  let fixture: ComponentFixture<DocumentDetailPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DocumentDetailPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DocumentDetailPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts
new file mode 100644
index 000000000..db679b63b
--- /dev/null
+++ b/src/app/modals/document-detail/document-detail.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-document-detail',
+  templateUrl: './document-detail.page.html',
+  styleUrls: ['./document-detail.page.scss'],
+})
+export class DocumentDetailPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index 733b5e164..f59e569bf 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -78,7 +78,7 @@ ion-toolbar{
     }
     .div-icon ion-icon{
       float: right;
-      padding-left: 20px;
+      padding-left: 10px;
     }
   }
   .main-content{
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 48750b8b0..e0a2ef32d 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -196,6 +196,20 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
+  GetDocumentDetails(DocId:string, FsId:string){
+    const geturl = environment.apiURL + 'ecm/document/viewrequestshort';
+    let params = new HttpParams();
+
+    params = params.set("docId", DocId);
+    params = params.set("applicationid", FsId);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
   
 
 

From a87fd0b6edae95891ed06af0a5f6af77ad28c041 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 8 Apr 2021 09:14:28 +0100
Subject: [PATCH 20/20] save

---
 package-lock.json                             | 70 ++++++++++++++++++-
 package.json                                  |  1 +
 .../agenda/edit-event/edit-event.page.ts      |  5 +-
 .../agenda/view-event/view-event.page.html    | 31 ++++----
 src/app/services/publications.service.ts      | 12 +++-
 .../agenda/edit-event/edit-event.component.ts | 11 +--
 .../agenda/view-event/view-event.page.html    | 10 +--
 .../view-publications.page.html               |  5 +-
 .../view-publications.page.ts                 |  9 +++
 9 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e5f76dab..714e3288f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6479,6 +6479,11 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+    },
     "default-gateway": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -7019,8 +7024,7 @@
     "entities": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
     "env-paths": {
       "version": "2.2.0",
@@ -8248,6 +8252,11 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
     "hex-color-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
@@ -8316,6 +8325,63 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "html-to-text": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-7.0.0.tgz",
+      "integrity": "sha512-UR/WMSHRN8m+L7qQUhbSoxylwBovNPS+xURn/pHeJvbnemhyMiuPYBTBGqB6s8ajAARN5jzKfF0d3CY86VANpA==",
+      "requires": {
+        "deepmerge": "^4.2.2",
+        "he": "^1.2.0",
+        "htmlparser2": "^6.0.0",
+        "minimist": "^1.2.5"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
+          "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.0.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+        },
+        "domhandler": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz",
+          "integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==",
+          "requires": {
+            "domelementtype": "^2.2.0"
+          }
+        },
+        "domutils": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.1.tgz",
+          "integrity": "sha512-hO1XwHMGAthA/1KL7c83oip/6UWo3FlUNIuWiWKltoiQ5oCOiqths8KknvY2jpOohUoUgnwa/+Rm7UpwpSbY/Q==",
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.1.0"
+          }
+        },
+        "htmlparser2": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz",
+          "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==",
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.0.0",
+            "domutils": "^2.4.4",
+            "entities": "^2.0.0"
+          }
+        }
+      }
+    },
     "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
diff --git a/package.json b/package.json
index e96404a36..637a324f2 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "cordova-res": "^0.15.3",
     "cordova-sqlite-storage": "^5.1.0",
     "date-fns": "^2.17.0",
+    "html-to-text": "^7.0.0",
     "ionic-selectable": "^4.7.1",
     "ionic2-alpha-scroll": "^2.0.1",
     "ionic2-calendar": "^0.6.6",
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 240c75cc7..7a23ad41b 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -40,6 +40,9 @@ export class EditEventPage implements OnInit {
   ) {
     this.isEventEdited = false;
     this.postEvent = this.navParams.get('event');
+    if(this.postEvent){
+      this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+    }
 
     this.taskParticipants = [];
     this.taskParticipantsCc = [];
@@ -62,7 +65,7 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
-
+    
     window.onresize = (event) => {
       // if not mobile remove all component
       if( window.innerWidth >= 800){
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index e5c8ab51b..744df111f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -52,21 +52,22 @@
         <div class="line"></div>
         <div class="middle-content">
           <div *ngIf="loadedEvent.Attendees">
-          <h5>Intervenientes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let attendee of loadedEvent.Attendees">
-                <p>{{attendee.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item>
-        </div>
-        <div *ngIf="loadedEvent.Body.Text">
-          <h5>Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
-          </ion-item>
-        </div>
+            <h5>Intervenientes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let attendee of loadedEvent.Attendees">
+                  <p>{{attendee.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="loadedEvent.Body.Text">
+            <h5>Detalhes</h5>
+            <ion-item lines="none" class="ion-no-margin ion-no-padding">
+              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+            </ion-item>
+          </div>
+          <div class="line"></div>
         </div>
       
         <div *ngIf="loadedAttachments" class="bottom-content width-100">
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 3fe1ef0fd..05a782f9c 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -3,7 +3,8 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { AuthService } from '../services/auth.service';
 import { User } from '../models/user.model';
-import { Observable } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators'
 
 @Injectable({
   providedIn: 'root'
@@ -80,7 +81,8 @@ export class PublicationsService {
       headers: this.headers,
       params: params
     };
-    return this.http.get<any>(`${geturl}`, options);
+    return this.http.get<any>(`${geturl}`, options)
+      .pipe(catchError(this.handleError));
   }
 
   GetPublicationById( publicationId:any){
@@ -140,6 +142,12 @@ export class PublicationsService {
 
 
 
+  handleError(error){
+    return throwError(error || 'Server Error');
+  }
+
+
+
 }
 
 
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index 080323b92..d78d7d57e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -39,14 +39,15 @@ export class EditEventComponent implements OnInit {
     private modalController: ModalController,
     private eventsService: EventsService,
     public alertController: AlertController,
-  ) { 
-   
-
+  ) 
+  { 
+    
   }
 
   ngOnInit() {
-    let innerHtml :string = this.postEvent.Body.Text;
-    this.postEvent.Body.Text = innerHtml;
+    if(this.postEvent){
+      this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+    }
     console.log(this.postEvent);
     
     this.isEventEdited = false;
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index e4349e261..e3378e3ca 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -44,10 +44,12 @@
           </ion-label>
         </ion-item>
       </div>
-      <h5>Detalhes</h5>
-      <ion-item lines="none" class="ion-no-margin ion-no-padding">
-          <ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
-      </ion-item>
+      <div *ngIf="loadedEvent.Body.Text">
+        <h5>Detalhes</h5>
+        <ion-item lines="none" class="ion-no-margin ion-no-padding">
+          <div [innerHTML]="loadedEvent.Body.Text"></div>
+        </ion-item>
+      </div>
     </div>
     <div class="line"></div>
   
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 08ef10e60..366ba96ec 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -50,7 +50,10 @@
           </div>
         </div>
       </div>
-      <div *ngIf="!publicationList" class="post-item">
+      <div *ngIf="!publicationList">
+        <p>{{error}}</p>
+      </div>
+      <div hidden *ngIf="!publicationList" class="post-item">
         <div class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">
         </div>
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index ca483e02d..64ab0580f 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -19,6 +19,8 @@ export class ViewPublicationsPage implements OnInit {
   publicationList: Publication[];
   item: PublicationFolder;
 
+  error: any;
+
   @Input() folderId: string;
   @Output() addNewPublication =  new EventEmitter<any>();
   @Output() openPublicationDetails= new EventEmitter<any>();
@@ -95,6 +97,13 @@ export class ViewPublicationsPage implements OnInit {
       });
       console.log(this.publicationList);
       this.showLoader = false;
+    },
+    (error)=>{
+      if(error.status == '404'){
+        console.log('NOT FOUND');
+        this.error = 'Sem publicações disponíveis!';
+      }
+      
     });
     
   }