From a7277f0f9091cf2f11cddf792ceeeedd5544f50e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 28 Apr 2021 11:06:55 +0100
Subject: [PATCH 1/6] Improve gabenite digital(possible conflict)

---
 src/app/models/dailyworktask.model.ts         |  46 ++++
 .../agenda/view-event/view-event.page.html    |  52 ++--
 .../agenda/view-event/view-event.page.ts      |  57 +++-
 .../expediente-detail.page.html               |   6 +-
 src/app/services/processes.service.ts         |   7 +-
 .../view-event/options/options.component.html |  14 +
 .../view-event/options/options.component.scss |  54 ++++
 .../options/options.component.spec.ts         |  24 ++
 .../view-event/options/options.component.ts   |  14 +
 .../agenda/view-event/view-event.module.ts    |   6 +-
 .../agenda/view-event/view-event.page.html    |   6 +-
 .../agenda/view-event/view-event.page.scss    |  12 +-
 .../agenda/view-event/view-event.page.ts      |  26 +-
 .../despachos/despachos.page.html             |  42 ++-
 .../despachos/despachos.page.ts               | 252 +++++++++++++-----
 .../expediente/expediente.page.html           |  47 +---
 .../pedidos/pedidos.page.html                 |  47 +++-
 .../gabinete-digital/pedidos/pedidos.page.ts  | 154 ++++++++++-
 src/global.scss                               |  12 +
 19 files changed, 728 insertions(+), 150 deletions(-)
 create mode 100644 src/app/shared/agenda/view-event/options/options.component.html
 create mode 100644 src/app/shared/agenda/view-event/options/options.component.scss
 create mode 100644 src/app/shared/agenda/view-event/options/options.component.spec.ts
 create mode 100644 src/app/shared/agenda/view-event/options/options.component.ts

diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts
index 3f3aea829..a036318a4 100644
--- a/src/app/models/dailyworktask.model.ts
+++ b/src/app/models/dailyworktask.model.ts
@@ -5,4 +5,50 @@ export class DailyWorkTask{
     CreateDate: string;
     DocumentURL: string;
     Remetente:string;
+}
+
+export class tasksList{
+    actions: null;
+    formURL: string;
+    originator: {
+        displayName: string,
+        email: string,
+        fqn: string,
+        manager: string,
+        username: string,
+    };
+    serialNumber: string;
+    taskStartDate: string;
+    workflowDisplayName: string;
+    workflowID: number
+    workflowInstanceDataFields: {
+        AttachmentsProcessLastInstanceId: number,
+        DispatchDocId: number,
+        DispatchImageId: number,
+        DistributionTypeName: string,
+        DocID: number,
+        DocIDTmp: string,
+        FolderID: number,
+        ImageID: string,
+        ImageIDTmp: string,
+        ImageXMLTmp: string,
+        InstanceDistributionId: number,
+        InstanceID: string,
+        InstanceIDNew: string,
+        NewSerialNumber: string,
+        ReviewUserComent: string,
+        ReviewUserEmail: string,
+        ReviewUserName: string,
+        SourceID: number,
+        SourceSecFsID: number,
+        SourceType: string,
+        Subject: string,
+        TaskMessage: string,
+        UserName: string,
+        WorkflowID: string,
+        wxUserID: number,
+    }
+    workflowInstanceFolio: string
+    workflowInstanceID: number
+    workflowName: string
 }
\ No newline at end of file
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 61abd4fa6..905a5c5fa 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -1,21 +1,37 @@
-<!-- <ion-header  class="ion-no-border">
-  <ion-toolbar class="header-toolbar">
-    <div class="main-header">
-      <div class="title-content">
-        <div class="left">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-        </div>
-        <div class="middle">
-          <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
-        </div>
-        <div class="div-icon">
-          <ion-icon class="edit" (click)="editEvent()" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
-          <ion-icon class="delete" (click)="deleteEvent()" name="trash-sharp"></ion-icon> 
-        </div>
-      </div>
-    </div>
-  </ion-toolbar>
-</ion-header> -->
+<ion-menu autoHide="false" side="end" content-id="main-content" >
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item  (click)="openExpedientActionsModal('0')">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item  (click)="openExpedientActionsModal('1')">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+      <ion-item  (click)="openExpedientActionsModal('2')">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item>
+      <ion-item  (click)="openBookMeetingModal()">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item>
+      <!-- <ion-item (click)="deleteEvent()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item> -->
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page d-none" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
 
 <ion-content class="height-100">
   <div class="main-content d-flex height-100">
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index ce8e2d8fc..b58c36be9 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -10,6 +10,7 @@ import { EditEventPage } from '../edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 
 @Component({
   selector: 'app-view-event',
@@ -37,6 +38,8 @@ export class ViewEventPage implements OnInit {
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
   
+  dicIndex = 0;
+
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,
@@ -53,6 +56,7 @@ export class ViewEventPage implements OnInit {
     this.eventBody = { BodyType : "1", Text : ""};
     this.loadedEvent.Body = this.eventBody;
     this.eventId = this.navParams.get('eventId');
+    
   }
 
   ngOnInit() {
@@ -178,7 +182,43 @@ export class ViewEventPage implements OnInit {
   }
 
 
-  async openExpedientActionsModal(taskAction: any, task: any) {
+
+
+  async openBookMeetingModal() {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    let task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openExpedientActionsModal(taskAction: any) {
     //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
@@ -186,6 +226,21 @@ export class ViewEventPage implements OnInit {
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    let task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
       componentProps: {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 15a9b2b87..e25581eb4 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -24,15 +24,15 @@
   </ion-header>
   <ion-content>
     <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
+      <ion-item (click)="openExpedientActionsModal('0', fulltask)">
         <ion-icon name="documents" slot="start"></ion-icon>
         <ion-label>Efectuar Despacho</ion-label>
       </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
+      <ion-item (click)="openExpedientActionsModal('1', fulltask)">
         <ion-icon name="arrow-undo" slot="start"></ion-icon>
         <ion-label>Pedido de Parecer</ion-label>
       </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
+      <ion-item (click)="openExpedientActionsModal('2', fulltask)">
         <ion-icon name="arrow-redo" slot="start"></ion-icon>
         <ion-label>Pedido de Deferimento</ion-label>
       </ion-item>
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 55c65f18c..bed160c6a 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -148,7 +148,7 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
   
-  postDespatcho(body:any){
+  postDespatcho(body:any) {
     const geturl = environment.apiURL + 'Processes/CreateDispatch';
     let options = { 
       headers: this.headers,
@@ -210,9 +210,4 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
-  
-
-
-
-
 }
diff --git a/src/app/shared/agenda/view-event/options/options.component.html b/src/app/shared/agenda/view-event/options/options.component.html
new file mode 100644
index 000000000..c3e4ba0b5
--- /dev/null
+++ b/src/app/shared/agenda/view-event/options/options.component.html
@@ -0,0 +1,14 @@
+<ion-content class="container">
+  <div class="arrow-right">
+    <button class="btn-no-color">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+  <div class="buttons">
+    <button  class="btn-cancel" shape="round" >Efectuar Despacho</button>
+    <button  class="btn-ok" shape="round" >Pedido de Parecer</button>
+    <div class="solid"></div>
+    <button full class="btn-cancel mobile-only" shape="round" >Pedido de Deferimento</button>
+    <button  class="btn-delete" shape="round">Marcar reunião</button>
+  </div>
+</ion-content>
diff --git a/src/app/shared/agenda/view-event/options/options.component.scss b/src/app/shared/agenda/view-event/options/options.component.scss
new file mode 100644
index 000000000..308751df6
--- /dev/null
+++ b/src/app/shared/agenda/view-event/options/options.component.scss
@@ -0,0 +1,54 @@
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+  }
+  .arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+  }
+  .solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  @media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        //display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-ok{
+      width: 100% !important;
+      margin-bottom: 10px !important;
+  }
+    .btn-delete{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+    .solid{
+        display: block;
+    }
+    .mobile-only{
+      display: none !important;
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/app/shared/agenda/view-event/options/options.component.spec.ts b/src/app/shared/agenda/view-event/options/options.component.spec.ts
new file mode 100644
index 000000000..370263b60
--- /dev/null
+++ b/src/app/shared/agenda/view-event/options/options.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { OptionsComponent } from './options.component';
+
+describe('OptionsComponent', () => {
+  let component: OptionsComponent;
+  let fixture: ComponentFixture<OptionsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OptionsComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OptionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/agenda/view-event/options/options.component.ts b/src/app/shared/agenda/view-event/options/options.component.ts
new file mode 100644
index 000000000..b4280a4ec
--- /dev/null
+++ b/src/app/shared/agenda/view-event/options/options.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-options',
+  templateUrl: './options.component.html',
+  styleUrls: ['./options.component.scss'],
+})
+export class OptionsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}
diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts
index b2e97a22b..50a50e219 100644
--- a/src/app/shared/agenda/view-event/view-event.module.ts
+++ b/src/app/shared/agenda/view-event/view-event.module.ts
@@ -8,6 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
 
 import { ViewEventPage } from './view-event.page';
 import { SharedModule } from 'src/app/shared/shared.module';
+import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
 
 @NgModule({
   imports: [
@@ -17,6 +18,9 @@ import { SharedModule } from 'src/app/shared/shared.module';
     SharedModule,
     ViewEventPageRoutingModule
   ],
-  declarations: [ViewEventPage]
+  declarations: [
+    ViewEventPage,
+    ChatPopoverPage
+  ]
 })
 export class ViewEventPageModule {}
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 17fc8286e..f06689ef9 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -42,7 +42,7 @@
             <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </button>
         </div>
-        <div class="middle flex-grow-1">
+        <div class="middle flex-grow-1" (click)="openOptions()">
           <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
         </div>
 
@@ -120,5 +120,7 @@
       </ion-list>
     </div>
     <!-- <div class="line"></div> -->
-  </div>    
+  </div>  
+  
+  
 </ion-content>
\ No newline at end of file
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index a03c526dc..6e22037ec 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -168,4 +168,14 @@ ion-menu{
         font-size: 13px;
         }
     }
-  }
\ No newline at end of file
+  }
+
+.chat-popover .popover-content {
+  width: 100% !important;
+  left: 0 !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  top: calc(100% - 160px) !important;
+  max-height: 160px;
+  min-height: 160px; 
+}
\ No newline at end of file
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index f85e9a9d6..b7e9c65ae 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { AlertController, ModalController, NavParams } from '@ionic/angular';
+import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -10,6 +10,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { momentG }  from 'src/plugin/momentG';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
+import { OptionsComponent } from './options/options.component';
 
 @Component({
   selector: 'app-view-event',
@@ -49,6 +51,7 @@ export class ViewEventPage implements OnInit {
     private iab: InAppBrowser,
     private processes: ProcessesService,
     private modalController: ModalController,
+    public popoverController: PopoverController
   ) 
   {
     this.isEventEdited = false;
@@ -176,6 +179,27 @@ export class ViewEventPage implements OnInit {
     });
   }
 
+  async openOptions(ev: any) {
+    const popover = await this.popoverController.create({
+      component: OptionsComponent,
+      cssClass: 'chat-popover modal-desktop',
+      event: ev,
+      componentProps: {
+        // room: this.room,
+      },
+      translucent: true
+    });
+    await popover.present();
+    popover.onDidDismiss().then(res=>{
+      console.log(res);
+      if(res.data){
+        // this.getRoomInfo();
+        //this.modalController.dismiss(); 
+      };
+      
+    });
+  }
+
   async openBookMeetingModal(task: any) {
 
     const doc = this.loadedAttachments[ this.dicIndex];
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index c7ec589fd..97c6f5ed9 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -1,3 +1,38 @@
+<ion-menu autoHide="false" side="end" content-id="main-content" >
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+<!--       <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item> -->
+      <!-- <ion-item  (click)="openBookMeetingModal(task)">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item> -->
+      <ion-item (click)="distartExpedientModal()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page d-none" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
+
 <ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Despacho</ion-label></div>
@@ -30,7 +65,7 @@
       <ion-list *ngSwitchCase="'despachos'">
         <ion-item 
             class="expediente ion-no-padding"  
-            *ngFor = "let task of despachoList"
+            *ngFor = "let task of despachoList; let i = index"
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -43,7 +78,10 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button>
+                   
                     <label></label>
                   </div>
                 </div>
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index b12d320c1..4e6071543 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -1,14 +1,15 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 
 @Component({
   selector: 'app-despachos',
@@ -23,6 +24,9 @@ export class DespachosPage implements OnInit {
  taskslist:DailyWorkTask[];
  despachoList:DailyWorkTask[];
  deferimentoList:DailyWorkTask[];
+
+ taskList:tasksList[] = [];
+ 
  taskType: string;
  serialNumber:string;
 
@@ -30,7 +34,10 @@ export class DespachosPage implements OnInit {
  segment:string;
  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
- constructor(
+ loadedAttachments:any;
+ dicIndex = 0;
+
+ constructor (
    private processes:ProcessesService,
    private modalController: ModalController,
    private alertService: AlertService,
@@ -39,77 +46,190 @@ export class DespachosPage implements OnInit {
    }
 
  ngOnInit() {
-   //Inicializar segment
-   this.segment = "despachos";
-   this.LoadList();
- }
- segmentChanged(ev: any) {
-   this.LoadList();
- }
+    //Inicializar segment
+    this.segment = "despachos";
+    this.LoadList();
+  }
+  segmentChanged(ev: any) {
+    this.LoadList();
+  }
 
- notImplemented(){
-   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
- }
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
 
- openExpedientDetailPage(data){
-   console.log(data);
-   this.openExpedientDetail.emit(data);
- }
+  openExpedientDetailPage(data) {
+    this.openExpedientDetail.emit(data);
+  }
 
  LoadList(){
-     this.processes.GetTasksList("Despacho", false).subscribe(result => {
-       console.log(result);
-       
-       this.despachoList = new Array();
-       let res = result.reverse();
-       res.forEach(element => {
-         let task: DailyWorkTask = {
-           "SerialNumber": element.serialNumber,
-           "Folio": element.workflowInstanceFolio,
-           "Senders": element.originator.email,
-           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-           "Remetente": element.workflowInstanceDataFields.Remetente
-         }
-         this.despachoList.push(task);
-       });
-       console.log(this.despachoList);
-     });
+  this.processes.GetTasksList("Despacho", false).subscribe(result => {
+    console.log('Despacho', result);
+    
+    this.taskList = result;
+
+    this.despachoList = new Array();
+    let res = result.reverse();
+    res.forEach(element => {
+      let task: DailyWorkTask = {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceFolio,
+        "Senders": element.originator.email,
+        "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente
+      }
+      this.despachoList.push(task);
+    });
+  });
  }
 
- doRefresh(event) {
-   this.LoadList();
+  doRefresh(event) {
+    this.LoadList();
 
-   setTimeout(() => {
-     event.target.complete();
-   }, 2000);
- }
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
 
- async viewExpedientDetail(serialNumber:any) {
-   console.log(this.profile);
+  async viewExpedientDetail(serialNumber:any) {
+    console.log(this.profile);
 
-   let classs;
-   if( window.innerWidth <= 800){
-     classs = 'modal'
-   } else  {
-     classs = 'modal modal-desktop'
-   }
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
 
-   const modal = await this.modalController.create({
-     component: ExpedienteDetailPage,
-     componentProps:{
-       enterAnimation: "",
-       serialNumber: serialNumber,
-       profile: this.profile,
-     },
-     cssClass: classs,
-   });
-   await modal.present();
-   modal.onDidDismiss().then((res)=>{
-     console.log('refresh list');
-     this.LoadList();
-   });
- }
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        enterAnimation: "",
+        serialNumber: serialNumber,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('refresh list');
+      this.LoadList();
+    });
+  }
 
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        // this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+
+  async distartExpedientModal() {
+
+    const doc = this.taskList[ this.dicIndex];
+
+    console.log(doc, this.dicIndex, this.taskList)
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: doc.serialNumber,
+        folderId: doc.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        // this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+  
 }
  
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.html b/src/app/shared/gabinete-digital/expediente/expediente.page.html
index 4ecda8927..ae82fd0ed 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.html
@@ -1,3 +1,5 @@
+
+
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
@@ -7,9 +9,9 @@
           <ion-label class="title">Detalhes do Expediente</ion-label>
         </div>
         <div class="div-icon">
-            <ion-menu-button autoHide="false">
-              <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-            </ion-menu-button>
+          <ion-menu-button autoHide="false">
+            <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+          </ion-menu-button>
         </div>
       </div>
     </div>
@@ -29,45 +31,6 @@
   </ion-toolbar>
 </ion-header> -->
 
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-      <ion-item (click)="discartExpedient()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item>
-      <ion-item disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-content  padding>
   <div *ngIf="task">
   <h3 class="h3-event-title">Detalhes do Expediente</h3>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 09539eae4..18258d970 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -1,3 +1,38 @@
+<ion-menu autoHide="false" side="end" content-id="main-content" >
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu PEDIDO</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+<!--       <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item> -->
+      <!-- <ion-item  (click)="openBookMeetingModal(task)">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item> -->
+      <ion-item (click)="distartExpedientModal()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page d-none" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
+
 <ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
@@ -33,7 +68,7 @@
       <ion-list *ngSwitchCase="'parecer'">
         <ion-item 
             class="expediente ion-no-padding"  
-            *ngFor = "let task of parecerList"
+            *ngFor = "let task of parecerList; let i = index"
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -46,8 +81,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
+                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button>       
                   </div>
                 </div>
                 <div class="exp-bottom-detail">
@@ -75,8 +111,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
+                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> 
                   </div>
                 </div>
                 <div class="exp-bottom-detail">
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 52a0c313e..fe403e50f 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -2,13 +2,16 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { LoadingService } from 'src/app/services/loading.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 
 @Component({
   selector: 'app-pedidos',
@@ -23,6 +26,10 @@ export class PedidosPage implements OnInit {
 
   taskslist:DailyWorkTask[];
   parecerList:DailyWorkTask[];
+  
+  parecerListResult:tasksList[] = [];
+  deferimentoListResult:tasksList[] = [];
+
   deferimentoList:DailyWorkTask[];
   taskType: string;
   serialNumber:string;
@@ -31,6 +38,9 @@ export class PedidosPage implements OnInit {
   @Input() segment:string;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
+  loadedAttachments:any;
+  dicIndex = 0;
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
@@ -61,7 +71,9 @@ export class PedidosPage implements OnInit {
       this.taskType = "Pedido de Parecer";
       this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
         console.log(result);
-        
+  
+        this.parecerListResult =result;
+
         this.parecerList = new Array();
         let res = result.reverse();
         res.forEach(element => {
@@ -83,6 +95,8 @@ export class PedidosPage implements OnInit {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         console.log(result);
+
+        this.deferimentoListResult =result;
         
         this.deferimentoList = new Array();
         let res = result.reverse();
@@ -140,5 +154,141 @@ export class PedidosPage implements OnInit {
     });
   }
 
+
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    task = {
+      serialNumber: doc.serialNumber,
+      taskStartDate: doc.taskStartDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.workflowInstanceDataFields.SourceSecFsID, 
+        FolderID: null,
+        DocId: doc.workflowInstanceDataFields.SourceID, 
+        Subject: doc.workflowInstanceFolio
+      },
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        // this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    task = {
+      serialNumber: doc.serialNumber,
+      taskStartDate: doc.taskStartDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.workflowInstanceDataFields.SourceSecFsID, 
+        FolderID: null,
+        DocId: doc.workflowInstanceDataFields.SourceID, 
+        Subject: doc.workflowInstanceFolio
+      },
+    }
+
+    
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    await modal.present();
+    modal.onDidDismiss();
+
+  }
+
+  async distartExpedientModal(){
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: doc.serialNumber,
+        folderId: doc.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        //this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+
 }
   
\ No newline at end of file
diff --git a/src/global.scss b/src/global.scss
index 097dc0d75..c3668bb0a 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -648,3 +648,15 @@ body, .blue-background{ background: #0782C9;}
 ion-content {
     --background:none;
 }
+
+
+
+.chat-popover .popover-content {
+    width: 100% !important;
+    left: 0 !important;
+    bottom: 0 !important;
+    right: 0 !important;
+    top: calc(100% - 160px) !important;
+    max-height: 160px;
+    min-height: 160px; 
+  }
\ No newline at end of file

From 4a33f8c4c6862898e1ea4634c683adf1589f9083 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 28 Apr 2021 11:51:49 +0100
Subject: [PATCH 2/6] Improve responsive

---
 .../expediente/expediente-detail/expediente-detail.page.html  | 2 +-
 src/app/shared/gabinete-digital/pedidos/pedidos.page.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 4dc9a1e58..c07d81c87 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -59,7 +59,7 @@
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
-        <div class="title-content">
+        <div class="title-content d-flex">
           <app-btn-modal-dismiss></app-btn-modal-dismiss>
           <div class="middle">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 85d140cc2..7ed6c815b 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -82,9 +82,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    </ion-menu-button>       
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

From 63f1e09feaf940ef6ffd8c970a8b9cc8f2877cab Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 29 Apr 2021 15:25:14 +0100
Subject: [PATCH 3/6] Improve responsiveness and add doc to task

---
 config.xml                                    |    2 +-
 package-lock.json                             | 1515 ++++++++++++++++-
 package.json                                  |   10 +-
 src/app/app.module.ts                         |    4 +-
 src/app/home/home.page.ts                     |   76 +-
 .../pages/agenda/new-event/new-event.page.ts  |    3 +-
 .../agenda/view-event/view-event.page.html    |    8 +-
 .../agenda/view-event/view-event.page.scss    |    2 -
 src/app/pages/events/events.page.ts           |    2 +-
 .../approve-event-modal.page.html             |   29 +-
 .../approve-event-modal.page.scss             |    6 +-
 .../approve-event-modal.page.ts               |   16 +-
 .../approve-event/approve-event.page.html     |    6 +-
 .../book-meeting-modal.page.html              |    2 +-
 .../book-meeting-modal.page.scss              |   24 +-
 .../book-meeting-modal.page.ts                |   33 +
 .../expedient-task-modal.page.html            |    4 +-
 .../expedient-task-modal.page.scss            |   23 +
 .../expedient-task-modal.page.ts              |   41 +-
 .../expediente-detail.page.html               |  128 +-
 .../gabinete-digital.page.html                |   29 +-
 .../gabinete-digital/gabinete-digital.page.ts |    7 +
 src/app/pages/login/login.page.ts             |    2 +-
 src/app/pages/search/search.page.html         |    4 +-
 src/app/pages/search/search.page.ts           |    9 +-
 src/app/services/notifications.service.ts     |  112 +-
 .../approve-event.component.html              |    8 +
 .../agenda/edit-event/edit-event.component.ts |    3 +-
 .../agenda/new-event/new-event.component.html |    1 +
 .../agenda/new-event/new-event.component.ts   |    3 +-
 .../agenda/view-event/view-event.page.html    |   10 +-
 .../agenda/view-event/view-event.page.scss    |    8 +-
 .../despachos/despachos.page.html             |    4 +-
 src/app/shared/header/header.page.ts          |   17 +-
 src/global.scss                               |    9 +-
 35 files changed, 1919 insertions(+), 241 deletions(-)

diff --git a/config.xml b/config.xml
index 12eabcd1d..fc70cef4e 100644
--- a/config.xml
+++ b/config.xml
@@ -134,7 +134,7 @@
         </mfp:windows10>
         <mfp:appChecksum>0</mfp:appChecksum>
     </mfp:windows>
-    <mfp:platformVersion>8.0.0.00-20210214-154410</mfp:platformVersion>
+    <mfp:platformVersion>8.0.0.00-20210308-063916</mfp:platformVersion>
     <mfp:clientCustomInit enabled="false" />
     <mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" />
     <mfp:serverUri url="" />
diff --git a/package-lock.json b/package-lock.json
index 228bc2678..1bd13162f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5745,6 +5745,12 @@
       "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==",
       "dev": true
     },
+    "cordova-plugin-dialogs": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-dialogs/-/cordova-plugin-dialogs-2.0.2.tgz",
+      "integrity": "sha512-FUHI6eEVeoz2VkxbF0P56QlUQLGzXcvw3i4xuXyM9gEct6Y+FA3Xzgl2pJTZcTg5wRqLWzN08kgNoHPkom15pw==",
+      "dev": true
+    },
     "cordova-plugin-fcm-with-dependecy-updated": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-fcm-with-dependecy-updated/-/cordova-plugin-fcm-with-dependecy-updated-7.2.0.tgz",
@@ -5762,11 +5768,23 @@
         }
       }
     },
+    "cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA==",
+      "dev": true
+    },
     "cordova-plugin-filepath": {
       "version": "1.5.8",
       "resolved": "https://registry.npmjs.org/cordova-plugin-filepath/-/cordova-plugin-filepath-1.5.8.tgz",
       "integrity": "sha512-DhMVM9lkndPWQ+lI8Um0Yq648MBKWpNe/3PW057g4wuFrnAz/9nR8Qs4bjYt/yxwxMX/VMZC59qXOcksd2JYuw=="
     },
+    "cordova-plugin-globalization": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
+      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4=",
+      "dev": true
+    },
     "cordova-plugin-inappbrowser": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-4.1.0.tgz",
@@ -5785,6 +5803,1500 @@
       "integrity": "sha512-7KrmqLaOGq1RP8N2z1ezN1kqkWFzTwwMvQ3/qAkd+exxFZuOe3DIN4eaU1gdNphsxdirI8Ajnr9q4So5vQbWqw==",
       "dev": true
     },
+    "cordova-plugin-mfp": {
+      "version": "8.0.2021031007",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-mfp/-/cordova-plugin-mfp-8.0.2021031007.tgz",
+      "integrity": "sha512-ezSNKwr5GFMh5I0j7wDTgwmcE+nzPn2zKI0wNc1lRiPhWuNPG8weMXNKn8KwRjq9lsmGMNk1fgX36KySLpu+Ng==",
+      "dev": true,
+      "requires": {
+        "archiver": "4.0.2",
+        "cordova-serve": "^1.0.0",
+        "crc": "^3.4.0",
+        "elementtree": "0.1.6",
+        "express": "^4.14.0",
+        "ibm-strings": "~0.1.0",
+        "jssha": "2.2.0",
+        "mfp-config-xml": "0.0.5",
+        "nopt": "^3.0.6",
+        "npmlog": "0.0.6",
+        "plist": "1.1.0",
+        "promiz": "1.0.5",
+        "q": "0.9.7",
+        "request": "^2.73.0",
+        "rimraf": "2.4.4",
+        "shelljs": "0.3.0",
+        "sjcl": "1.0.3",
+        "xcode": "0.8.7"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "accepts": {
+          "version": "1.3.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi": {
+          "version": "0.3.1",
+          "bundled": true,
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true
+        },
+        "archiver": {
+          "version": "4.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "archiver-utils": "^2.1.0",
+            "async": "^3.2.0",
+            "buffer-crc32": "^0.2.1",
+            "glob": "^7.1.6",
+            "readable-stream": "^3.6.0",
+            "tar-stream": "^2.1.2",
+            "zip-stream": "^3.0.1"
+          }
+        },
+        "archiver-utils": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.0",
+            "lazystream": "^1.0.0",
+            "lodash.defaults": "^4.2.0",
+            "lodash.difference": "^4.5.0",
+            "lodash.flatten": "^4.4.0",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.union": "^4.6.0",
+            "normalize-path": "^3.0.0",
+            "readable-stream": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            }
+          }
+        },
+        "are-we-there-yet": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.0 || ^1.1.13"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            }
+          }
+        },
+        "array-flatten": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "asn1": {
+          "version": "0.2.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safer-buffer": "~2.1.0"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "async": {
+          "version": "3.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "bundled": true,
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.11.0",
+          "bundled": true,
+          "dev": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "tweetnacl": "^0.14.3"
+          }
+        },
+        "bl": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer": "^5.5.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.4.0"
+          }
+        },
+        "body-parser": {
+          "version": "1.19.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.0",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "on-finished": "~2.3.0",
+            "qs": "6.7.0",
+            "raw-body": "2.4.0",
+            "type-is": "~1.6.17"
+          },
+          "dependencies": {
+            "bytes": {
+              "version": "3.1.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "bplist-creator": {
+          "version": "0.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "stream-buffers": "~0.2.3"
+          }
+        },
+        "bplist-parser": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-crc32": {
+          "version": "0.2.13",
+          "bundled": true,
+          "dev": true
+        },
+        "bytes": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "colors": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "compress-commons": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-crc32": "^0.2.13",
+            "crc32-stream": "^3.0.1",
+            "normalize-path": "^3.0.0",
+            "readable-stream": "^2.3.7"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            }
+          }
+        },
+        "compressible": {
+          "version": "2.0.18",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": ">= 1.43.0 < 2"
+          }
+        },
+        "compression": {
+          "version": "1.7.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "accepts": "~1.3.5",
+            "bytes": "3.0.0",
+            "compressible": "~2.0.16",
+            "debug": "2.6.9",
+            "on-headers": "~1.0.2",
+            "safe-buffer": "5.1.2",
+            "vary": "~1.1.2"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "content-disposition": {
+          "version": "0.5.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        },
+        "content-type": {
+          "version": "1.0.4",
+          "bundled": true,
+          "dev": true
+        },
+        "cookie": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "cookie-signature": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "cordova-serve": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "chalk": "^1.1.1",
+            "compression": "^1.6.0",
+            "express": "^4.13.3",
+            "q": "^1.4.1"
+          },
+          "dependencies": {
+            "q": {
+              "version": "1.5.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "crc": {
+          "version": "3.8.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer": "^5.1.0"
+          }
+        },
+        "crc32-stream": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "crc": "^3.4.4",
+            "readable-stream": "^3.4.0"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "depd": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "destroy": {
+          "version": "1.0.4",
+          "bundled": true,
+          "dev": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "ee-first": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "elementtree": {
+          "version": "0.1.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "sax": "0.3.5"
+          }
+        },
+        "encodeurl": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "end-of-stream": {
+          "version": "1.4.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "^1.4.0"
+          }
+        },
+        "escape-html": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true
+        },
+        "etag": {
+          "version": "1.8.1",
+          "bundled": true,
+          "dev": true
+        },
+        "express": {
+          "version": "4.17.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "accepts": "~1.3.7",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.19.0",
+            "content-disposition": "0.5.3",
+            "content-type": "~1.0.4",
+            "cookie": "0.4.0",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "finalhandler": "~1.1.2",
+            "fresh": "0.5.2",
+            "merge-descriptors": "1.0.1",
+            "methods": "~1.1.2",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "~2.0.5",
+            "qs": "6.7.0",
+            "range-parser": "~1.2.1",
+            "safe-buffer": "5.1.2",
+            "send": "0.17.1",
+            "serve-static": "1.14.1",
+            "setprototypeof": "1.1.1",
+            "statuses": "~1.5.0",
+            "type-is": "~1.6.18",
+            "utils-merge": "1.0.1",
+            "vary": "~1.1.2"
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "extsprintf": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true
+        },
+        "fast-json-stable-stringify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "findup-sync": {
+          "version": "0.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "~5.0.0"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "5.0.15",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "2 || 3",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "forwarded": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "fresh": {
+          "version": "0.5.2",
+          "bundled": true,
+          "dev": true
+        },
+        "fs-constants": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "gauge": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi": "^0.3.0",
+            "has-unicode": "^2.0.0",
+            "lodash.pad": "^4.1.0",
+            "lodash.padend": "^4.1.0",
+            "lodash.padstart": "^4.1.0"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.6",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.1.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.3",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "has-ansi": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.7.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          },
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "ibm-strings": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "colors": "1.1.2",
+            "nopt": "3.0.6"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true,
+          "dev": true
+        },
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "bundled": true,
+          "dev": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "bundled": true,
+          "dev": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          },
+          "dependencies": {
+            "extsprintf": {
+              "version": "1.3.0",
+              "bundled": true,
+              "dev": true
+            },
+            "verror": {
+              "version": "1.10.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "assert-plus": "^1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "^1.2.0"
+              }
+            }
+          }
+        },
+        "jssha": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lazystream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.0.5"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            }
+          }
+        },
+        "lodash-node": {
+          "version": "2.4.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.defaults": {
+          "version": "4.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.difference": {
+          "version": "4.5.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.flatten": {
+          "version": "4.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.isplainobject": {
+          "version": "4.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.pad": {
+          "version": "4.5.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.padend": {
+          "version": "4.6.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.padstart": {
+          "version": "4.6.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.union": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true
+        },
+        "media-typer": {
+          "version": "0.3.0",
+          "bundled": true,
+          "dev": true
+        },
+        "merge-descriptors": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "methods": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "mfp-config-xml": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "elementtree": "0.1.6",
+            "findup-sync": "0.3.0",
+            "glob": "7.0.3",
+            "ibm-strings": "0.1.4",
+            "npmlog": "2.0.2",
+            "q": "1.4.1",
+            "underscore": "1.8.3",
+            "verror": "1.6.1"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.0.3",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "2 || 3",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "npmlog": {
+              "version": "2.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "ansi": "~0.3.1",
+                "are-we-there-yet": "~1.0.6",
+                "gauge": "~1.2.5"
+              }
+            },
+            "q": {
+              "version": "1.4.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.46.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.29",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.46.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "bundled": true,
+          "dev": true
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "npmlog": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi": "~0.2.1"
+          },
+          "dependencies": {
+            "ansi": {
+              "version": "0.2.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "bundled": true,
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "on-headers": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "bundled": true,
+          "dev": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true
+        },
+        "pegjs": {
+          "version": "0.6.2",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "plist": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "base64-js": "0.0.6",
+            "util-deprecate": "1.0.0",
+            "xmlbuilder": "2.2.1",
+            "xmldom": "0.1.x"
+          },
+          "dependencies": {
+            "base64-js": {
+              "version": "0.0.6",
+              "bundled": true,
+              "dev": true
+            },
+            "util-deprecate": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "promiz": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true
+        },
+        "proxy-addr": {
+          "version": "2.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "forwarded": "~0.1.2",
+            "ipaddr.js": "1.9.1"
+          }
+        },
+        "psl": {
+          "version": "1.8.0",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "q": {
+          "version": "0.9.7",
+          "bundled": true,
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "bundled": true,
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "bytes": {
+              "version": "3.1.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "request": {
+          "version": "2.88.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "qs": {
+              "version": "6.5.2",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "rimraf": {
+          "version": "2.4.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "^5.0.14"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "5.0.15",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "2 || 3",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "sax": {
+          "version": "0.3.5",
+          "bundled": true,
+          "dev": true
+        },
+        "send": {
+          "version": "0.17.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.17.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "shelljs": {
+          "version": "0.3.0",
+          "bundled": true,
+          "dev": true
+        },
+        "simple-plist": {
+          "version": "0.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bplist-creator": "0.0.4",
+            "bplist-parser": "0.0.6",
+            "plist": "1.1.0"
+          }
+        },
+        "sjcl": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "sshpk": {
+          "version": "1.16.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.0.2",
+            "tweetnacl": "~0.14.0"
+          }
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "bundled": true,
+          "dev": true
+        },
+        "stream-buffers": {
+          "version": "0.2.6",
+          "bundled": true,
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "tar-stream": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bl": "^4.0.3",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "toidentifier": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true
+        },
+        "type-is": {
+          "version": "1.6.18",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "media-typer": "0.3.0",
+            "mime-types": "~2.1.24"
+          }
+        },
+        "underscore": {
+          "version": "1.8.3",
+          "bundled": true,
+          "dev": true
+        },
+        "unpipe": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "uri-js": {
+          "version": "4.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "vary": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "verror": {
+          "version": "1.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.2.0"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "xcode": {
+          "version": "0.8.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "node-uuid": "1.4.7",
+            "pegjs": "0.6.2",
+            "simple-plist": "0.0.4"
+          },
+          "dependencies": {
+            "node-uuid": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "xmlbuilder": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "lodash-node": "~2.4.1"
+          }
+        },
+        "xmldom": {
+          "version": "0.1.31",
+          "bundled": true,
+          "dev": true
+        },
+        "zip-stream": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "archiver-utils": "^2.1.0",
+            "compress-commons": "^3.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        }
+      }
+    },
     "cordova-plugin-okhttp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-okhttp/-/cordova-plugin-okhttp-2.0.0.tgz",
@@ -17290,7 +18802,8 @@
         },
         "ssri": {
           "version": "6.0.1",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
diff --git a/package.json b/package.json
index 386204484..78e0ed55b 100644
--- a/package.json
+++ b/package.json
@@ -83,10 +83,14 @@
     "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-compat": "^1.2.0",
     "cordova-plugin-device": "^2.0.2",
+    "cordova-plugin-dialogs": "^2.0.2",
     "cordova-plugin-fcm-with-dependecy-updated": "^7.2.0",
+    "cordova-plugin-file": "^6.0.2",
+    "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-inappbrowser": "^4.0.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
     "cordova-plugin-ionic-webview": "^4.2.1",
+    "cordova-plugin-mfp": "^8.0.2021031007",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-statusbar": "^2.4.2",
     "cordova-plugin-whitelist": "^1.3.4",
@@ -113,7 +117,9 @@
       },
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-inappbrowser": {},
-      "cordova-plugin-camera": {},
+      "cordova-plugin-camera": {
+        "ANDROID_SUPPORT_V4_VERSION": "27.+"
+      },
       "cordova-sqlite-storage": {},
       "cordova-plugin-compat": {},
       "cordova-plugin-mfp": {},
@@ -138,4 +144,4 @@
     "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 80c561595..0d2e5eca1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -29,7 +29,7 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MessagesPage } from './pages/chat/messages/messages.page';
 
-import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 
 @NgModule({
@@ -57,7 +57,7 @@ import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
     //File,
     WebView,
     FilePath,
-    FCM
+    //FCM
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 42181215b..b273f9931 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -9,7 +9,7 @@ import { ModalController, AlertController, AnimationController, Platform } from
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */
 import { Router } from '@angular/router';
 
-import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 import { ViewEventPage } from '../pages/agenda/view-event/view-event.page';
 import { ExpedienteDetailPage } from '../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { ViewPublicationsPage } from '../pages/publications/view-publications/view-publications.page';
@@ -59,7 +59,7 @@ export class HomePage implements OnInit {
     private router: Router, 
     private modalController: ModalController, 
     public modalCtrl: AlertController, 
-    private fcm: FCM, 
+    // private fcm: FCM, 
     private animationController: AnimationController,
     private notificatinsservice: NotificationsService,
     private platform: Platform) {
@@ -103,51 +103,51 @@ export class HomePage implements OnInit {
   }
 
   
-  pushCordova() {
+  // pushCordova() {
 
-    if(this.platform.is('desktop')) {
-      console.log('Notifications not supported')
-    } else {
+  //   if(this.platform.is('desktop')) {
+  //     console.log('Notifications not supported')
+  //   } else {
 
-      this.fcm.onNotification().subscribe(data => {
-        this.viewEventDetail(data.IdObject)
-        if (data.wasTapped === true) {
-          console.log("Received in background: ", data);
+  //     this.fcm.onNotification().subscribe(data => {
+  //       this.viewEventDetail(data.IdObject)
+  //       if (data.wasTapped === true) {
+  //         console.log("Received in background: ", data);
   
-          if (data.Service === "agenda") {
-            //this.router.navigate(['/home/', service, IdObject, 'home']);
-            this.viewEventDetail(data.IdObject)
-          }
-          else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
-            console.log('expediante 1')
-            this.viewExpedientDetail(data.IdObject)
-          }
-          else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
-            // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', IdObject])}) 
-            this.openApproveModal(data.IdObject);
-          }
-          else if (data.Service === "accoes" && data.Object === "accao") {
-            this.viewPublications(data.IdObject)
-            alert(data.IdObject)
-          }
-          else if (data.Service === "accoes" && data.Object === "publicacao") {
-            this.viewPublicationDetail(data.IdObject)
-          }
+  //         if (data.Service === "agenda") {
+  //           //this.router.navigate(['/home/', service, IdObject, 'home']);
+  //           this.viewEventDetail(data.IdObject)
+  //         }
+  //         else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
+  //           console.log('expediante 1')
+  //           this.viewExpedientDetail(data.IdObject)
+  //         }
+  //         else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
+  //           // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', IdObject])}) 
+  //           this.openApproveModal(data.IdObject);
+  //         }
+  //         else if (data.Service === "accoes" && data.Object === "accao") {
+  //           this.viewPublications(data.IdObject)
+  //           alert(data.IdObject)
+  //         }
+  //         else if (data.Service === "accoes" && data.Object === "publicacao") {
+  //           this.viewPublicationDetail(data.IdObject)
+  //         }
   
-        } else {
-          console.log("Received in foreground: ", data);
+  //       } else {
+  //         console.log("Received in foreground: ", data);
   
-          console.log(data.Service)
-          console.log(data.Object)
-          console.log(data.IdObject)
+  //         console.log(data.Service)
+  //         console.log(data.Object)
+  //         console.log(data.IdObject)
         
-        };
-      });
-    }
+  //       };
+  //     });
+  //   }
 
     
 
-  }
+  // }
 
   async viewEventDetail(eventId: any) {
     console.log(this.profile);
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 9c5315007..e2c3effb9 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -206,7 +206,8 @@ export class NewEventPage implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true 
       }
     });
     await modal.present();
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 905a5c5fa..1deb67c05 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -37,16 +37,16 @@
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column width-100">
       <div class="main-header">
-        <div class="title-content">
+        <div class="title-content d-flex justify-between">
           <div class="left">
-            <button class="btn-no-color" (click)="close()">
+            <button class="btn-no-color d-flex align-center" (click)="close()">
               <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
             </button>
           </div>
-          <div class="middle">
+          <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
           </div>
-          <div class="div-icon">
+          <div class="div-icon d-flex">
             <button class="btn-no-color" (click)="editEvent()">
               <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
             </button>
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 78ef0dad7..700d61a96 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -43,9 +43,7 @@ ion-menu{
         overflow: auto;
       }
       .div-icon{
-        width: 92px;
         float: right;
-        overflow: auto;
         padding: 1px;
       }
       .div-icon .edit{
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 0bc385d2d..59d328151 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -264,7 +264,7 @@ export class EventsPage implements OnInit {
   async viewEventDetail(eventId:any) {
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal'
+      classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }
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 a51a0fec8..82683e678 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
@@ -1,11 +1,11 @@
 <ion-header class="ion-no-border">
-  <div class="header-content  mx-20 d-flex justify-start">
+  <div class="header-content  mx-20 d-flex justify-between">
     <div class="header-icon-left">
       <button class="btn-no-color" (click)="close()">
         <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
       </button>
     </div>
-    <div class="header-title flex-md-grow-1">
+    <div class="header-title flex-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
     </div>
     <div class="header-icon-right">
@@ -38,23 +38,24 @@
 </ion-menu>
 
 <ion-content id="main-content">
-  <div class="upper-content">
-    <div class="content-location">
-      <div class="location-detail">
+  <div class="upper-content d-flex width-100">
+    <div class="content-location d-flex justify-between width-100">
+      <div class="location-detail flex-grow-1">
         <ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
+        <div class="content-details">
+          <ion-label>
+            <p>1 {{customDate}}</p>
+            <p>2 das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">3 (Não se repete)</p>
+            <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">4 Repete</p>
+          </ion-label>
+        </div>
       </div>
-      <div class="button-calendar-type">
+      <div class="button-calendar-type d-flex flex-grow-1 justify-end">
         <ion-button  class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
       </div>
     </div>
-    <div class="content-details">
-      <ion-label>
-        <p>{{customDate}}</p>
-        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
-        <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
-        <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
-      </ion-label>
-    </div>
+
   </div>
   <div class="middle-content">
     <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
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 b041fc18a..af4b251a1 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
@@ -18,7 +18,6 @@ ion-menu{
   float: left;
 }
 .header-title{
-  width: 264px;
   font-family: Roboto;
   font-size: 25px;
   margin: 0 5px 0 5px;
@@ -33,19 +32,17 @@ ion-menu{
   overflow: auto;
 }
 .upper-content{
-  margin-left: 50px;
+  padding-left: 50px;
   overflow: auto;
   font-size: 18px;
 
   .content-location{
-    width: 360px;
     margin: 0 auto;
     padding: 0;
     overflow: auto;
   }
 
   .location-detail{
-    width: 210px;
     font-weight: 700;
     font-size: 18px;
     float: left;
@@ -79,7 +76,6 @@ ion-menu{
 }
 
 .bottom-content{
-  width: 360px;
   margin: 0 auto;
   
   .bottom-content h3{
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 6266e55b3..1b7d66ee8 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -38,14 +38,14 @@ export class ApproveEventModalPage implements OnInit {
     private activatedRoute: ActivatedRoute,
   ) {
     this.activatedRoute.paramMap.subscribe(paramMap =>
-      {
-        if (!paramMap.has("serialNumber")){
-          return;
-        }
-        else{
-          this.serialNumber = paramMap.get('serialNumber'); 
-        }
-      });
+    {
+      if (!paramMap.has("serialNumber")){
+        return;
+      }
+      else{
+        this.serialNumber = paramMap.get('serialNumber'); 
+      }
+    });
   }
 
   ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 4840489a6..704c66af1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -1,9 +1,9 @@
 <ion-header class="ion-no-border">
-  <div *ngIf="loadedEvent" class="header-content">
+  <div *ngIf="loadedEvent" class="header-content d-flex justify-between">
     <div class="header-icon-left">
       <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
     </div>
-    <div class="header-title">
+    <div class="header-title flex-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
     </div>
     <div class="header-icon-right">
@@ -55,7 +55,7 @@
     </div>
   </div>
   <div class="line"></div>
-  <div class="middle-content" *ngIf="loadedEvent">
+  <div class="middle-content overflow-y-auto" *ngIf="loadedEvent">
     <h5>Intervenientes</h5>
     <ion-item>
       <ion-label>
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 9b898211a..b4e6af69d 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
@@ -155,7 +155,7 @@
           </div>
         </div>
 
-        <div hidden class="ion-item-container-no-border">
+        <div class="ion-item-container-no-border">
           <ion-label>
             <div class="attach-icon">
               <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
index 92855e48c..c2d07de8b 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
@@ -145,4 +145,26 @@
   justify-content: space-between;
   padding: 20px;
   overflow: auto;
-}
\ No newline at end of file
+}
+
+
+ .attach-icon{
+      width: 37px;
+      font-size: 35px;
+      float: left;
+    }
+    .attach-title-item{
+      width: 100%;
+      font-size: 15px;
+      color:#0d89d1;
+    }
+    /* SPAN */
+    .span-left{
+      float: left;
+      font-size: 15x;
+    }
+    .span-right{
+    text-align: right;
+    float: right;
+    font-size: 13px;
+    }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index a2ebdce27..7c87e7a1f 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -10,6 +10,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
+import { SearchPage } from 'src/app/pages/search/search.page';
 
 @Component({
   selector: 'app-book-meeting-modal',
@@ -220,6 +221,38 @@ export class BookMeetingModalPage implements OnInit {
 
     modal.onDidDismiss();
   }
+
+
+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true 
+      }
+    });
+    await modal.present();
+      modal.onDidDismiss().then((res)=> {
+        const data = res.data;
+        //data.selected
+        const DocumentToSave = {
+          SourceTitle: data.selected.Assunto,
+          ParentId: 'this.postEvent.EventId',
+          Source: '1',
+          SourceId: data.selected.Id,
+          ApplicationId: data.selected.ApplicationType.toString(),
+          Id: '0',
+          Link: '',
+          SerialNumber: '',
+        };
+
+        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
+          this.getAttachments();
+        });
+    });
+  }
+
   
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
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 6679aae08..1c13dace4 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
@@ -89,8 +89,8 @@
         </div>
       </div>
 
-      <div hidden class="ion-item-container-no-border">
-        <ion-label>
+      <div class="ion-item-container-no-border" (click)="getDoc()">
+        <ion-label class="d-flex ">
           <div class="attach-icon">
             <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
           </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index b5b6273c7..3e7127273 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -125,4 +125,27 @@
   .aside-content{
     display: block;
   }
+}
+
+
+
+.attach-icon{
+  width: 37px;
+  font-size: 35px;
+  float: left;
+}
+.attach-title-item{
+  width: 100%;
+  font-size: 15px;
+  color:#0d89d1;
+}
+/* SPAN */
+.span-left{
+  float: left;
+  font-size: 15x;
+}
+.span-right{
+text-align: right;
+float: right;
+font-size: 13px;
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 60b25ebeb..6907f6483 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+import { SearchPage } from 'src/app/pages/search/search.page';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -53,6 +54,8 @@ export class ExpedientTaskModalPage implements OnInit {
   emptyTextDescription = "Sem intervenientes selecionados";
   showEmptyContainer = true;
 
+  taskResult: any = {}
+
   constructor(
     private modalController: ModalController,
     private router:Router,
@@ -124,7 +127,8 @@ export class ExpedientTaskModalPage implements OnInit {
     this.modalController.dismiss(null);
     
   }
-  saveTask(){
+
+  async saveTask(){
 
     if(this.postData.Priority=='99999861'){
       this.dispatchFolder.DeadlineType = 'Normal';
@@ -160,7 +164,7 @@ export class ExpedientTaskModalPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log('this.postData', this.postData, this.taskType);
-          this.processes.postDespatcho(this.postData);
+          this.taskResult = await this.processes.postDespatcho(this.postData);
           break;
         case '1':
           this.postData = {
@@ -173,7 +177,7 @@ export class ExpedientTaskModalPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log(this.postData);
-          this.processes.postParecer(this.postData);
+          this.taskResult = await this.processes.postParecer(this.postData);
           break;
         case '2':
           this.postData = {
@@ -186,7 +190,7 @@ export class ExpedientTaskModalPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log(this.postData);
-          this.processes.postDeferimento(this.postData);
+          this.taskResult = await this.processes.postDeferimento(this.postData);
           break;
       }
 
@@ -363,6 +367,35 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
 
+  async getDoc(){
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true 
+      }
+    });
+    await modal.present();
+      modal.onDidDismiss().then((res)=>{
+        const data = res.data;
+        //data.selected
+        const DocumentToSave = {
+          SourceTitle: data.selected.Assunto,
+          ParentId: 'this.postEvent.EventId', // instance
+          Source: '1',
+          SourceId: data.selected.Id,
+          ApplicationId: data.selected.ApplicationType.toString(),
+          Id: '0',
+          Link: '',
+          SerialNumber: '',
+        };
+
+        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
+          this.getAttachments();
+        });
+    });
+  }
 
 
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index c07d81c87..8b74b42fe 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -58,10 +58,10 @@
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
-      <div class="main-header">
-        <div class="title-content d-flex">
+      <div class="main-header" style="overflow: unset !important;">
+        <div class="title-content d-flex justify-between">
           <app-btn-modal-dismiss></app-btn-modal-dismiss>
-          <div class="middle">
+          <div class="middle flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon">
@@ -71,7 +71,7 @@
           </div>
         </div>
       </div>
-      <div class="upper-content">
+      <div class="upper-content" style="overflow: unset !important;">
         <div class="content-details">
           <ion-label>
             <p><span class="date">{{customDate}}</span><span class="label">Expediente</span></p>
@@ -80,72 +80,75 @@
         </div>
       </div>
       <div class="line"></div>
-      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-        <div *ngIf="cc.length > 0">
-          <h5>Com conhecimento</h5>
+
+      <div class="overflow-y-auto">
+        <div class="middle-content">
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
             <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
               </div>
             </ion-label>
           </ion-item>
-        </div>
-        <h5>Detalhes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-            <p [innerHTML]="task.Note"></p>
-        </ion-item>
-      </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <h5>Documentos Anexados</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label
-          (click)="viewDocument()">
-            <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-            <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
-          </ion-label>
-        </ion-item>
-        </ion-list>
-      </div>
-
-      <div *ngIf="eventsList">
-        <h3 class="h3-event-title">Eventos Associados</h3>
-        <ion-list>
-          <div *ngIf="eventsList">
-            <ion-item-sliding>
-              <ion-item 
-                class="Rectangle" lines="none" 
-                *ngFor="let event of eventsList"
-                (click)="viewEventDetail(event.EventId)"
-              >
-                  <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
-                  <div class="content-{{profile}}-{{event.CalendarName}}">
-                    <div class="approve-event-time">
-                      <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                      <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                    </div>
-                    <div class="approve-event-detail">
-                      <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
-                      <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
-                      <h3>{{event.Subject}}</h3>
-                    </div>
-                  </div>
-                </ion-item>
-            </ion-item-sliding>
+          <div *ngIf="cc.length > 0">
+            <h5>Com conhecimento</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let c of cc">
+                  <p>{{c.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
           </div>
-        </ion-list>
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="task.Note"></p>
+          </ion-item>
+        </div>
+        <div class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label
+            (click)="viewDocument()">
+              <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
+            </ion-label>
+          </ion-item>
+          </ion-list>
+        </div>
+  
+        <div *ngIf="eventsList">
+          <h3 class="h3-event-title">Eventos Associados</h3>
+          <ion-list>
+            <div *ngIf="eventsList">
+              <ion-item-sliding>
+                <ion-item 
+                  class="Rectangle" lines="none" 
+                  *ngFor="let event of eventsList"
+                  (click)="viewEventDetail(event.EventId)"
+                >
+                    <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
+                    <div class="content-{{profile}}-{{event.CalendarName}} width-100 ">
+                      <div class="approve-event-time">
+                        <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                        <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                      </div>
+                      <div class="approve-event-detail">
+                        <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
+                        <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
+                        <h3>{{event.Subject}}</h3>
+                      </div>
+                    </div>
+                  </ion-item>
+              </ion-item-sliding>
+            </div>
+          </ion-list>
+        </div>
       </div>
-
     </div>
+
     <div class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
@@ -201,6 +204,7 @@
         </ion-button>
       </ion-list>
     </div>
+
   </div>
 </ion-content>
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 74654ef82..4b666f49f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -20,7 +20,7 @@
         </div>
         
         <div class="aside overflow-y-auto d-flex  flex-wrap width-100">
-          <div [class.active]="selectedElement == 'approval'" (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'"  class="exp-card d-flex flex-column" >
+          <div [class.active]="selectedElementF('approval')" (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'"  class="exp-card d-flex flex-column" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
             </div>
@@ -28,7 +28,7 @@
             <p class="text-center exp-card-content">{{count_ev_md+count_ev_pr}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == 'Correspondence'" (click)="openExpedientListPage(); selectedElement='Correspondence'" class="exp-card d-flex flex-column justify-center" >
+          <div [class.active]="selectedElementF('Correspondence')" (click)="openExpedientListPage(); selectedElement='Correspondence'" class="exp-card d-flex flex-column justify-center" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-correspondencia.svg"></ion-icon>
             </div>
@@ -36,7 +36,7 @@
             <p class="text-center exp-card-content">{{count_exp_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div  [class.active]="selectedElement == 'Pending'" (click)="notImplemented()" class="exp-card d-flex flex-column justify-center" >
+          <div  [class.active]="selectedElementF('Pending')" (click)="notImplemented()" class="exp-card d-flex flex-column justify-center" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-pendente.svg"></ion-icon>
             </div>
@@ -45,7 +45,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == 'Dispatches'" class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
+          <div [class.active]="selectedElementF('Dispatches') " class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
             </div>
@@ -53,7 +53,7 @@
             <p class="text-center exp-card-content">{{count_desp_dailywork}}<span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer'); selectedElement='RequestsForOpinion'">
+          <div [class.active]="selectedElementF('RequestsForOpinion')" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer'); selectedElement='RequestsForOpinion'">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-parecer.svg"></ion-icon>
             </div>
@@ -61,14 +61,16 @@
             <p class="text-center exp-card-content">{{count_par_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento'); selectedElement = 'RequestForApproval'">
+          <div [class.active]="selectedElementF('RequestForApproval')" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento'); selectedElement = 'RequestForApproval'">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
             <p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
           </div>
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
+
+          <!-- Desktop -->
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card d-md-flex d-none flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
             </div>
@@ -76,7 +78,8 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
+          <!-- Desktop -->
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card d-md-flex d-none flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
             </div>
@@ -84,7 +87,8 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long justify-center width-100" (click)="notImplemented()">
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card-long justify-center width-90 ma-0 my-5 background-white" (click)="notImplemented()"
+            style=" box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
@@ -96,7 +100,8 @@
             </div>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100" (click)="notImplemented()">
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card-long width-90 ma-0 my-5 background-white" (click)="notImplemented()"
+            style="box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);">
             <div class="center-div">
               <div class="exp-card-icon">
                 <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -108,7 +113,7 @@
             </div>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
             </div>
@@ -116,7 +121,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div [class.active]="selectedElementF('£££££££')" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
             </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index e0d3efae8..46bf80520 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -266,4 +266,11 @@ export class GabineteDigitalPage implements OnInit {
 
   }
 
+  selectedElementF(element:string) {
+    if (window.innerWidth >= 800) {
+      return element ==  this.selectedElement
+    }
+    return false;
+  }
+
 }
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index c21cbe02c..2da84eafb 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -82,7 +82,7 @@ export class LoginPage implements OnInit {
   }
 
   getToken() {
-    this.notificatinsservice.getAndpostToken(this.username);
+    // this.notificatinsservice.getAndpostToken(this.username);
   }
 
 
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index f4f203c91..6670418cd 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -4,7 +4,7 @@
   <ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
   <div class="d-flex ion-justify-content-between">
     
-    <ion-form  [class.d-md-none]="!select">
+    <ion-form  [class.d-none]="!showSearchInput">
       <div class="d-flex search-input-container ion-justify-content-between" >
         <div class="icon">
           <button class="btn-no-color" (click)="basicSearch()">
@@ -26,7 +26,7 @@
     <div *ngIf="!showAdvanceSearch" class="icon-z icon-most-searched-word-open" (click)="showHideAdvanceSearch(true)">
       <ion-icon src="assets/images/icons-most-searched-words-open.svg" class="icon" slot="end"></ion-icon>
     </div>
-    <div *ngIf="showAdvanceSearch" class="icon-z icon-most-searched-word-open align-md-baseline" (click)="showHideAdvanceSearch(false)" >
+    <div *ngIf="showAdvanceSearch" class="icon-z icon-most-searched-word-open align-md-baseline pl-10" (click)="showHideAdvanceSearch(false)" >
       <ion-icon src="assets/images/advance-search-show-modal.svg"  class="icon" slot="end"></ion-icon>
     </div>
   
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index cdcadca51..8271916cc 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -55,6 +55,8 @@ export class SearchPage implements OnInit {
   type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda";
   select: boolean = false;
 
+  showSearchInput = false
+
   constructor(private modalController: ModalController,
     private search: SearchService,
     private modalCtrl: ModalController,
@@ -63,7 +65,11 @@ export class SearchPage implements OnInit {
       this.currentPath= window.location.pathname;
 
       this.type = this.navParams.get('type');
-    
+
+      this.type = this.navParams.get('type');
+
+      this.showSearchInput = this.navParams.get('showSearchInput');
+  
 
       if(this.type == null || this.type == undefined) {
         
@@ -86,6 +92,7 @@ export class SearchPage implements OnInit {
       
   }
 
+
   selectItem(item: SearchDocument) {
     if(this.select){
       this.modalController.dismiss({
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index a569b9b56..286d20fc4 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -4,7 +4,7 @@ import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
 import { Token } from '../models/token.model';
-import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 /* import { AgendaPage } from '../pages/agenda/agenda.page'
 import { ExpedientePage } from '../pages/gabinete-digital/expediente/expediente.page'
 import { EventListPage } from '../pages/gabinete-digital/event-list/event-list.page';
@@ -27,7 +27,7 @@ export class NotificationsService {
 
   constructor(
     private http: HttpClient,
-    private fcm: FCM,
+    // private fcm: FCM,
     private storageService: StorageService,
     private modalController: ModalController,
     public modalCtrl: AlertController,
@@ -45,71 +45,71 @@ export class NotificationsService {
     return this.http.get<Token[]>(`${geturl}`);
   }
 
-  getAndpostToken(username) {
-    if(this.platform.is('desktop')) {
-      console.log('Notifications not supported')
-    } else {
+  // getAndpostToken(username) {
+  //   if(this.platform.is('desktop')) {
+  //     console.log('Notifications not supported')
+  //   } else {
       
-      const geturl = environment.apiURL + 'notifications/token';
+  //     const geturl = environment.apiURL + 'notifications/token';
 
-    return this.fcm.getToken().then(token => {
-      console.log('token: ', token)
-      this.storageService.store(username, token);
-      this.storageService.get(username).then(value => {
-        console.log('STORAGE TOKEN', value)
-        this.storageService.get(AuthConnstants.USER).then(res => {
-          console.log('USERID', res);
-          const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
-          const body = {
-            UserId: res.UserId,
-            TokenId: token,
-            Status: 1,
-            Service: 1
-          };
+  //   return this.fcm.getToken().then(token => {
+  //     console.log('token: ', token)
+  //     this.storageService.store(username, token);
+  //     this.storageService.get(username).then(value => {
+  //       console.log('STORAGE TOKEN', value)
+  //       this.storageService.get(AuthConnstants.USER).then(res => {
+  //         console.log('USERID', res);
+  //         const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
+  //         const body = {
+  //           UserId: res.UserId,
+  //           TokenId: token,
+  //           Status: 1,
+  //           Service: 1
+  //         };
 
-          this.http.post<Token>(`${geturl}`, body, { headers }).subscribe(data => {
-            console.log('TOKEN USER MIDLE', data);
-          })
-        });
+  //         this.http.post<Token>(`${geturl}`, body, { headers }).subscribe(data => {
+  //           console.log('TOKEN USER MIDLE', data);
+  //         })
+  //       });
 
-      });
-    });
-    }
+  //     });
+  //   });
+  //   }
     
-  }
+  // }
 
   async onReceviNotification(viewEventDetail, viewExpedientDetail, openApproveModal, viewPublications, viewPublicationDetail) {
-    this.fcm.onNotification().subscribe(data => {
-      if (data.click_action) {
-        console.log("Received in background: ", data);
+    // this.fcm.onNotification().subscribe(data => {
+    //   if (data.click_action) {
+    //     console.log("Received in background: ", data);
 
-        if (data.Service === "agenda") {
-          viewEventDetail(data.IdObject)
-        }
-        else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
-          console.log('expediante 1')
-          viewExpedientDetail(data.IdObject)
-        }
-        else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
-          openApproveModal(data.IdObject);
-        }
-        else if (data.Service === "accoes" && data.Object === "accao") {
-          viewPublications(data.IdObject)
-        }
-        else if (data.Service === "accoes" && data.Object === "publicacao") {
-          viewPublicationDetail(data.IdObject)
-        }
+    //     if (data.Service === "agenda") {
+    //       viewEventDetail(data.IdObject)
+    //     }
+    //     else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
+    //       console.log('expediante 1')
+    //       viewExpedientDetail(data.IdObject)
+    //     }
+    //     else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
+    //       openApproveModal(data.IdObject);
+    //     }
+    //     else if (data.Service === "accoes" && data.Object === "accao") {
+    //       viewPublications(data.IdObject)
+    //     }
+    //     else if (data.Service === "accoes" && data.Object === "publicacao") {
+    //       viewPublicationDetail(data.IdObject)
+    //     }
 
-      } /* else {
-        console.log("Received in foreground: ", data);
+    //   } /* else {
+    //     console.log("Received in foreground: ", data);
 
-        console.log(data.Service)
-        console.log(data.Object)
-        console.log(data.IdObject)
-        this.openApproveModal(data.IdObject);
+    //     console.log(data.Service)
+    //     console.log(data.Object)
+    //     console.log(data.IdObject)
+    //     this.openApproveModal(data.IdObject);
       
-      }; */
-    });
+    //   }; */
+    // });
   }
 
   platformVerify() {
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 c0740f3cd..3fb5cc941 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -66,6 +66,7 @@
         </div>
       </div>
       <div class="line"></div>
+
       <div class="middle-content">
         <div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
           <h5>Intervenientes</h5>
@@ -95,6 +96,11 @@
         </ion-list>
       </div>
     </div>
+
+    <div class="overflow-y-auto">
+      
+    </div>
+
     <div *ngIf="showAside" class="aside-right flex-column height-100">
       <div class="aside-buttons">
         <button hidden full class="btn-ok" shape="round" >Editar evento</button>
@@ -104,8 +110,10 @@
         <button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
       </div>
     </div>
+
   </div>
 </ion-content>
+
 <ion-footer class="display-none-{{showAside}}">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
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 10f1a0806..af3eee802 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -207,7 +207,8 @@ export class EditEventComponent implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true
       }
     });
     await modal.present();
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 8efe9fa8e..d8119273d 100644
--- a/src/app/shared/agenda/new-event/new-event.component.html
+++ b/src/app/shared/agenda/new-event/new-event.component.html
@@ -210,6 +210,7 @@
       </ion-item>
       </ion-list>
     </div> 
+    
   </div>    
 </ion-content>
 <ion-footer class="ion-no-border px-20">
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 60c1d9836..a3fa876f0 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -132,7 +132,8 @@ export class NewEventPage implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true
       }
     });
     await modal.present();
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 f06689ef9..80cc84974 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -35,7 +35,7 @@
 
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
-    <div class="main-header px-20">
+    <div class="main-header px-20" style="overflow: unset !important;">
       <div class="title-content d-flex"  >
         <div class="left">
           <button class="btn-no-color" (click)="close()">
@@ -46,7 +46,7 @@
           <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
         </div>
 
-        <div class="div-icon">
+        <div class="div-icon d-flex">
           <button class="btn-no-color" (click)="editEvent()">
             <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
           </button>
@@ -102,10 +102,10 @@
       <ion-list class="width-100">
         <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
           <ion-label class="width-100 d-flex " >
-            <div class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
-              <p class="attach-title-item">{{attach.SourceName}}</p>
+            <p class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
+              <span class="attach-title-item">{{attach.SourceName}}</span>
               <span class="span-left">{{attach.Stakeholders}}</span>
-            </div>
+            </p>
 
             <div class="d-flex align-end">
               <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 6e22037ec..5d58d2d0c 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -19,7 +19,6 @@ ion-menu{
     border-top-left-radius: 25px;
     border-top-right-radius: 25px;
     background-color: #fff;
-    overflow:hidden;
     padding: 30px 0px 0px 0px;
     color:#000;
     transform: translate3d(0, 1px, 0);
@@ -36,7 +35,6 @@ ion-menu{
         overflow: hidden;
       }
       .middle{
-          width: 230px;
           padding: 0!important;
           float: left;
           margin: 2.5px 0 0 0;
@@ -45,12 +43,10 @@ ion-menu{
         width: 45px;
         font-size: 45px;
         float: right;
-        overflow: auto;
+
       }
       .div-icon{
-        width: 92px;
         float: right;
-        overflow: auto;
         padding: 1px;
       }
       .div-icon .edit{
@@ -87,7 +83,7 @@ ion-menu{
           width: 100%;
           margin: 0 auto;
           padding: 0;
-          overflow: auto;
+
 
           .date{
             float: left;
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 5ae1d9808..d2ffb3db1 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -70,14 +70,14 @@
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
-                <div class="exp-top-detail">
+                <div class="exp-top-detail ">
                   <div class="exp-date">
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                   </div>
                   <div class="exp-remetente">
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
-                  <div class="exp-icon">
+                  <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
 
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 60ccc7caa..0e8f33273 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -41,17 +41,32 @@ export class HeaderPage implements OnInit {
 
   async openSearch() {
 
-    let classs;
+    let classs, showSearchInput, type;
     if(window.innerWidth < 1366) {
       classs = 'modal modal-width-100 modal-padding-top'
+      showSearchInput = true
     } else {
       classs = 'modal modal-width-100 modal-padding-top modal-desktop-shadow modal-desktop-remove-background'
+      showSearchInput = false
+    }
+
+
+
+    if(window.location.pathname  == '/home/agenda') {
+      type = "Agenda"
+    } else if (window.location.pathname  =='/home/gabinete-digital') {
+      type = "AccoesPresidenciais & ArquivoDespachoElect"
+
+    } else if (window.location.pathname  == '/home/publications') {
+      type = "AccoesPresidenciais"
     }
 
     const modal = await this.modalController.create({
       component: SearchPage,
       cssClass: classs,
       componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: showSearchInput
       }
     });
     return await modal.present();
diff --git a/src/global.scss b/src/global.scss
index c3668bb0a..6e510461e 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -659,4 +659,11 @@ ion-content {
     top: calc(100% - 160px) !important;
     max-height: 160px;
     min-height: 160px; 
-  }
\ No newline at end of file
+  }
+
+
+.monthview-secondary-with-event, .text-muted {
+    .day {
+        color: #cecece;
+    }
+}
\ No newline at end of file

From dc680b9ce5d3c19995043c52c4952a7dc7e7ac25 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 29 Apr 2021 19:46:40 +0100
Subject: [PATCH 4/6] Improve responsiveness

---
 src/app/home/home.page.ts                             |  4 ++--
 src/app/pages/publications/publications.page.ts       |  4 ++--
 .../view-publications/view-publications.page.scss     | 11 +++--------
 .../view-publications/view-publications.page.ts       |  2 +-
 src/app/pages/search/search.page.ts                   |  2 +-
 .../view-publications/view-publications.page.scss     |  2 --
 .../view-publications/view-publications.page.ts       |  4 ++--
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index b273f9931..726550c2c 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -224,8 +224,8 @@ export class HomePage implements OnInit {
         publicationId: publicationId,
         folderId: this.folderId,
       },
-      cssClass: 'publication-detail',
-      backdropDismiss: false
+      cssClass: 'publication-detail modal modal-desktop',
+      //backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then(() => {
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 1bcd55cde..a4b26958d 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -163,8 +163,8 @@ export class PublicationsPage implements OnInit {
       /* let item =  this.publicationFolderList; */
       const modal = await this.modalController.create({
         component: ViewPublicationsPage,
-        enterAnimation,
-        leaveAnimation,
+        //enterAnimation,
+        //leaveAnimation,
         componentProps:{
           folderId:folderId,
         },
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 9308d2fcd..7ea77b36e 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.scss
+++ b/src/app/pages/publications/view-publications/view-publications.page.scss
@@ -14,14 +14,12 @@
     --padding-start: 0px !important;
     --padding-right: 0px !important;
     --padding-end: 0px !important;
-
   }
 
   .div-top-header{
     width: 400px;
     margin: 0 auto;
     background-color: #0782c9;
-    overflow: auto;
     padding-top: 15px;
     border: 0!important;
   }
@@ -62,7 +60,7 @@
     font-family: Roboto;
     margin: 0 auto;
     background-color: #fff;
-    overflow:auto;
+
     padding: 15px 20px 0 20px;
   }
   .content-top{
@@ -91,10 +89,10 @@
   }
 
   .back-icon{
-    width: 37px;
+
     float: left;
     font-size: 35px;
-    overflow: auto;
+
     
   }
   .div-title{
@@ -107,10 +105,7 @@
   }
   
   .actions-icon{
-    width: 92px;
     float: right;
-    overflow: auto;
-    border: 1px solid red;
   }
   .actions-icon ion-icon{
       margin-left: 10px;
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 129a171a5..eb403409b 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -110,7 +110,7 @@ export class ViewPublicationsPage implements OnInit {
         folderId: this.folderId,
       },
       cssClass: 'publication-detail modal modal-desktop',
-      backdropDismiss: false
+      // backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then(()=>{
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 8271916cc..95d506568 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -512,7 +512,7 @@ export class SearchPage implements OnInit {
         publicationId: publicationId,
       },
       cssClass: 'publication-detail modal modal-desktop ',
-      backdropDismiss: false
+      //backdropDismiss: false
     });
     
     await modal.present();
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 9d478cb21..ae1a88f76 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.scss
+++ b/src/app/shared/publication/view-publications/view-publications.page.scss
@@ -91,10 +91,8 @@
   }
 
   .back-icon{
-    width: 37px;
     float: left;
     font-size: 35px;
-    overflow: auto;
     
   }
   .div-title{
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 e300cf42c..a723445b8 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -145,8 +145,8 @@ export class ViewPublicationsPage implements OnInit {
         componentProps:{
           publicationId: publicationId,
         },
-        cssClass: 'publication-detail',
-        backdropDismiss: false
+        cssClass: 'publication-detail modal modal-desktop',
+        //backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss().then(()=>{

From f36ba693b49e0ca6f59f61209093c8371683b847 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 30 Apr 2021 09:46:29 +0100
Subject: [PATCH 5/6] Improve agenda filter

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

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 3bc4d0439..a8ec8846c 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -323,7 +323,7 @@
             <ion-row class="filter ion-align-items-center">
               <div class="filter-name">{{timelineFilterState}}</div>
               <!-- Icon -->
-              <button  (click)="showTimelineFilterState=true" class="arrow-down btn-no-color">
+              <button  (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
                 <ion-icon src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
               </button>
               

From c2b8f87ae6b751ecd954afa727807ca7688658b7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 30 Apr 2021 14:12:45 +0100
Subject: [PATCH 6/6] Improve responsiveness and improve search

---
 .../document-detail/document-detail.page.html |  4 +-
 .../document-detail/document-detail.page.ts   | 17 +++--
 src/app/models/despacho.model.ts              |  6 ++
 .../agenda/edit-event/edit-event.page.ts      |  3 +-
 .../pages/agenda/new-event/new-event.page.ts  |  9 ++-
 .../book-meeting-modal.page.html              | 18 +++--
 .../book-meeting-modal.page.scss              | 41 +++++++++-
 .../book-meeting-modal.page.ts                | 28 +++----
 .../expedient-task-modal.page.html            | 18 +++--
 .../expedient-task-modal.page.scss            | 74 +++++++++++++++++++
 .../expedient-task-modal.page.ts              | 54 +++++++++-----
 src/app/pages/search/search.page.html         |  2 +-
 src/app/pages/search/search.page.ts           | 33 +++++----
 .../agenda/edit-event/edit-event.component.ts |  3 +-
 .../agenda/new-event/new-event.component.ts   |  3 +-
 src/app/shared/header/header.page.ts          |  3 +-
 .../chat-options-popover.page.ts              |  3 +-
 17 files changed, 236 insertions(+), 83 deletions(-)

diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html
index 57c6aed55..3dc1ed785 100644
--- a/src/app/modals/document-detail/document-detail.page.html
+++ b/src/app/modals/document-detail/document-detail.page.html
@@ -33,7 +33,7 @@
     </ion-list>
   </ion-content>
 </ion-menu>
-<div class="ion-page" id="main-content">
+<div class="ion-page " id="main-content">
   <ion-menu-button></ion-menu-button>
 </div>
 
@@ -47,7 +47,7 @@
             <ion-label class="title">{{LoadedDocument.Subject}}</ion-label>
           </div>
           <div class="div-icon">
-              <ion-menu-button autoHide="false">
+              <ion-menu-button >
                 <ion-icon name="ellipsis-vertical-outline"></ion-icon>
               </ion-menu-button>
           </div>
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts
index cf43adca6..3787d7797 100644
--- a/src/app/modals/document-detail/document-detail.page.ts
+++ b/src/app/modals/document-detail/document-detail.page.ts
@@ -33,22 +33,23 @@ export class DocumentDetailPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log(this.docId);
-    console.log(this.applicationId);
+
     this.LoadDocumentDetails();
+    
   }
 
-  async LoadDocumentDetails(){
-    this.processes.GetDocumentDetails(this.docId, '').subscribe(res=>{
-      console.log(res);
-      this.LoadedDocument = res[0];
+  async LoadDocumentDetails() {
+    this.processes.GetDocumentDetails(this.docId, this.applicationId).subscribe(res=>{
+      this.LoadedDocument = res;
 
-      let thedate = new Date(this.LoadedDocument.DateDocument);
+      this.LoadedDocument.Subject = this.LoadedDocument.Assunto
+
+      let thedate = new Date(this.LoadedDocument.DateDispatch);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
     });
   }
 
-  viewDocument(){
+  viewDocument() {
     this.processes.GetDocumentUrl(this.docId, '8').subscribe(res=>{
       console.log(res);
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
diff --git a/src/app/models/despacho.model.ts b/src/app/models/despacho.model.ts
index 50366f37f..c54241959 100644
--- a/src/app/models/despacho.model.ts
+++ b/src/app/models/despacho.model.ts
@@ -9,4 +9,10 @@ export class Despacho{
     UserEmail: string;
     UsersSelected: Participant[];
     DispatchFolder: Folder;
+    AttachmentList?: {
+        ProcessInstanceID: string,
+        "Source": string,
+        "UserId": string,
+        "Attachment": string
+    }[]
 }
\ No newline at end of file
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 4348e5135..5a20013f9 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -190,7 +190,8 @@ export class EditEventPage implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true
       }
     });
     await modal.present();
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 e2c3effb9..b7e0061a6 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -111,10 +111,10 @@ export class NewEventPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
-  async save(){
-/*     console.log(this.postEvent);
+  async save() {
+  /*     console.log(this.postEvent);
     console.log(this.profile); */
-    
+  
     if(this.documents.length >= 0) {
       this.postEvent.HasAttachments = true;
     }
@@ -207,7 +207,8 @@ export class NewEventPage implements OnInit {
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        showSearchInput: true 
+        showSearchInput: true,
+        select: true
       }
     });
     await modal.present();
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 b4e6af69d..3e75c8c3a 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
@@ -166,19 +166,23 @@
           </ion-label>
         </div>
 
-        <div *ngIf="loadedAttachments">
-          <ion-item>
-            <ion-label>Documentos Anexados</ion-label>
-          </ion-item>
+        <div class="list "  *ngFor="let document of documents; let i = index" > 
           <ion-list>
-            <ion-item *ngFor="let attachment of loadedAttachments">
+            <ion-item>
             <ion-label>
-              <h4 class="attach-title-item">{{attachment.Description}}</h4>
-              <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
+              <p class="d-flex ion-justify-content-between"> 
+                <span class="attach-title-item">{{document.Assunto}}</span> 
+                <span class="app-name">{{document.appName}}</span> 
+                <span class="close-button text-black" (click)="removeAttachment(i)" >
+                  <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+                </span>
+              </p> 
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>
         </div>
+        
       </div>
       
     </div>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
index c2d07de8b..ed519ce96 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
@@ -167,4 +167,43 @@
     text-align: right;
     float: right;
     font-size: 13px;
-    }
\ No newline at end of file
+    }
+
+
+
+
+    
+
+  .app-name{
+    background: #42b9f2;
+    border-radius: 18px;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    padding: 0px 5px;
+    color: white;
+    font-size: 9pt;
+    font-weight: 500;
+    height: 19px;
+    -webkit-border-radius: 18px;
+    -moz-border-radius: 18px;
+    -ms-border-radius: 18px;
+    -o-border-radius: 18px;
+  }
+  
+  
+.close-button {
+  display: none;
+}
+
+
+.list:hover {
+
+  .app-name {
+    display: none;
+  }
+
+  .close-button {
+    display: block !important;
+  }
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 7c87e7a1f..e8b0c9246 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -11,6 +11,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
+import { SearchDocument } from 'src/app/models/search-document';
 
 @Component({
   selector: 'app-book-meeting-modal',
@@ -27,6 +28,7 @@ export class BookMeetingModalPage implements OnInit {
   
   taskDocId:string;
   loadedAttachments:any;
+  documents:SearchDocument[] = [];
 
   adding: "intervenient" | "CC" = "intervenient";
 
@@ -234,25 +236,19 @@ export class BookMeetingModalPage implements OnInit {
     });
     await modal.present();
       modal.onDidDismiss().then((res)=> {
-        const data = res.data;
-        //data.selected
-        const DocumentToSave = {
-          SourceTitle: data.selected.Assunto,
-          ParentId: 'this.postEvent.EventId',
-          Source: '1',
-          SourceId: data.selected.Id,
-          ApplicationId: data.selected.ApplicationType.toString(),
-          Id: '0',
-          Link: '',
-          SerialNumber: '',
-        };
-
-        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
-          this.getAttachments();
-        });
+        if(res){
+          const data = res.data;
+          this.documents.push(data.selected);
+        }
     });
   }
 
+  removeAttachment(index: number){
+
+    this.documents = this.documents.filter( (e, i) =>  index != i);
+
+  }
+
   
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
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 1c13dace4..393596dbd 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
@@ -100,19 +100,23 @@
         </ion-label>
       </div>
 
-      <div *ngIf="loadedAttachments">
-        <ion-item>
-          <ion-label>Documentos Anexados</ion-label>
-        </ion-item>
+      <div class="list "  *ngFor="let document of documents; let i = index" > 
         <ion-list>
-          <ion-item *ngFor="let attachment of loadedAttachments">
+          <ion-item>
           <ion-label>
-            <h4 class="attach-title-item">{{attachment.Description}}</h4>
-            <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
+            <p class="d-flex ion-justify-content-between"> 
+              <span class="attach-title-item">{{document.Assunto}}</span> 
+              <span class="app-name">{{document.appName}}</span> 
+              <span class="close-button text-black" (click)="removeAttachment(i)" >
+                <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+              </span>
+            </p> 
+            <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
           </ion-label>
         </ion-item>
         </ion-list>
       </div>
+      
     </div>
 
     
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index 3e7127273..0c23c34ab 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -148,4 +148,78 @@
 text-align: right;
 float: right;
 font-size: 13px;
+}
+
+
+
+
+.app-name{
+  background: #42b9f2;
+  border-radius: 18px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 0px 5px;
+  color: white;
+  font-size: 9pt;
+  font-weight: 500;
+  height: 19px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+
+
+.close-button {
+display: none;
+}
+
+
+.list:hover {
+
+.app-name {
+  display: none;
+}
+
+.close-button {
+  display: block !important;
+}
+}
+
+
+
+
+.app-name{
+  background: #42b9f2;
+  border-radius: 18px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 0px 5px;
+  color: white;
+  font-size: 9pt;
+  font-weight: 500;
+  height: 19px;
+  -webkit-border-radius: 18px;
+  -moz-border-radius: 18px;
+  -ms-border-radius: 18px;
+  -o-border-radius: 18px;
+}
+
+
+.close-button {
+display: none;
+}
+
+
+.list:hover {
+
+.app-name {
+  display: none;
+}
+
+.close-button {
+  display: block !important;
+}
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 6907f6483..6f6adeaad 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -15,6 +15,9 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
+import { SearchDocument } from 'src/app/models/search-document';
+import { EventAttachment } from 'src/app/models/attachment.model';
+import { User } from 'src/app/models/user.model';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -37,7 +40,10 @@ export class ExpedientTaskModalPage implements OnInit {
   taskDate: Date;
   taskDescription: string;
   user: string;
+  
   loadedAttachments:any;
+  documents:SearchDocument[] = [];
+
   subjectTypes:any;
 
   postData: Despacho;
@@ -56,6 +62,8 @@ export class ExpedientTaskModalPage implements OnInit {
 
   taskResult: any = {}
 
+  loggeduser: User;
+
   constructor(
     private modalController: ModalController,
     private router:Router,
@@ -63,7 +71,12 @@ export class ExpedientTaskModalPage implements OnInit {
     private attachmentsService: AttachmentsService,
     private navParams: NavParams,
     private alertController: AlertService,
-    private authService: AuthService) {
+    private authService: AuthService,
+    private userAuth: AuthService) {
+
+
+      this.loggeduser = userAuth.ValidatedUser;
+
       this.user = environment.defaultuser +'@'+ environment.domain;
       this.task = this.navParams.get('task');
 
@@ -144,6 +157,7 @@ export class ExpedientTaskModalPage implements OnInit {
     }
     
     let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
+
     attendees = attendees.map(function(val) {
       return {
         UserEmail: val.EmailAddress,
@@ -151,6 +165,16 @@ export class ExpedientTaskModalPage implements OnInit {
       };
     })
 
+
+    const DocumentToSave = this.documents.map((e) => {
+      return {
+        ProcessInstanceID: '',
+        "Source": "webTRIX",
+        "UserId": this.loggeduser.UserId.toString(),
+        "Attachment": `${e.ApplicationType}@DOC@${e.Id}`
+      };
+    });
+
     if(this.taskParticipants.length > 0) {
       switch (this.taskType) {
         case '0':
@@ -162,6 +186,7 @@ export class ExpedientTaskModalPage implements OnInit {
             SubjectTypeId: this.postData.SubjectTypeId,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: DocumentToSave
           }
           console.log('this.postData', this.postData, this.taskType);
           this.taskResult = await this.processes.postDespatcho(this.postData);
@@ -175,6 +200,7 @@ export class ExpedientTaskModalPage implements OnInit {
             SubjectTypeId: this.postData.SubjectTypeId,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: DocumentToSave
           }
           console.log(this.postData);
           this.taskResult = await this.processes.postParecer(this.postData);
@@ -188,6 +214,7 @@ export class ExpedientTaskModalPage implements OnInit {
             SubjectTypeId: this.postData.SubjectTypeId,
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
+            AttachmentList: DocumentToSave
           }
           console.log(this.postData);
           this.taskResult = await this.processes.postDeferimento(this.postData);
@@ -378,24 +405,17 @@ export class ExpedientTaskModalPage implements OnInit {
     });
     await modal.present();
       modal.onDidDismiss().then((res)=>{
-        const data = res.data;
-        //data.selected
-        const DocumentToSave = {
-          SourceTitle: data.selected.Assunto,
-          ParentId: 'this.postEvent.EventId', // instance
-          Source: '1',
-          SourceId: data.selected.Id,
-          ApplicationId: data.selected.ApplicationType.toString(),
-          Id: '0',
-          Link: '',
-          SerialNumber: '',
-        };
-
-        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(  ()=>{
-          this.getAttachments();
-        });
+        if(res){
+          const data = res.data;
+          this.documents.push(data.selected);
+        }
     });
   }
 
+  removeAttachment(index: number){
+
+    this.documents = this.documents.filter( (e, i) =>  index != i);
+
+  }
 
 }
\ No newline at end of file
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 6670418cd..dd5b4d003 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -141,7 +141,7 @@
                 </div>
               </div>
               <ul>
-                <li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail(searchDocument.Id); selectItem(searchDocument)" class="d-flex">
+                <li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex">
                   <div class="icon">
                     <ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' "
                       src="assets/images/icons-search-document.svg"></ion-icon>
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 95d506568..8d60e675f 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -67,14 +67,13 @@ export class SearchPage implements OnInit {
       this.type = this.navParams.get('type');
 
       this.type = this.navParams.get('type');
+      this.select = this.navParams.get('select');
 
       this.showSearchInput = this.navParams.get('showSearchInput');
   
 
       if(this.type == null || this.type == undefined) {
         
-        this.select = false;
-
         if(this.currentPath  == '/home/agenda') {
           this.type = "Agenda"
         } else if (this.currentPath  =='/home/gabinete-digital') {
@@ -83,13 +82,10 @@ export class SearchPage implements OnInit {
         } else if (this.currentPath  == '/home/publications') {
           this.type = "AccoesPresidenciais"
         } else {
-          this.select = false
+          console.log('search bug!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
         }
-      } else {
-        this.select = true;
       }
 
-      
   }
 
 
@@ -99,6 +95,8 @@ export class SearchPage implements OnInit {
         selected: item
       });
     }
+
+    return this.select;
   }
 
   ngOnInit() {
@@ -476,31 +474,36 @@ export class SearchPage implements OnInit {
   }
 
 
-  async viewDetail(id:any) {
-    console.log(id);
+  async viewDetail(searchDocument: SearchDocument) {
+
+    const ApplicationType = searchDocument.ApplicationType.toString()
+    const Id =  searchDocument.Id
     
-    if(!this.selectItem){
-      if(window.location.pathname  == '/home/agenda'){
+    if(this.select == false){
+      if(this.type == "Agenda") {
 
         const modal = await this.modalCtrl.create({
           component: ViewEventPage,
           componentProps:{
-            eventId: id
+            eventId: Id
           },
           cssClass: 'modal modal-desktop',
         });
         await modal.present();
         modal.onDidDismiss().then((res)=>{});
         
-      } else if(window.location.pathname == '/home/publications'){
+      } else if(this.type == "AccoesPresidenciais"){
           
-        this.viewPublicationDetail(id);
+        this.viewPublicationDetail(Id);
       }
-      else if(window.location.pathname == '/home/gabinete-digital'){
+      else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
         console.log('OPEN DOC');
-        this.viewDocumentDetail(id,'');
+        this.viewDocumentDetail(Id, ApplicationType);
         
       }
+
+    } else {
+      console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!', this.select)
     }
 
   }
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 af3eee802..0e9fbd9e6 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -208,7 +208,8 @@ export class EditEventComponent implements OnInit {
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        showSearchInput: true
+        showSearchInput: true,
+        select: true,
       }
     });
     await modal.present();
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 a3fa876f0..311f777cf 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -133,7 +133,8 @@ export class NewEventPage implements OnInit {
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        showSearchInput: true
+        showSearchInput: true,
+        select: true
       }
     });
     await modal.present();
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 0e8f33273..2c5795cfd 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -66,7 +66,8 @@ export class HeaderPage implements OnInit {
       cssClass: classs,
       componentProps: {
         type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        showSearchInput: showSearchInput
+        showSearchInput: showSearchInput,
+        select: false
       }
     });
     return await modal.present();
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index 2a08bc141..eb50b1cd9 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -45,7 +45,8 @@ export class ChatOptionsPopoverPage implements OnInit {
       component: SearchPage,
       cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true
       }
     });
     await modal.present();