diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8d0ace252..3a0c83fff 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,140 +1,152 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { ChatPage } from './pages/chat/chat.page';
-import { MessagesPage } from './pages/chat/messages/messages.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
-  },
-  {
-    path: '',
-    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
-  },
-  {
-    path: 'empty-chat',
-    loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
-  },
-  {
-    path: 'btn-criar',
-    loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
-  },
-  {
-    path: 'btn-adicionar',
-    loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
-  },
-  {
-    path: 'empty-container',
-    loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
-  },
-  {
-    path: 'events-to-approve',
-    loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
-  },
-  {
-    path: 'expedients',
-    loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
-  },
-  {
-    path: 'document-detail',
-    loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
-  },
-  {
-    path: 'edit-group',
-    loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
-  },
-  {
-    path: 'pedidos',
-    loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
-  },
-  {
-    path: 'despachos',
-    loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
-  },
-  {
-    path: 'create-process',
-    loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
-  },
-  {
-    path: 'pendentes',
-    loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
-  },
-  {
-    path: 'delegar',
-    loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
-  },
-  {
-    path: 'add-note',
-    loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
-  },
-  {
-    path: 'dar-parecer',
-    loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
-  },
-  {
-    path: 'opts-expediente',
-    loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
-  },
-  {
-    path: 'despachos-pr',
-    loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
-  },
-  {
-    path: 'diplomas',
-    loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
-  },
-  {
-    path: 'expedientes-pr',
-    loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
-  },
-  {
-    path: 'diplomas-assinar',
-    loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
-  },
-  {
-    path: 'opts-expediente-pr',
-    loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
-  },
-  {
-    path: 'despachos-options',
-    loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
-  },
-  {
-    path: 'despachos-pr-options',
-    loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
-  },
-  {
-    path: 'deploma-options',
-    loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
-  },
-  {
-    path: 'pin',
-    loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
-  },
-  {
-    path: 'fingerprint',
-    loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
-  },
  {
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { ChatPage } from './pages/chat/chat.page';
+import { MessagesPage } from './pages/chat/messages/messages.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+  },
+  {
+    path: '',
+    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
+  },
+  {
+    path: 'empty-chat',
+    loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
+  },
+  {
+    path: 'btn-criar',
+    loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
+  },
+  {
+    path: 'btn-adicionar',
+    loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
+  },
+  {
+    path: 'empty-container',
+    loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
+  },
+  {
+    path: 'events-to-approve',
+    loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
+  },
+  {
+    path: 'expedients',
+    loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
+  },
+  {
+    path: 'document-detail',
+    loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
+  },
+  {
+    path: 'edit-group',
+    loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
+  },
+  {
+    path: 'pedidos',
+    loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
+  },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
+  {
+    path: 'create-process',
+    loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
+  },
+  {
+    path: 'pendentes',
+    loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
+  },
+  {
+    path: 'delegar',
+    loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
+  },
+  {
+    path: 'add-note',
+    loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
+  },
+  {
+    path: 'dar-parecer',
+    loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
+  },
+  {
+    path: 'opts-expediente',
+    loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
+  },
+  {
+    path: 'despachos-pr',
+    loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
+  },
+  {
+    path: 'diplomas',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+  },
+  {
+    path: 'expedientes-pr',
+    loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+  },
+  {
+    path: 'diplomas-assinar',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+  },
+  {
+    path: 'opts-expediente-pr',
+    loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
+  },
+  {
+    path: 'despachos-options',
+    loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
+  },
+  {
+    path: 'despachos-pr-options',
+    loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
+  },
+  {
+    path: 'deploma-options',
+    loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
+  },
+  {
+    path: 'pin',
+    loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
+  },
+  {
+    path: 'fingerprint',
+    loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
+  },
+  {
     path: 'new-event',
     loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
   },
+  {
+    path: 'edit-event',
+    loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
+    path: 'approve-event',
+    loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
+  },
 
-
- /*  {
-    path: 'chat',
-    component: ChatPage
-  } */
-
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+ /*  {
+    path: 'chat',
+    component: ChatPage
+  } */
+
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
index 19e809102..ec6cd538b 100644
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@@ -8,10 +8,10 @@ import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page';
 import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page';
 import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page';
 import { NewEventPage } from '../shared/agenda/new-event/new-event.page';
-import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component';
+import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page';
 import { ViewEventPage } from '../shared/agenda/view-event/view-event.page';
-import { EventListComponent } from '../shared/agenda/event-list/event-list.component';
-import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-event.component';
+import { EventListPage } from '../shared/agenda/event-list/event-list.page';
+import { ApproveEventPage } from '../shared/agenda/approve-event/approve-event.page';
 import { AttendeesPage } from '../shared/event/attendees/attendees.page';
 import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page';
 import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page';
@@ -46,15 +46,15 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov
     BtnCriarPage,
     BtnAdicionarPage,
 
-    NewEventPage,
-    EditEventComponent,
+    //NewEventPage,
+    //EditEventPage,
     //ViewEventPage,
-    ApproveEventComponent,
+    //ApproveEventPage,
     AttendeesPage,
     //AttendeeModalPage,
 
 
-    EventListComponent,
+    //EventListPage,
     EmptyContainerPage,
     //EventsToApprovePage,
   
@@ -67,16 +67,14 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov
     BtnCriarPage,
     BtnAdicionarPage,
 
-    NewEventPage,
-    EditEventComponent,
+    //NewEventPage,
+    //EditEventPage,
     // ViewEventPage,
-    EventListComponent,
-    ApproveEventComponent,
+    //EventListPage,
+    //ApproveEventPage,
     AttendeesPage,
     //AttendeeModalPage,
     //EventsToApprovePage,
-
-    EventListComponent,
     EmptyContainerPage,
     
   ],
diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts
index a08c4f9e8..7978c413a 100644
--- a/src/app/pages/agenda/agenda.module.ts
+++ b/src/app/pages/agenda/agenda.module.ts
@@ -14,10 +14,9 @@ import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/pt';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page"
-import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component';
+import { EditEventPage } from 'src/app/shared/agenda/edit-event/edit-event.page';
 import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page';
-import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component";
-import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component";
+import { EventListPage } from "src/app/shared/agenda/event-list/event-list.page";
 import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page';
 import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
 
@@ -34,6 +33,8 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event.module';
+import { ApproveEventPageModule } from 'src/app/shared/agenda/approve-event/approve-event.module';
+import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module';
 
 @NgModule({
   imports: [
@@ -55,7 +56,9 @@ import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event
     ViewEventPageModule,
     AttendeesPageModule,
     AttendeeModalPageModule,
-    EventsToApprovePageModule
+    EventsToApprovePageModule,
+    ApproveEventPageModule,
+    NewEventPageModule,
   ],
   declarations: [
     AgendaPage
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
deleted file mode 100644
index b96e33cae..000000000
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<ion-header class="ion-no-border">
-  <div class="header-content">
-    <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-    </div>
-    <div class="header-title">
-      <label>""{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
-    </div>
-    <div class="header-icon-right">
-      <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
-    </div>
-  </div>
-</ion-header>
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Acções</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="approveTask(loadedEvent.serialNumber)">
-        <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
-      </ion-item>
-      <ion-item (click)="emendTask(loadedEvent.serialNumber)">
-        <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Adicionar Nota</ion-label>
-      </ion-item>
-      <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Rejeitar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-
-<ion-content id="main-content">
-  <div class="upper-content">
-    <div class="content-location">
-      <div class="location-detail">
-        <ion-label >11{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
-      </div>
-      <div class="button-calendar-type">
-        <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">
-      <h5>Intervenientes</h5>
-      <ion-item>
-      <ion-label>
-        <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-      </ion-label>
-    </ion-item>
-    <h5>Detalhes</h5>
-    <ion-item>
-      <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
-    </ion-item>
-  </div>
-
-  <div *ngIf="loadedAttachments" class="bottom-content">
-    <ion-list>
-      <h5>Documentos Anexados</h5>
-      <ion-item>
-      <ion-label>
-        <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
-      </ion-label>
-    </ion-item>
-    </ion-list>
-  </div>
-</ion-content>
-<ion-footer>
-  <ion-toolbar>
-    <div class="buttons">
-    <ion-item lines="none">
-      <p>
-        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
-      </p>
-      <p>
-       <ion-menu-button autoHide="false">
-        <ion-icon  (click)="openMenu()" name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
-      </p>
-      <p>
-        <ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
-      </p>
-    </ion-item>
-    <ion-item hidden>
-      <p>
-        <ion-button class="button-reject" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</ion-button>
-      </p>
-    </ion-item>
-  </div>
-  </ion-toolbar>
-</ion-footer>
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
deleted file mode 100644
index e46534965..000000000
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { Event } from 'src/app/models/event.model';
-import { AlertService } from 'src/app/services/alert.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { ProcessesService } from 'src/app/services/processes.service';
-import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
-import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
-import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
-
-@Component({
-  selector: 'app-approve-event-modal',
-  templateUrl: './approve-event-modal.page.html',
-  /* styleUrls: ['./approve-event-modal.page.scss'], */
-})
-export class ApproveEventModalPage implements OnInit {
-  event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
-  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"];
-
-  
-  constructor(
-    private router:Router,
-    private modalController: ModalController,
-    private navParams: NavParams,
-    private processes:ProcessesService,
-    private attachmentsService: AttachmentsService,
-    private popoverController: PopoverController,
-    private menu: MenuController,
-    private alertService: AlertService,
-    ) {
-      this.serialNumber = this.navParams.get('serialNumber');
-    }
-
-  ngOnInit() {
-    this.getTask();
-    this.getAttachments();
-
-    window.onresize = (event) => {
-      // if not mobile remove all component
-      if( window.innerWidth >= 800){
-        this.modalController.dismiss(null);
-      }
-    };
-  }
-
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
-  close(){
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
-    this.modalController.dismiss(null);
-  }
-
-  getTask(){
-    this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
-      this.loadedEvent = res;
-      this.today = new Date(res.workflowInstanceDataFields.StartDate);
-      console.log(new Date(this.today));
-      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
-      
-    })
-  }
-  async approveTask(serialNumber:string){
-    let body = { 
-      "serialNumber": serialNumber, 
-      "action": "Aprovar" 
-    }
-
-    try {
-      await this.processes.PostTaskAction(body).toPromise()
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-      this.modalController.dismiss(null);
-      this.successMessage()
-    } catch (error) {
-      this.badRequest()
-    }
-
-  }
-
-  async emendTask(serialNumber:string){
-
-    try {
-      await this.openEmendMessageModal(serialNumber);
-      this.modalController.dismiss(null);
-      this.menu.close();
-    } catch (error) {
-
-    }
-
-
-  }
-
-  async rejectTask(serialNumber:string){
-  
-    let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-
-    try {
-      await this.processes.PostTaskAction(body).toPromise()
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-      this.modalController.dismiss(null);
-      this.successMessage()
-    } catch (error) {
-      this.badRequest()
-    }
-   
-  }
-
-  getAttachments(){
-    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
-      this.loadedAttachments = res;
-      console.log(res);
-    });
-  }
-
-  async openOptions(ev:any) {
-    const popover = await this.popoverController.create({
-      component: EventActionsPopoverPage,
-      cssClass: 'event-actions-popover',
-      event: ev,
-      translucent: true
-    });
-    return await popover.present();
-  }
-
-  openMenu() {
-    this.menu.open();
-  }
-
-  async openEmendMessageModal(serialNumber:string) {
-    const modal = await this.modalController.create({
-      component: EmendMessageModalPage,
-      componentProps:{
-        
-      },
-      cssClass: 'emend-message-modal',
-      backdropDismiss: false
-    });
-
-    await modal.present();
-
-    modal.onDidDismiss().then(res => {
-      if(res.data !== '') {
-        let body = { "serialNumber": serialNumber, 
-          "action": "Emendar",
-          "dataFields": {
-           "ReviewerUseComment": res.data,
-          }
-        }
-    
-        try {    
-          this.processes.PostTaskAction(body).toPromise()
-          this.router.navigate(['/home/gabinete-digital/event-list']);
-          this.successMessage()
-        } catch (error) {
-          this.badRequest()
-        }
-  
-      }
-      else{
-        //this.alertService.presentAlert('Operação cancelada!');
-      }
-    });
-  }
-    
-
-  async successMessage(message?: string) {
-    
-    const modal = await this.modalController.create({
-      component: SuccessMessageComponent,
-       componentProps: {
-        message: message || 'Processo efetuado' ,
-      },
-      cssClass: 'modal modal-desktop'
-    });
-
-    modal.present()
-    
-    setTimeout(()=>{
-      modal.dismiss()
-    },3000)
-    
-  }
-
-  async badRequest(message?: string) {
-    const modal = await this.modalController.create({
-      component: BadRequestComponent,
-       componentProps: {
-        message: message || 'Processo não efetuado' ,
-      },
-      cssClass: 'modal modal-desktop'
-    });
-
-    modal.present()
-    
-    setTimeout(()=>{
-      modal.dismiss()
-    },3000)
-  }
-}
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 23b414d2c..b05c37464 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
@@ -124,8 +124,6 @@
         </div>
 
       </div>
-
-
       
     </div>
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 899796807..1922084ce 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -9,7 +9,7 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod
 import { GabineteDigitalPage } from './gabinete-digital.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 
-import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component';
+import { EventListPage } from 'src/app/shared/agenda/event-list/event-list.page';
 import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
 import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
 import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
diff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/shared/agenda/event-list/event-list.module.ts
index bc23c444f..c6e334490 100644
--- a/src/app/shared/agenda/event-list/event-list.module.ts
+++ b/src/app/shared/agenda/event-list/event-list.module.ts
@@ -15,6 +15,7 @@ import { EventListPage } from './event-list.page';
     IonicModule,
     EventListPageRoutingModule
   ],
-  declarations: [EventListPage]
+  declarations: [EventListPage],
+  exports: [EventListPage]
 })
 export class EventListPageModule {}
diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts
index f5d90c691..4bcea0ab2 100644
--- a/src/app/shared/agenda/new-event/new-event.module.ts
+++ b/src/app/shared/agenda/new-event/new-event.module.ts
@@ -15,6 +15,7 @@ import { NewEventPage } from './new-event.page';
     IonicModule,
     NewEventPageRoutingModule
   ],
-  declarations: [NewEventPage]
+  declarations: [NewEventPage],
+  exports: [NewEventPage]
 })
 export class NewEventPageModule {}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 5acf9d097..23ebdb775 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { ApproveEventComponent } from '../../agenda/approve-event/approve-event.component';
+import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page';
 
 @Component({
   selector: 'app-events-to-approve',
@@ -104,7 +104,7 @@ export class EventsToApprovePage implements OnInit {
     }
 
     const modal = await this.modalController.create({
-      component: ApproveEventComponent,
+      component: ApproveEventPage,
       componentProps:{
         serialNumber: eventToAprove.serialNumber,
         InstanceId: InstanceId ,
diff --git a/src/global.scss b/src/global.scss
index 4b81d8140..efd39c49d 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -542,7 +542,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
           }
         
           .timeline-box{
-              // left: -13%;
+              left: -13%;
               position: relative;
               width: 113%;
           }