diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index d6cd2a7e0..9844e6e2c 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,267 +1,268 @@
-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 = [
-  {
-    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: '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: '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: 'bad-request',
-    loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
-  },
-  {
-    path: 'success-message',
-    loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
-  },
-  {
-    path: 'forward',
-    loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
-  },
-  {
-    path: 'edit-event-to-approve',
-    loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
-  },
-  {
-    path: 'actions-options',
-    loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule)
-  },
-  {
-    path: 'edit-action',
-    loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule)
-  },
-  {
-    path: 'eliminate-event',
-    loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule)
-  },
-  {
-    path: 'inactivity',
-    loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule)
-  },
-  {
-    path: 'document-set-up-meeting',
-    loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule)
-  },
-  {
-    path: 'profile',
-    loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule)
-  },
-  {
-    path: 'all-processes',
-    loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule)
-  },
-  {
-    path: 'searched-document-options',
-    loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule)
-  },
-  {
-    path: 'task-list',
-    loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule)
-  },
-  {
-    path: 'task-list',
-    loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule)
-  },
-  {
-    path: 'task-detailde',
-    loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule)
-  },
-  {
-    path: 'task-details',
-    loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule)
-  },
-  {
-    path: 'chat-options-features',
-    loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule)
-  },
-  {
-    path: 'document-viewer',
-    loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule)
-  },
-  {
-    path: 'view-document',
-    loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule)
-  },
-  {
-    path: 'event-details-documents-options',
-    loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule)
-  },
-  {
-    path: 'preview-camera',
-    loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule)
-  },
-  {
-    path: 'group-icons',
-    loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule)
-  },
-  {
-    path: 'video-allowed',
-    loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule)
-  },
-  {
-    path: 'preview-photo',
-    loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule)
-  },
-  {
-    path: 'custom-image-cache',
-    loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule)
-  },
-  {
-    path: 'view-media',
-    loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule)
-  },
-  {
-    path: 'view-event',
-    loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule)
-  },
-  {
-    path: 'previewer',
-    loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule)
-  },
  {
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+
+const 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: '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: '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: 'bad-request',
+    loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
+  },
+  {
+    path: 'success-message',
+    loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
+  },
+  {
+    path: 'forward',
+    loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
+  },
+  {
+    path: 'edit-event-to-approve',
+    loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
+  },
+  {
+    path: 'actions-options',
+    loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule)
+  },
+  {
+    path: 'edit-action',
+    loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule)
+  },
+  {
+    path: 'eliminate-event',
+    loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule)
+  },
+  {
+    path: 'inactivity',
+    loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule)
+  },
+  {
+    path: 'document-set-up-meeting',
+    loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule)
+  },
+  {
+    path: 'profile',
+    loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule)
+  },
+  {
+    path: 'all-processes',
+    loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule)
+  },
+  {
+    path: 'searched-document-options',
+    loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule)
+  },
+  {
+    path: 'task-list',
+    loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule)
+  },
+  {
+    path: 'task-list',
+    loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule)
+  },
+  {
+    path: 'task-detailde',
+    loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule)
+  },
+  {
+    path: 'task-details',
+    loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule)
+  },
+  {
+    path: 'chat-options-features',
+    loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule)
+  },
+  {
+    path: 'document-viewer',
+    loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule)
+  },
+  {
+    path: 'view-document',
+    loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule)
+  },
+  {
+    path: 'event-details-documents-options',
+    loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule)
+  },
+  {
+    path: 'preview-camera',
+    loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule)
+  },
+  {
+    path: 'group-icons',
+    loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule)
+  },
+  {
+    path: 'video-allowed',
+    loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule)
+  },
+  {
+    path: 'preview-photo',
+    loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule)
+  },
+  {
+    path: 'custom-image-cache',
+    loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule)
+  },
+  {
+    path: 'view-media',
+    loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule)
+  },
+  {
+    path: 'view-event',
+    loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule)
+  },
+  {
+    path: 'previewer',
+    loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule)
+  },
+  {
     path: 'set-room-owner',
     loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule)
+  },
+  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
+  },
+  {
+    path: 'diplomas-gerar-options',
+    loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule)
   }
 
-
-
-
-
-
-
- /*
-    path: 'chat',
-    component: ChatPage
-  } */
-
- /*
-    path: 'chat',
-    component: ChatPage
-  } */
-
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes,
-      { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+ /*
+    path: 'chat',
+    component: ChatPage
+  } */
+
+ /*
+    path: 'chat',
+    component: ChatPage
+  } */
+
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes,
+      { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 2964c13c1..f436776da 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -75,17 +75,6 @@ const routes: Routes = [
         ],
 
       },
-      // {
-      //   path: 'login',
-      //   children: [
-      //     {
-      //       path:'',
-      //       loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)
-      //     },
-      //   ],
-      //   canActivate: [LoginGuard]
-
-      // },
       {
         path: 'agenda',
         children: [
@@ -244,6 +233,19 @@ const routes: Routes = [
               },
             ]
           },
+          {
+            path: 'diplomas-gerar',
+            children: [
+              {
+                path: '',
+                loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then(m => m.DiplomasGerarPageModule),
+              },
+              {
+                path:':SerialNumber/:caller',
+                loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module').then(m => m.DiplomasGerarPageRoutingModule),
+              },
+            ]
+          },
           {
             path:'event-list',
             children: [
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 6e0f74a4d..f1fd25269 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -98,38 +98,34 @@ export class HomePage implements OnInit {
         this.user = SessionStore.user;
       }
 
-    /* this.webNotificationPopupService.askNotificationPermission() */
-
-    this.NativeNotificationService.askForPermission()
-
-    this.router.events.subscribe((val) => {
-      document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
-      document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
-    });
-
-    window['platform'] = platform
-
-    window['inactivity/function'] = () => {
-
-      if (window.location.pathname != '/inactivity') {
+      this.NativeNotificationService.askForPermission()
 
+      this.router.events.subscribe((val) => {
         document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
-        document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove())
+        document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
+      });
 
-        const pathname = window.location.pathname
-        SessionStore.setUrlBeforeInactivity(pathname)
-      
-        if (this.platform.is('mobileweb')) {
-          this.router.navigate(['/inactivity']);
-        }else{
-          this.router.navigate(['/']);
+      window['platform'] = platform
+
+      window['inactivity/function'] = () => {
+
+        if (window.location.pathname != '/inactivity') {
+
+          document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
+          document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove())
+
+          const pathname = window.location.pathname
+          SessionStore.setUrlBeforeInactivity(pathname)
+        
+          if (this.platform.is('mobileweb')) {
+            this.router.navigate(['/inactivity']);
+          }else{
+            this.router.navigate(['/']);
+          }
         }
+
       }
 
-    }
-
-
-
   }
 
   goto(url) {
diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts
index 57900bc5a..6087e52f1 100644
--- a/src/app/modals/add-note/add-note.page.ts
+++ b/src/app/modals/add-note/add-note.page.ts
@@ -47,7 +47,7 @@ export class AddNotePage implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        typety: 'AccoesPresidenciais & ArquivoDespachoElect',
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
         showSearchInput: true,
         select: true
       }
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 3db1782ff..c2e121b25 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -8,7 +8,6 @@
         <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
-      <!-- {{ postData.DispatchFolder.Subject }} -->
 
       <div class="container-div width-100">
         <div class="ion-item-class-2">
@@ -21,7 +20,6 @@
         </div>
       </div>
 
-      <!-- {{ postData.DispatchFolder.Message }} -->
 
       <!-- Add scrolls -->
       <div class="d-flex flex-column height-100 overflow-y-auto">
@@ -66,15 +64,6 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('selectedTypes')?.invalid  && validateFrom ">
-              <!-- <ion-item
-                class="ion-no-border ion-no-padding ion-no-margin d-block d-md-none">
-                <ion-select
-                [(ngModel)]="selectedTypes"
-                (ngModelChange)="onSelectedTypesChanged($event)"
-                multiple="true" interface="alert" Cancel-text="Cancelar" required>
-                  <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
-                </ion-select>
-              </ion-item> -->
 
               <mat-form-field
                 floatLabel="never"
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index 6555495ab..12d6328fd 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -15,15 +15,16 @@ export class EmendMessageModalPage implements OnInit {
     public ThemeService: ThemeService
   ) {
     this.emendMessage = '';
-   }
+  }
 
-  ngOnInit() {
+  ngOnInit() {}
+
+  close() {
+    this.modalController.dismiss({option:'close', note: this.emendMessage});
   }
-  close(){
-    this.modalController.dismiss('');
-  }
-  save(){
-    this.modalController.dismiss(this.emendMessage);
+
+  save() {
+    this.modalController.dismiss({option:'save', note: this.emendMessage});
   }
 
 }
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 6d54d86ef..d9178ec38 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -106,7 +106,7 @@ export class EventActionsPopoverPage implements OnInit {
     .then( async (res) => {
       
       
-      if(res.data !== ''){
+      if(res.data.note !== ''){
         let body = { "serialNumber": this.serialNumber, 
         "action": "Emendar",
             "dataFields": {
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 b0a017e59..9046ae6e3 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -376,11 +376,9 @@ export class NewEventPage implements OnInit {
 
       });
 
-
       this.toastService._successMessage()
       this.modalController.dismiss(this.postEvent);
 
-
     } catch (error) {
       this.toastService._badRequest()
     } finally {
@@ -478,13 +476,13 @@ export class NewEventPage implements OnInit {
     this.openAttendees();
   }
 
-  addParticipantsCC(){
+  addParticipantsCC() {
     this.adding = 'CC'
     this.openAttendees();
   }
 
 
-  async getDoc(){
+  async getDoc() {
     const modal = await this.modalController.create({
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 73e60aa79..dccd9e4f3 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -31,7 +31,6 @@ import { MessageService } from 'src/app/services/chat/message.service';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { SessionStore } from 'src/app/store/session.service';
-import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
   selector: 'app-group-messages',
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index baf01a4eb..e64908279 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -53,7 +53,7 @@
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}'
         *ngIf="msg.msg !=''">
         <div class="title">
-          <ion-label (click)="hkellor()">{{msg.u.name}}</ion-label>
+          <ion-label >{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
         </div>
         <div>
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 73062561a..cc8657f78 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1053,10 +1053,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   // }
 
 
-  hkellor() {
-    // alert('cool!')
-  }
-
 }
 
 
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 119ec4433..f4b1f50c2 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -174,6 +174,7 @@ export class DespachoPrPage implements OnInit {
       this.sqliteservice.updateProcess(res);
     }
   }
+  
   updateProcessInterveners(users) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
     } else {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 9ee5a0dfb..dc0cd0c5b 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -18,6 +18,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
+import { SessionStore } from 'src/app/store/session.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -124,7 +125,16 @@ export class DespachosPrPage implements OnInit {
       let despachos = this.sortService.sortArrayByDate(result);
 
       if(this.loggeduser.Profile != "PR") {
-        despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        
+        
+
+        if(SessionStore.user.Profile != 'Consultant') {
+          despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        } else {
+          despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
+        }
+
+        
       } else if (this.loggeduser.Profile == "PR") {
         despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
       }
@@ -277,26 +287,6 @@ export class DespachosPrPage implements OnInit {
   }
 
 
-  // async distartExpedientModal() {
-
-  //   const modal = await this.modalController.create({
-  //     component: DiscartExpedientModalPage,
-  //     componentProps: {
-  //       action: 'complete',
-  //     },
-  //     cssClass: 'discart-expedient-modal',
-  //     backdropDismiss: false
-  //   });
-
-  //   await modal.present();
-  //   modal.onDidDismiss().then(res=>{
-  //     if(res['data']=='close'){
-
-  //     }
-
-  //   });
-  // }
-
   docIndex(index: number) {
     this.dicIndex = index;
   }
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index 651625538..ddae3b550 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -186,7 +186,7 @@ ion-button{
   }
 }
 
-@media only screen and (min-width: 1140px){
+@media only screen and (min-width: 1140px) {
   .content{
     width: 75%;
   }
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 4d0a0c165..a21d2ed3f 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -98,34 +98,8 @@ export class DespachoPage implements OnInit {
 
   goBack() {
 
-    //this.navigationService.back()
     this.RouteService.goBack();
 
-    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-    //   if (window.innerWidth < 801) {
-    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
-    //   }
-    //   else {
-    //     let navigationExtras: NavigationExtras = {
-    //       queryParams: {
-    //         "pendentes": true,
-    //       }
-    //     }
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
-    // else{
-    //   if (window.innerWidth < 801) {
-    //     this.router.navigate(['/home/gabinete-digital/despachos']);
-    //   } else {
-    //     let navigationExtras: NavigationExtras = {
-    //       queryParams: {
-    //         'despachos': true
-    //       }
-    //     }
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
   }
 
   async LoadTaskDetail(serial: string) {
@@ -318,10 +292,10 @@ export class DespachoPage implements OnInit {
 
     try {
       await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
-      this.toastService.successMessage('Processo descartado')
+      this.toastService._successMessage('Processo descartado')
       this.close();
     } catch (error) {
-      this.toastService.badRequest("Processo não descartado")
+      this.toastService._badRequest("Processo não descartado")
     }
     finally {
       loader.remove()
@@ -371,10 +345,10 @@ export class DespachoPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.toastService.successMessage()
+      this.toastService._successMessage()
       this.close();
     } catch (error) {
-      this.toastService.badRequest()
+      this.toastService._badRequest()
     }   finally {
       loader.remove()
     }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 34c53fd33..eaaa3f150 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -1,10 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { momentG }  from 'src/plugin/momentG';
 
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@@ -93,9 +92,6 @@ export class DiplomaAssinarPage implements OnInit {
       }
 
       this.fulltask = res;
-      
-
-      
 
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
@@ -188,7 +184,6 @@ export class DiplomaAssinarPage implements OnInit {
 
   }
 
-
   toDateString(e) {
     return new Date(e).toDateString()
   }
@@ -196,5 +191,4 @@ export class DiplomaAssinarPage implements OnInit {
     this.modalController.dismiss();
   }
 
-
 }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index b2d4bfe92..a8cf57be2 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -29,23 +29,21 @@
     </ion-refresher>
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
 
-    <div class="width-100" *ngIf="diplomasList.length >= 1">
+    <div class="width-100" *ngIf="deplomasStore.diplomasParaAssinarList">
 
-      <div *ngIf="diplomasList">
+      <div *ngIf="deplomasStore.diplomasParaAssinarList">
         <ion-list >
-          <!-- *ngFor = "let task of parecerList; let i = index"
-          (click)="viewExpedientDetail(task.SerialNumber)" -->
+
           <div
             class="expediente ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor = "let task of diplomasList"
-            (click)="goToDiploma(task.SerialNumber)"
+            *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
+            (click)="goToDiploma(task.SerialNumber || task.serialNumber)"
           >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+
             <div class="item width-100">
               <div class="exp-top-detail">
                 <div class="subject">
-                  <ion-label>{{ task.Folio }}</ion-label>
+                  <ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
                 </div>
                 <div class="exp-icon">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -74,13 +72,13 @@
 
     <!-- Empty -->
     <div
-      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      *ngIf="!skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+    <div *ngIf="skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0">
 
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index e1f972cac..a07296c19 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -7,6 +7,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
+import { DeplomasStore } from 'src/app/store/deplomas.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -25,6 +26,7 @@ export class DiplomasAssinarPage implements OnInit {
 
  customTaskPipe = new CustomTaskPipe()
  skeletonLoader = true
+ deplomasStore = DeplomasStore
 
  constructor(
    private processes:ProcessesService,
@@ -76,17 +78,15 @@ export class DiplomasAssinarPage implements OnInit {
     this.skeletonLoader = true
 
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.diplomasList = [];
+
 
     let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
-    diplomasAssinar.forEach(element => {
-      let task: customTask = this.customTaskPipe.transform(element)
-      this.diplomasList.push(task);
-    });
+    
+
+    this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
 
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
 
-
     this.skeletonLoader = false
     this.showLoader = false;
 
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..7971f1204
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  },
+  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..8468ae276
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
+import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule,
+    HeaderPageModule,
+    BtnModalDismissPageModule
+  ],
+  declarations: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..385269545
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,196 @@
+<ion-header class="ion-no-border">
+  <app-header > </app-header>
+</ion-header>
+
+
+<ion-header class="ion-no-border header-2">
+
+  <div class="title d-flex align-center">
+    <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
+
+    <div class="title"><ion-label >Diplomas por Elaborar</ion-label></div>
+    <div class="theicon btn-refresh">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+
+</ion-header>
+<ion-content>
+
+  <div class="main-content width-100 overflow-y-auto height-100">
+
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+    </ion-refresher>
+    <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+
+    <div class="width-100" *ngIf="deplomasStore.DiplomaGerarList.length >= 1">
+
+      <div *ngIf="deplomasStore.DiplomaGerarList">
+        <ion-list >
+          <div
+            class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor = "let task of deplomasStore.DiplomaGerarList"
+            (click)="goToDiploma(task.SerialNumber)"
+          >
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="subject">
+                  <ion-label>{{ task.Folio }}</ion-label>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <div class="exp-remetente">
+                  <ion-label>{{task.Senders}}</ion-label>
+                </div>
+              </div>
+              <div class="exp-middle-detail">
+                <div class="exp-workflow">
+                  <span class="label">{{task.activityInstanceName}}</span>
+                </div>
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </ion-list>
+      </div>
+    </div>
+
+    <!-- Empty -->
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+
+
+  <div class="main-content width-100 overflow-y-auto height-100">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content
+          pullingIcon="chevron-down-circle-outline"
+          pullingText="deslize para actualizar"
+          refreshingSpinner="circles"
+          refreshingText="A actualizar...">
+      </ion-refresher-content>
+    </ion-refresher>
+
+    <div >
+      <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+      <div class="height-100">
+        <ion-list>
+          <div
+            class="expediente ion-no-padding ion-no-margin cursor-pointer"  
+            *ngFor = "let task of deplomasStore.DiplomaGerarList; let i = index"
+            (click)="goToDiploma(task.SerialNumber)"
+          >
+            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="subject">
+                  <ion-label>{{ task.Folio }}</ion-label>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <div class="exp-remetente">
+                  <ion-label>{{task.Senders}}</ion-label>
+                </div>
+              </div>
+              <div class="exp-middle-detail">
+                <div class="exp-workflow">
+                  <span class="label">{{task.activityInstanceName}}</span>
+                </div>
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </ion-list>
+
+      </div>
+    </div>
+
+    <div 
+      *ngIf="!skeletonLoader && deplomasStore.DiplomaGerarList.length == 0" 
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && deplomasStore.DiplomaGerarList.length == 0">
+    
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+</ion-content>
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..a4421e515
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,236 @@
+@import '~src/function.scss';
+/* CONTENT */
+:host{
+  margin: 0;
+}
+
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+
+ion-content, .header-2, .main-content{
+  padding: 30px 20px 0 20px !important;
+  background-color: white;
+}
+
+.main-content {
+  padding-top: 0px !important;
+}
+
+.title{
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle {
+      width: fit-content;
+      float: left;
+    }
+    .theicon {
+      width: fit-content;
+      float: right;
+    }
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .ion-item-class{
+    padding: 0;
+  
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //border-radius: 15px;
+    //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    //Sborder: solid 1px #e9e9e9;
+    background-color: var(--white);
+    margin: 0 auto;
+    //padding: 10px;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+  
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      /* border: 1px solid red; */
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    /* border: 1px solid blue; */
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+/* New CSS */
+.expediente{
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border:1px solid #e9e9e9 !important;
+  background-color: var(--white);
+  margin-bottom: 10px !important;
+  padding: 15px;
+}
+.exp-list-item{
+  //width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+
+.exp-top-detail{
+  width: 100%;
+  float: left;
+  font-family: Roboto;
+  font-size: 12pt;
+  font-weight: 700;
+  color: var(--title-text-color);
+  padding-left: 3px;
+
+  .subject{
+    width: 84%;
+    float: left;
+  }
+
+  .exp-icon{
+    width: fit-content;
+    float: right;
+   /* font-size: 13px; */
+    margin: 0 !important;
+    padding: 0 !important;
+
+    ion-icon{
+      font-size: 12pt;
+      color: #42b9fe;
+      float: left;
+    }
+    label{
+      font-size: 10pt;
+    }
+  }
+}
+.exp-middle-detail, .exp-bottom-detail{
+  margin-bottom: 5px;
+
+}
+.exp-middle-detail{
+  font-size: 12pt;
+  width: 100%;
+  overflow: auto;
+
+  .exp-workflow{
+    float: left;
+    margin: 0 !important;
+  
+    .label{
+      border-radius: 15px;
+      background: #ffb703;
+      /* font-size: 12px; */
+      float: right;
+      padding: 2.5px 13.5px 2.5px 13.5px;
+      color: #fff;
+  }
+  }
+  .exp-date{
+    width: auto;
+    font-family: Roboto;
+    font-size: 10pt;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #797979;
+    float: right;
+  }
+}
+.exp-bottom-detail{
+  font-size: 8pt;
+  width: 100%;
+  overflow: auto;
+  padding-left: 3px;
+
+  .exp-remetente{
+    //width: 200px;
+    font-family: Roboto;
+   /*  font-size: 13px; */
+    font-weight: normal;
+    color: #000000;
+    float: left;
+    /* border: 1px solid red; */
+  }
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..48b8f3b1c
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,105 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { DeplomasStore } from 'src/app/store/deplomas.service';
+
+
+@Component({
+  selector: 'app-diplomas-gerars',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+  //profile:string;
+  diplomasList:DailyWorkTask[] = [];
+  showLoader: boolean;
+  totalDocs:any;
+  serialNumber:string;
+ 
+  @Input() profile:string;
+  @Input() segment:string;
+ 
+  customTaskPipe = new CustomTaskPipe()
+  skeletonLoader = true
+  deplomasStore = DeplomasStore
+ 
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    private alertService: AlertService,
+    private router: Router,
+    private sortService: SortService,
+   public ThemeService: ThemeService) {
+    }
+ 
+   ngOnInit() {
+     const location = window.location
+     const pathname = location.pathname + location.search
+ 
+     this.LoadList()
+ 
+     this.router.events.forEach((event) => {
+       if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+         if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+           this.refreshing()
+         } else {
+           this.LoadList()
+         }
+       }
+     });
+   }
+ 
+ 
+ 
+   goToDiploma(serialNumber:any){
+     this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']);
+ 
+   }
+ 
+  async refreshing() {
+     setTimeout(() => {
+       this.LoadList();
+     }, 1000);
+   }
+ 
+   doRefresh(event) {
+ 
+     setTimeout(() => {
+       this.LoadList();
+     }, 1000);
+   }
+ 
+   async LoadList(){
+ 
+     this.skeletonLoader = true
+ 
+     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+     this.diplomasList = [];
+ 
+     let gerarDiploma =  diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
+     
+     gerarDiploma.forEach(element => {
+       let task: customTask = this.customTaskPipe.transform(element)
+       this.diplomasList.push(task);
+     });
+ 
+     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate');
+     this.deplomasStore.resetDiplomaGerar(this.diplomasList);
+ 
+ 
+     this.skeletonLoader = false
+     this.showLoader = false;
+ 
+   }
+ 
+   goBack() {
+     this.router.navigate(['/home/gabinete-digital']);
+     // window.history.back()
+   }
+}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..63a34f256
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..33f015d4d
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule,
+    HeaderPageModule
+  ],
+  declarations: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..a1fce51d3
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,130 @@
+<ion-header class="ion-no-border pb-20">
+  <app-header > </app-header>
+</ion-header>
+
+<ion-content class="container-wrapper">
+  <div class="main-content d-flex height-100 width-100 overflow-hidden">
+
+
+    <div class="content d-flex flex-column" *ngIf="task">
+      <div class="main-header">
+        <div class="title-content width-100 d-flex justify-space-between">
+          <div class="font-30 cursor-pointer" (click)="goBack()" >
+            <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1 ">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon" (click)="openOptions()">
+              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+          </ion-label>
+        </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>
+          <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>
+        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+          </ion-item>
+        </div>
+      </div>
+      <div class="bottom-content width-100">
+        <ion-list>
+          <h5>Documentos Anexados</h5>
+          <ion-item *ngFor="let attachment of attachments"
+            class="ion-no-margin ion-no-padding cursor-pointer"
+          >
+            <ion-label
+              (click)="viewDocument(attachment.DocId, attachment)"
+            >
+              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
+            </ion-label>
+        </ion-item>
+        </ion-list>
+      </div>
+    </div>
+
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+      <div class="buttons">
+        <button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
+        <button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
+        <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
+        <div class="solid"></div>
+      </div>
+    </div>
+
+    <div *ngIf="!task">
+      <ion-list>
+        <ion-list-header>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </ion-label>
+        </ion-list-header>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <button color="medium" shape="round" expand="block">
+          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </button>
+      </ion-list>
+    </div>
+  </div>
+</ion-content>
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..69e728cfa
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,256 @@
+@import '~src/function.scss';
+
+:host{
+  margin: 0;
+}
+
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+
+ion-content, .header-2, .main-content{
+  padding: 30px 20px 0 20px !important;
+}
+
+.main-content {
+  padding-top: 0px !important;
+}
+
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+    .header-top{
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+      .middle{
+        padding: 0!important;
+        float: left;
+        width: 280px;
+        margin: 2.5px 0 0 5px;
+        display: flex;
+        align-items: center;
+
+        }
+        .right{
+          padding: 0!important;
+          float: right;
+          font-size: 25px;
+          color: #0782c9;
+          margin: 5px 0 0 0;
+        }
+      }
+      .header-bottom{
+         width: 310px;
+        overflow: auto;
+        margin: 0 auto;
+
+        .header-bottom-icon{
+          width: 30px;
+          font-size: 25px;
+          float: left;
+          padding: 2px;
+        }
+        .header-bottom-contacts{
+          width: 275px;
+          font-size: 15px;
+          color: #797979;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          float: left;
+            padding: 5px;
+          margin: 1px;
+        }
+      }
+
+        .title{
+          font-size: 25px;
+          overflow: auto;
+          float: left;
+          padding-top: 4px;
+          padding-left: 5px;
+        }
+        .div-icon{
+          width: 40px;
+          float: right;
+          font-size: 35px;
+          overflow: auto;
+          padding: 1px;
+        }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #ffb703;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    font-size: 18px;
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: 16px !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..dd0c66ff2
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,332 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, PopoverController } from '@ionic/angular';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { momentG }  from 'src/plugin/momentG';
+
+import { ActivatedRoute } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
+import { DespachoService } from 'src/app/Rules/despacho.service'
+import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
+
+@Component({
+  selector: 'app-diplomas-gerar',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage 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"];
+
+  serialnumber: string;
+  profile: string;
+  task: any
+  fulltask: any
+  intervenientes: any;
+  cc: any = [];
+  attachments:any;
+  customDate: any;
+  caller:string;
+
+  constructor(
+    private processes: ProcessesService,
+    public popoverController: PopoverController,
+    private modalController: ModalController,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public ThemeService: ThemeService,
+    private despachoService: DespachoService,
+  ) {
+    this.activatedRoute.paramMap.subscribe(params => {
+      if(params["params"].SerialNumber) {
+        this.serialnumber = params["params"].SerialNumber;
+      }
+      if(params["params"].caller) {
+        this.caller = params["params"].caller;
+      }
+    });
+
+  }
+
+  ngOnInit() {
+    this.profile = "mdgpr";
+    this.LoadTaskDetail(this.serialnumber);
+  }
+
+  goBack() {
+    this.RouteService.goBack();
+  }
+
+  async openOptions(taskAction?: any) {
+    const popover = await this.popoverController.create({
+      component: DiplomasGerarOptionsPage,
+      cssClass: 'exp-options',
+      componentProps: {
+        serialNumber: this.task.SerialNumber,
+        task: this.task,
+        showEnviarPendentes: false
+      },
+      translucent: true
+    });
+    return await popover.present();
+  }
+
+  async LoadTaskDetail(serial: string) {
+
+    this.processes.GetTask(serial).subscribe(res => {
+      this.task = {
+        "SerialNumber": res.serialNumber,
+        "Folio": res.workflowInstanceDataFields.Subject,
+        "Senders": res.originator.email,
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
+        "Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note,
+        "FolderId": res.workflowInstanceDataFields.FolderID,
+        "FsId": '361',
+        "DocId": res.workflowInstanceDataFields.DispatchDocId,
+        "WorkflowName": res.workflowDisplayName,
+        "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
+        "activityInstanceName": res.activityInstanceName,
+      }
+
+      this.fulltask = res;
+
+      let thedate = new Date(this.task.CreateDate);
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+
+      this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
+        this.intervenientes = users.filter(user=>{
+          return user.Type == 'I';
+        });
+        this.cc = users.filter(user=>{
+          return user.Type == 'CC';
+        });
+        
+
+      });
+      this.getDocumentDetails(this.task.FolderId, '361');
+
+
+
+    }, (error)=>{
+      try {
+        this.toastService._badRequest('Processo não encontrado')
+        this.goBack()
+      } catch (e) {
+        window.history.back();
+      }   finally {
+        if(error.status ==  0) {
+          this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+        } else {
+          this.toastService._badRequest('Processo não encontrado')
+        }
+      }
+    });
+
+  }
+
+
+  
+  async openDelegarModal() {
+    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: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
+  }
+
+
+  async openBookMeetingModal() {
+    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: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss()
+  }
+
+  async sendExpedienteToPending() {
+
+    this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
+      this.goBack();
+      this.toastService.successMessage()
+    },
+      error => {
+        this.toastService.badRequest("Processo não enviado para despacho")
+      });
+
+  }
+
+
+
+  async enviarDiploma({note = '', documents = [], serialnumber}) {
+    
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'add-note-modal-no-height'
+    }
+
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then(async (res) => {
+      if (res.data) {
+
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
+        let body = {
+          "serialNumber": serialnumber,
+          "action": "Enviar diploma",
+          "ActionTypeId": 104,
+          "dataFields": {
+            "ReviewUserComment": res.data.note,
+          },
+          "AttachmentList" : docs,
+        }
+        
+        const loader = this.toastService.loading()
+    
+        try {
+          await this.processes.CompleteTask(body).toPromise();
+          this.modalController.dismiss('sucess');
+          this.toastService._successMessage();
+          this.goBack()
+        } catch (error) {
+          this.toastService._badRequest();
+        } finally {
+          loader.remove()
+        }
+
+
+      }
+    });
+
+  }
+  
+  async viewDocument(DocId:string, Document) {
+
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        trustedUrl: '',
+        file: {
+          title: Document.Assunto,
+          url: '',
+          title_link: '',
+        },
+        Document,
+        applicationId: Document.ApplicationId,
+        docId: Document.DocId || Document.SourceId,
+        folderId: this.task.FolderId,
+        task: this.fulltask
+      },
+      cssClass: 'modal modal-desktop'
+    });
+    await modal.present();
+
+  }
+
+  getDocumentDetails(forlderId:string, applicationId:string) {
+    this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
+      this.attachments = res.Documents;
+      
+      
+    })
+  }
+
+  async Assinar() {
+    let body = {
+      "serialNumber": this.serialnumber,
+      "action": "Assinado",
+      "ActionTypeId": 99999842,
+      "dataFields": {
+        "ReviewUserComment": '',
+      },
+      "AttachmentList": {},
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+
+      this.toastService._successMessage(false, ()=>{
+        this.goBack();
+      })
+    } catch (error) {
+      this.toastService._badRequest()
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+  
+
+  toDateString(e) {
+    return new Date(e).toDateString()
+  }
+
+  close() {
+    this.modalController.dismiss();
+  }
+
+
+}
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 64b9e95bc..2cdd2458f 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
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then( async (res) => {
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { 
           "serialNumber": serialNumber, 
           "action": "Emendar",
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index e6852b302..f5acecbc1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -78,8 +78,6 @@ export class ApproveEventPage implements OnInit {
 
   ngOnInit() {
     
-    
-
     this.getTask();
     this.backgroundservice.registerBackService('Online', () => {
       this.getTask();
@@ -123,7 +121,6 @@ export class ApproveEventPage implements OnInit {
   
           this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
   
-          let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
           this.loadedAttachments = this.loadedEvent.Documents;
           
       })
@@ -227,16 +224,6 @@ export class ApproveEventPage implements OnInit {
       loader.remove()
     }
 
-
-    /* this.approveEventDismiss.emit({
-      "serialNumber": serialNumber,
-      "action": "Aprovar",
-      "saveData": {
-        loadedEvent: this.loadedEvent,
-        today: this.today,
-        customDate: this.customDate
-      }
-    }); */
   }
 
   async emendTask(serialNumber: string) {
@@ -284,12 +271,9 @@ export class ApproveEventPage implements OnInit {
 
         }
         else {
-          //this.alertService.presentAlert('Operação cancelada!');
         }
       });
 
-    //this.openEmendMessageModal(serialNumber);
-    //this.goBack();
   }
 
   async rejeitar(serialNumber: string) {
@@ -349,6 +333,7 @@ export class ApproveEventPage implements OnInit {
   openMenu() {
     this.menu.open();
   }
+
   async openEmendMessageModal(serialNumber: string) {
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
@@ -363,7 +348,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss().then(async (res) => {
       
 
-      if (res.data !== '') {
+      if (res.data.note !== '') {
         let body = {
           "serialNumber": serialNumber,
           "action": "Emendar",
@@ -409,8 +394,7 @@ export class ApproveEventPage implements OnInit {
         serialNumber: serialNumber,
         InstanceId: this.InstanceId
       },
-      cssClass: 'modal modal-desktop',
-      // backdropDismiss: false
+      cssClass: 'modal modal-desktop'
     });
 
     await modal.present();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
index 87eedcb46..c7a77a59c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
@@ -1,59 +1,63 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { GabineteDigitalPage } from './gabinete-digital.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GabineteDigitalPage
-  },
-  {
-    path: 'expediente',
-    loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
-  },
-  {
-    path: 'discart-expedient-modal',
-    loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
-  },
-  {
-    path: 'despachos',
-    loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
-  },
-  {
-    path: 'pedidos',
-    loadChildren: () => import('./pedidos/pedidos.module').then( m => m.PedidosPageModule)
-  },
-  {
-    path: 'pendentes',
-    loadChildren: () => import('./pendentes/pendentes.module').then( m => m.PendentesPageModule)
-  },
-  {
-    path: 'despachos-pr',
-    loadChildren: () => import('./despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
-  },
-  {
-    path: 'diplomas',
-    loadChildren: () => import('./diplomas/diplomas.module').then( m => m.DiplomasPageModule)
-  },
-  {
-    path: 'expedientes-pr',
-    loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
-  },
-  {
-    path: 'diplomas-assinar',
-    loadChildren: () => import('./diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GabineteDigitalPage } from './gabinete-digital.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: GabineteDigitalPage
+  },
+  {
+    path: 'expediente',
+    loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
+    path: 'discart-expedient-modal',
+    loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
+  },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
+  {
+    path: 'pedidos',
+    loadChildren: () => import('./pedidos/pedidos.module').then( m => m.PedidosPageModule)
+  },
+  {
+    path: 'pendentes',
+    loadChildren: () => import('./pendentes/pendentes.module').then( m => m.PendentesPageModule)
+  },
+  {
+    path: 'despachos-pr',
+    loadChildren: () => import('./despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
+  },
+  {
+    path: 'diplomas',
+    loadChildren: () => import('./diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+  },
+  {
+    path: 'expedientes-pr',
+    loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+  },
+  {
+    path: 'diplomas-assinar',
+    loadChildren: () => import('./diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+  },
  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
   },
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class GabineteDigitalPageRoutingModule {}
+
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class GabineteDigitalPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 8249a4664..279e05eb6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -7,19 +7,7 @@ import { IonicModule } from '@ionic/angular';
 import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.module';
 
 import { GabineteDigitalPage } from './gabinete-digital.page';
-import { SharedModule } from 'src/app/shared/shared.module';
 
-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 { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
-import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
-import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
-import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despachos.page';
-import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page';
-import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
-import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page';
-import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page';
 
 import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
@@ -28,6 +16,7 @@ import { PedidosPageModule } from 'src/app/shared/gabinete-digital/pedidos/pedid
 import { DespachosPageModule } from 'src/app/shared/gabinete-digital/despachos/despachos.module';
 import { PendentesPageModule } from 'src/app/shared/gabinete-digital/pendentes/pendentes.module';
 import { DespachosPrPageModule } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module';
+import { DiplomasGerarPageModule } from 'src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module';
 import { DiplomasPageModule } from 'src/app/shared/gabinete-digital/diplomas/diplomas.module';
 import { ExpedientesPrPageModule } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module';
 import { DiplomasAssinarPageModule } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module';
@@ -58,6 +47,7 @@ import { AllProcessesPageModule } from 'src/app/shared/gabinete-digital/all-proc
     DiplomasAssinarPageModule,
     EmptyContainerPageModule,
     BtnModalDismissPageModule,
+    DiplomasGerarPageModule
 
   ],
   declarations: [
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index b8566f650..153db1b2f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -39,9 +39,6 @@
             <ion-item-sliding *ngIf="loadCount">
               <div class="listview" >
                 <ion-list *ngIf="AllProcess">
-
-                  
-
                   <div
                     class="item-wrapper box-hover ion-no-padding cursor-pointer"
                     *ngFor = "let task of AllProcess"
@@ -168,7 +165,6 @@
                 <p class="text-center exp-card-content">{{expedientegbstore.count}} <span class="title1">Documentos</span></p>
               </div>
   
-              <!-- <div  [class.active]="selectedElement == 'Pending'" (click)="openPendentesPage(); selectedElement='Pending'" class="exp-card d-flex flex-column justify-center" > -->
               <div  [class.active]="selectedElementF('Pending')" (click)="openPendentesPage(); selectedElement='Pending'" class="box-hover exp-card d-flex flex-column justify-center"  >
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-pendente.svg"></ion-icon>
@@ -181,7 +177,6 @@
                 <p class="text-center exp-card-content"><span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
               </div>
 
-  
               <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -215,8 +210,8 @@
                 <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
                 <p class="text-center exp-card-content">{{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
               </div>
-  
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
+
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
                 <div class="center-div">
                   <div class="exp-card-icon">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -226,7 +221,7 @@
                   </div>
                   <div class="exp-card-text">
                     <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p>
-                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Despachos criados por mim</p>
+                    <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Despachos criados por mim</p>
                     <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
                   </div>
                 </div>
@@ -244,6 +239,19 @@
                 <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
               </div>
   
+              <div *ngIf="SessionStore.user.Profile == 'Consultant'"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'gerarDiplomas'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'gerarDiplomas'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'gerarDiplomas'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                </div>
+
+                <p class="text-center exp-card-title" >Diplomas por elaborar</p>
+                <p class="text-center exp-card-content">{{  deplomasStore.DiplomaGerarList.length }} <span class="title1">Documentos</span></p>
+
+              </div>
+
               <div (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
@@ -256,15 +264,15 @@
                 <p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
               </div>
   
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasAssinar'" [class.active]="selectedElement == 'DiplomasAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title">Diplomas para Assinar</p>
-                <p class="text-center exp-card-content">{{ deplomasStore.diplomasListCount }} <span class="title1">Documentos</span></p>
+                <p class="text-center exp-card-content">{{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
               </div>
             </div>
 
@@ -371,6 +379,8 @@
         <app-diplomas-assinar class=" height-100 flex-column" [style.display]="showDiplomasAssinar ? 'flex' : 'none'"></app-diplomas-assinar>
         <app-expedientes-pr [profile]="profile" class=" height-100 flex-column" [style.display]="showExpedientesPr ? 'flex' : 'none'" ></app-expedientes-pr>
         <app-signed-diploma  [profile]="profile" class=" height-100 flex-column"  [style.display]="showSignedDiploma ? 'flex' : 'none'" ></app-signed-diploma>
+
+        <app-diplomas-gerars [profile]="profile" class="height-100 flex-column"  [style.display]="showDiplomasGerar ? 'flex' : 'none'"></app-diplomas-gerars>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 52348fa8b..e6118a619 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -513,6 +513,12 @@ ion-content{
        margin-top: 0px !important;
      }
    }
+
+    .exp-card-long{
+      .exp-card-title{
+        text-align: left !important;
+      }
+    }
  }
  
  @media only screen and (min-width: 801px) {
@@ -554,52 +560,52 @@ ion-content{
  }
  
  
- .active {
-   color: white !important;
-   fill: white !important;
-   border: var(--gabinete-active-hove-box-border) !important;
-   background: var(--gabinete-active-hove-background) !important;
-   box-sizing: border-box;
- 
-   .exp-card-content, .icon-selected{
-     color: white !important;
-   }
- 
-   .exp-card-title {
-     color: rgb(255, 255, 255) !important;
-   }
- 
-   svg path::part(native) {
-     color: white !important;
-     fill: white !important;
-   }
- 
-   svg path::part(button):hover {
-     color: white !important;
-     fill: rgb(255, 255, 255) !important;
-   }
- 
-   svg{
-     path{
-          fill: rgb(255, 255, 255) !important
-     }
-   }
- }
- 
- .active ion-icon::part(button) {
-   color: white !important;
-   fill: rgb(255, 255, 255) !important;
- }
- 
- .active ion-icon::part(native) {
-   color: white !important;
-   fill: rgb(255, 255, 255) !important;
- }
- 
- .active ion-icon{
-   color: white !important;
-   fill: red !important;
- }
+.active {
+  color: white !important;
+  fill: white !important;
+  border: var(--gabinete-active-hove-box-border) !important;
+  background: var(--gabinete-active-hove-background) !important;
+  box-sizing: border-box;
+
+  .exp-card-content, .icon-selected{
+    color: white !important;
+  }
+
+  .exp-card-title {
+    color: rgb(255, 255, 255) !important;
+  }
+
+  svg path::part(native) {
+    color: white !important;
+    fill: white !important;
+  }
+
+  svg path::part(button):hover {
+    color: white !important;
+    fill: rgb(255, 255, 255) !important;
+  }
+
+  svg{
+    path{
+        fill: rgb(255, 255, 255) !important
+    }
+  }
+}
+
+.active ion-icon::part(button) {
+  color: white !important;
+  fill: rgb(255, 255, 255) !important;
+}
+
+.active ion-icon::part(native) {
+  color: white !important;
+  fill: rgb(255, 255, 255) !important;
+}
+
+.active ion-icon{
+  color: white !important;
+  fill: red !important;
+}
  
 
 .item-skeleton{
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 3c977a90f..bcc112247 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -19,7 +19,7 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
-//import { NotificationsService } from 'src/app/services/notifications.service';
+
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { PermissionService } from 'src/app/services/permission.service';
@@ -33,6 +33,9 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { DataService } from 'src/app/services/data.service';
 import { Storage } from '@ionic/storage';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { SessionStore } from 'src/app/store/session.service';
+
+
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -40,7 +43,7 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
   styleUrls: ['./gabinete-digital.page.scss'],
 })
 
-export class GabineteDigitalPage implements OnInit, DoCheck {
+export class GabineteDigitalPage implements OnInit {
 
   segment: string;
   segmentVista: string;
@@ -61,9 +64,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   count_exp_pp: string;
   count_exp_pd: string;
   count_dip_apr: string;
-  count_dip_as_pr = 0
   count_dip_pv = 0;
-  count_dip_as = 0;
   count_de_pr = 0;
   count_ev_apr = 0;
   count_ev_md = 0;
@@ -111,9 +112,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   despachoprstore = DespachosprStore;
   totalDocumentStore = TotalDocumentStore
   deplomasStore = DeplomasStore
+
+  showDiplomasGerar = false
   //
   // pipe
 
+  SessionStore = SessionStore
   expedienteTaskPipe = new ExpedienteTaskPipe();
   
   loadCount = false
@@ -144,7 +148,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     private sortService: SortService,
     private dataService: DataService,
     private storage: Storage,
-    public p: PermissionService,
+    public p: PermissionService
   ) {
 
     this.loggeduser = authService.ValidatedUser;
@@ -161,11 +165,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.checkRoutes();
 
   }
-
-  ngDoCheck(): void {
-
-  }
-
   closeAllDesktopComponent() {
     this.desktopComponent = {
       showEventList: false,
@@ -372,6 +371,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
 
+
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -386,6 +387,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
       }
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+        alert('bug!')
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -525,13 +528,14 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.showExpedientesPr = false;
     this.showExpedientDetail = false;
     this.showSignedDiploma = false
+    this.showDiplomasGerar = false
   }
 
 
   get AllProcess() {
     return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list).concat(this.deplomasStore.DiplomaGerarList)
   }
 
   get getAllProcessCount() {
@@ -540,70 +544,15 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
   async LoadCounts() {
 
-    let allPreocesses_;
+    let expedientes;
 
     try {
-      allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
+      expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
       this.loadCount = true;
     } catch(error) {
       this.loadCount = true;
     }
-
-    let allProcessesList = allPreocesses_;
-
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
-
-    if (!this.p.userRole(['PR'])) {
-      allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas')
-    } else if (this.p.userRole(['PR'])) {
-      allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado')
-    }
-
-    this.addProcessToDB(allProcessesList)
-    this.skeletonLoader = true;
-
-    this.allProcessesList = [];
-
-    allProcessesList.forEach(element => {
-      let date = new Date(element.taskStartDate);
-      date.setMonth(date.getMonth() + 1);
-      let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-
-      let task = {
-        "SerialNumber": element.serialNumber,
-        "Folio": element.workflowInstanceDataFields.Subject,
-        "Senders": element.workflowInstanceDataFields.Sender,
-        //"CreateDate": taskDate,
-        "CreateDate": new Date(element.taskStartDate),
-        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-        "Remetente": element.workflowInstanceDataFields.Remetente,
-        "DocumentsQty": element.totalDocuments,
-        "DocId": element.workflowInstanceDataFields.DispatchDocId,
-        "FolderID": element.workflowInstanceDataFields.FolderID,
-        "WorkflowName": element.workflowDisplayName,
-        "activityInstanceName": element.activityInstanceName,
-        "Status": element.workflowInstanceDataFields.Status,
-        "Agenda": element.workflowInstanceDataFields.Agenda,
-        "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
-      }
-
-      this.allProcessesList.push(task);
-    });
-
-    this.allProcessesList = removeDuplicate(this.allProcessesList);
-    this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
-    let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();
+    
     expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
 
     expedientes = expedientes.filter((item) => {
@@ -630,13 +579,39 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countparecer = this.count_par_dailywork;
     
-    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active"));    
+    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+      }
+    }));    
 
     let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
     this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countdeferimento = this.count_def_dailywork;
 
-    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active"));
+    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+      }
+    }));
 
 
     let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
@@ -645,19 +620,22 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
 
     this.pendentesstore.reset(pendentes);
 
-    let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    let despachosPr;
+    let depachoAPI: any  = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
+  
 
     if(this.loggeduser.Profile != 'PR') {
-      despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active");
-      this.count_de_pr = Object.keys(despachosPr).length;
-      this.despachoprstore.count = this.count_de_pr;
-      this.despachoprstore.reset(despachosPr)
+      
+      let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+      depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
+
+      depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+ 
+      this.despachoprstore.reset(depacho)
     } else if(this.loggeduser.Profile == 'PR') {
-      despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
-      this.count_de_pr = Object.keys(despachosPr).length;
-      this.despachoprstore.count = this.count_de_pr;
-      this.despachoprstore.reset(despachosPr)
+      
+      let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
+      depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+      this.despachoprstore.reset(depacho)
     }
 
     let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
@@ -677,18 +655,16 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.eventoaprovacaostore.countPr = eventsPRList.length
     this.eventoaprovacaostore.resetpr(eventsPRList);
 
-    let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
+    let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
     this.count_dip_pv = Object.keys(diplomasValidar).length;
     this.deplomasStore.resetDiplomasReview(diplomasValidar)
-    this.deplomasStore.deplomasReviewCount = this.count_dip_pv
 
-    let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma");
-    this.count_dip_as = Object.keys(diplomasAssinar).length;
 
-    this.deplomasStore.resetDiplomasList(diplomasAssinar)
+    let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
 
-    let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado");
-    this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
+    this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
+
+    let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
     this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
 
     this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {
@@ -746,13 +722,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.closeAllDesktopComponents();
     let navigationExtras: NavigationExtras = { queryParams: { "eventos": true, } };
     if (window.innerWidth < 701) {
-      //this.openEventsToApproveList(profile);
       this.router.navigate(['/home/gabinete-digital/event-list']);
     }
     else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showEventsToApprove = true;
-      //this.eventsToApprove.doRefresh();
     }
   }
 
@@ -885,6 +859,25 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     }
   }
 
+  openDiplomaPorElaborar(segment: string) {
+
+    this.segment = segment;
+
+    if (window.innerWidth < 701) {
+      
+      let navigationExtras: NavigationExtras = { queryParams: { "gerarDiplomas": true }}
+      this.router.navigate(['/home/gabinete-digital/diplomas-gerar'], navigationExtras);
+
+    }
+    else {
+      this.closeAllDesktopComponents();
+      this.segment = segment;
+      let navigationExtras: NavigationExtras = { queryParams: { "gerarDiplomas": true, } };
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      this.showDiplomasGerar = true
+    }
+  }
+
   openDiplomasAssinarPage() {
     this.closeAllDesktopComponents();
     if (window.innerWidth < 701) {
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index aaba92993..0d37165cb 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -53,7 +53,6 @@ export class PedidosPage implements OnInit {
     private platform: Platform,
     public ThemeService: ThemeService
   ) {
-    //Inicializar segment
     this.segment = 'parecer';
 
     this.activatedRoute.queryParams.subscribe(params => {
@@ -64,7 +63,6 @@ export class PedidosPage implements OnInit {
       }
     });
 
-
     const modal = this.modalService.BookMeetingModalPage({ task: '' }, {})
 
   }
@@ -119,7 +117,7 @@ export class PedidosPage implements OnInit {
   }
 
   openExpedientDetailPage(data) {
-    
+
     this.openExpedientDetail.emit(data);
   }
 
@@ -136,7 +134,7 @@ export class PedidosPage implements OnInit {
         let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
         let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
-        
+
 
         this.skeletonLoader = false
 
@@ -177,7 +175,7 @@ export class PedidosPage implements OnInit {
 
           this.skeletonLoader = false
 
-          
+
 
           this.deferimentoList = [];
 
@@ -188,7 +186,7 @@ export class PedidosPage implements OnInit {
             let date = new Date(element.taskStartDate);
             //date.setMonth(date.getMonth() + 1);
             let month = date.getMonth() + 1;
-          let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+            let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
 
             let task = {
               "SerialNumber": element.serialNumber,
@@ -207,10 +205,10 @@ export class PedidosPage implements OnInit {
               this.deferimentoList.push(task);
             }
           });
+          this.addPedidoToDb(this.deferimentoList);
+          this.listToPresentdeferimentoList = this.sortService.sortDate(this.deferimentoList, 'CreateDate')
+          this.pedidosstorage.resetdeferimento(this.listToPresentdeferimentoList);
         });
-        this.addPedidoToDb(this.deferimentoList);
-        this.listToPresentdeferimentoList = this.sortService.sortDate(this.deferimentoList, 'CreateDate')
-        this.pedidosstorage.resetdeferimento(this.listToPresentdeferimentoList);
 
       }
 
@@ -224,8 +222,8 @@ export class PedidosPage implements OnInit {
   addPedidoToDb(pedido) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
     } else {
-    this.sqliteservice.addProcess(pedido);
-  }
+      this.sqliteservice.addProcess(pedido);
+    }
   }
 
   getFromDb() {
@@ -257,7 +255,7 @@ export class PedidosPage implements OnInit {
         }
       })
       this.listToPresentparecerList = this.sortService.sortArrayISODate(parecerlist);
-      
+
     })
 
     this.sqliteservice.getprocessByworkflow("Pedido de Deferimento").then((process: any[]) => {
@@ -284,7 +282,7 @@ export class PedidosPage implements OnInit {
         }
       })
       this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(deferimentolist);
-      
+
     })
   }
 
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index d0f98aa15..ac3dbd8cb 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -257,6 +257,7 @@ export class InactivityPage implements OnInit {
 
   enterWithPasswordButton() {
     this.enterWithPassword = true
+    this.router.navigate(['/']);
   }
 
 }
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index cc38e35c0..74519ab76 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -115,10 +115,6 @@ export class LoginPage implements OnInit {
 
         loader.remove()
 
-        // login to API successfully
-
-        console.log(attempt,'!!::!!');
-
         if (attempt) {
           if (attempt.UserId == SessionStore.user.UserId) {
 
@@ -126,10 +122,9 @@ export class LoginPage implements OnInit {
 
             if(attempt.ChatData) {
               await this.authService.loginChat(attempt.ChatData.data); 
-              //try {
-                await this.authService.loginToChatWs();
-              // } catch(e) {}
               
+              await this.authService.loginToChatWs();
+          
             }
 
             this.getToken();
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 345388407..ef37a5d4d 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -214,37 +214,43 @@ export class PublicationsPage implements OnInit {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       this.publicationsEventFolderList = new Array();
       this.publicationsTravelFolderList = new Array();
-      this.storage.get('actionsEvents').then((events) => {
+      this.storage.get('actionsEvents').then((events = []) => {
         
-        events.forEach(data => {
-          let folder: PublicationFolder = {
-            ProcessId: data.ProcessId,
-            Description: data.Description,
-            Detail: data.Detail,
-            DateBegin: data.DateBegin,
-            DateEnd: data.DateEnd,
-            ActionType: data.ActionType,
-          }
+        if(Array.isArray(events)) {
+          events.forEach(data => {
+            let folder: PublicationFolder = {
+              ProcessId: data.ProcessId,
+              Description: data.Description,
+              Detail: data.Detail,
+              DateBegin: data.DateBegin,
+              DateEnd: data.DateEnd,
+              ActionType: data.ActionType,
+            }
+  
+            this.publicationsEventFolderList.push(folder);
+            this.showLoader = false;
+          });
+        } 
 
-          this.publicationsEventFolderList.push(folder);
-          this.showLoader = false;
-        });
       });
       this.storage.get('actionsViagens').then((viagens = []) => {
         
-        viagens.forEach(data => {
-          let folder: PublicationFolder = {
-            ProcessId: data.ProcessId,
-            Description: data.Description,
-            Detail: data.Detail,
-            DateBegin: data.DateBegin,
-            DateEnd: data.DateEnd,
-            ActionType: data.ActionType,
-          }
-
-          this.publicationsTravelFolderList.push(folder);
-          this.showLoader = false;
-        });
+        if(Array.isArray(viagens)) {
+          viagens.forEach(data => {
+            let folder: PublicationFolder = {
+              ProcessId: data.ProcessId,
+              Description: data.Description,
+              Detail: data.Detail,
+              DateBegin: data.DateBegin,
+              DateEnd: data.DateEnd,
+              ActionType: data.ActionType,
+            }
+  
+            this.publicationsTravelFolderList.push(folder);
+            this.showLoader = false;
+          });
+        }
+        
       });
     } else {
       this.sqliteservice.getAllActions().then((actions: any[]) => {
@@ -310,6 +316,8 @@ export class PublicationsPage implements OnInit {
   async AddPublicationFolder(item?: any) {
 
     this.closeDesktopComponent();
+    this.idSelected = '';
+
     if (window.innerWidth < 701) {
 
       const modal = await this.modalController.create({
@@ -467,7 +475,19 @@ export class PublicationsPage implements OnInit {
       showAddActions: false,
       showEditActions: false,
     }
-    this.idSelected = "";
+
+
+    setTimeout(()=>{
+      if(this.desktopComponent.showViewPublication == false &&
+        this.desktopComponent.showAddNewPublication == false &&
+        this.desktopComponent.showPublicationDetail == false &&
+        this.desktopComponent.showAddActions == false &&
+        this.desktopComponent.showEditActions == false) {
+          this.idSelected = "";
+        }
+    }, 10)
+
+
   }
 
   async openOptions(id?: string) {
@@ -519,10 +539,4 @@ export class PublicationsPage implements OnInit {
     });
   }
 
-  // this.crop.crop('path/to/image.jpg', {quality: 75})
-  // .then(
-  //   newImage => 
-  //   error => console.error('Error cropping image', error)
-  // );
-
 }
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 f07821ef6..14d36e70a 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -141,15 +141,6 @@ export class ViewPublicationsPage implements OnInit {
       
       this.publicationList = new Array();
 
-      /* for(let i = 0; i < res.length; i++) {
-        this.publications.GetPublicationById(res[i]).subscribe(ress => {
-          
-          let item: Publication = this.publicationPipe.itemList(ress)
-          
-          this.publicationList.push(item);
-        })
-      } */
-
       res.forEach(element => {
         
         this.publications.GetPublicationById(element).subscribe(ress => {
@@ -167,17 +158,6 @@ export class ViewPublicationsPage implements OnInit {
       this.getpublication = this.publicationList;
       this.showLoader = false;
 
-      /*  this.publicationList = new Array();
-
-       res.forEach(element => {
-         
-         let item: Publication = this.publicationPipe.itemList(element)
-         this.publicationList.push(item);
-       });
-       this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
-
-       this.publicationListStorage.add(folderId, this.publicationList)
-       this.getpublication = this.publicationList; */
     }, (error) => {
       this.getFromDB()
     });
@@ -234,15 +214,6 @@ export class ViewPublicationsPage implements OnInit {
 
     this.sqliteservice.getActionById(this.folderId).then((publications) => {
       
-      /* let item = {
-        ActionType: publications[0].ActionType,
-        DateBegin: publications[0].DateBegin,
-        DateEnd: publications[0].DateEnd,
-        Description: publications[0].Description,
-        Detail: publications[0].Detail,
-        ProcessId: publications[0].ProcessId
-      }
-      this.publicationDitails = item; */
       this.item = this.isJson(publications[0].publicationsDetails);
 
       let publicationArray = [];
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index cf2b0adf8..34e1c398b 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -11,10 +11,7 @@
     <ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
 
 
-
     <div class="top-box d-flex ion-justify-content-between">
-
-
       <!-- search -->
       <div *ngIf="!showAdvanceSearch" class="icon-z icon-most-searched-word-open cursor-pointer" (click)="showHideAdvanceSearch(true)">
         <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-most-searched-words-open.svg" class="icon" slot="end"></ion-icon>
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index dc6ca5916..33b3e00ab 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -640,7 +640,7 @@ export class SearchPage implements OnInit {
   }
 
 
-  async openOrganicEntitySelection(){
+  async openOrganicEntitySelection() {
 
     let classs;
     if( window.innerWidth <= 1024){
@@ -694,13 +694,16 @@ export class SearchPage implements OnInit {
 
     const ApplicationType = searchDocument.ApplicationType.toString()
     const Id =  searchDocument.Id
+    const CalendarId = searchDocument.ApplicationName.split(':')[1]
+
     if(this.select == false) {
       if(this.type == "Agenda") {
 
         const modal = await this.modalCtrl.create({
           component: ViewEventPage,
-          componentProps:{
+          componentProps: {
             eventId: Id,
+            CalendarId: CalendarId,
             isModal: true,
             header: false
           },
@@ -717,7 +720,6 @@ export class SearchPage implements OnInit {
 
         if(ApplicationType == '8' || ApplicationType == '361') {
 
-          // alert('view!!')
           this.viewDocumentDetail(Id, ApplicationType);
         }
       }
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index f5cb26c86..22a013c6d 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -236,6 +236,8 @@ export class RoomService {
         
         if(!this.messagesLocalReference.includes(ChatMessage.localReference)) {
 
+          this.messagesLocalReference.push(ChatMessage.localReference);
+          
           const message = await this.prepareCreate({message: ChatMessage, save: true})
           message.messageSend = true
 
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 06c30dc08..6d9e0b495 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -486,9 +486,15 @@ export class WsChatMethodsService {
         return name != SessionStore.user.UserName
       })[0]
 
-      const firstName = capitalizeTxt(roomName.split('.')[0])
-      const lastName =  capitalizeTxt(roomName.split('.')[1])
-      return firstName + ' ' + lastName
+      if(roomName) {
+        const firstName = capitalizeTxt(roomName.split('.')[0])
+        const lastName =  capitalizeTxt(roomName.split('.')[1])
+        return firstName + ' ' + lastName
+      } else {
+        return 'Sem nome'
+      }
+
+      
     } else {
       return roomData.fname
     }
diff --git a/src/app/services/clear-store.service.ts b/src/app/services/clear-store.service.ts
index f0f649081..c2343892a 100644
--- a/src/app/services/clear-store.service.ts
+++ b/src/app/services/clear-store.service.ts
@@ -29,7 +29,10 @@ export class ClearStoreService {
     PedidosStore.resetparecer([])
     DespachosprStore.reset([])
     DeplomasStore.resetDiplomasAssinadoList([])
-    DeplomasStore.resetDiplomasList([])
+    DeplomasStore.resetDiplomaGerar([])
+    DeplomasStore.resetDiplomasAssinadoList([])
+    DeplomasStore.resetDiplomasReview([])
+    DeplomasStore.resetDiplomasParaAssinar([])
     DeplomasStore.resetDiplomasReview([])
     CalendarStore.delete()
     CalendarStore.ResetList([])
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 443d71d60..ea7c31298 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -172,8 +172,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
     .then( async (res) => {
       
-
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
@@ -193,8 +192,10 @@ export class ApproveEventPage implements OnInit {
           loader.remove()
         }
       }
-      else{
-        this.toastService._badRequest('É necessário adicionar uma nota');
+      else {
+        if(res.data.option == 'save') {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
       } 
     });
 
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 01dfd4946..91363486f 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -2,14 +2,13 @@
   <!-- Edit event for Inicio -->
   <div class="main-content height-100 d-flex">
   
-
     <div class="content d-flex flex-column width-md-100 height-100">
 
       <div class="main-header pt-30 px-20 background-white pb-15">
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar evento por aprovar </ion-label>
+              <ion-label class="title">Editar evento por aprovar</ion-label>
             </div>
           </div>
         </ion-header>
@@ -151,8 +150,6 @@
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="{{minDate}}"
-                  max="2025"
                 >
                 </ion-datetime>
 
@@ -189,8 +186,6 @@
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="{{minDate}}"
-                  max="2025"
                 >
                 </ion-datetime>
 
@@ -372,6 +367,6 @@
 <ion-footer class="background-whit">
   <div class="buttons">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
   </div>
 </ion-footer>
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 248230c96..5d915374b 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
 
   async getTask() {
 
-    this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
+    this.processes.GetTask(this.serialNumber).subscribe( (result) => {
       this.eventProcess = result
 
       this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
@@ -264,14 +264,12 @@ export class EditEventToApprovePage implements OnInit {
     this.setIntervenientCC.emit([]);
     this.clearContact.emit();
 
-
     this.approveEventDismiss.emit({
-      "serialNumber": this.eventProcess.serialNumber,
-      "action": "Aprovar",
-      "saveData": this.eventProcess
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Aprovar",
+      saveData: this.eventProcess
     });
 
-    
   }
 
 
@@ -375,14 +373,14 @@ export class EditEventToApprovePage implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          // this.toastService.successMessage();
+
         }, error =>{
           this.toastService.badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          // this.toastService.successMessage()
+
         }, error =>{
           this.toastService.badRequest()
         })
@@ -392,6 +390,42 @@ export class EditEventToApprovePage implements OnInit {
 
   }
 
+  async gravasAction() {
+    
+    await this.save();
+
+    if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
+      this.reenviar();
+    }
+
+  }
+
+  async reenviar() {
+    let body = {
+      serialNumber: this.eventProcess.serialNumber,
+      action: "Reenviar",
+        dataFields: {
+        ReviewUserComment: "",
+      }
+    }
+    
+    const loader = this.toastService.loading();
+
+    try {
+      await this.processes.PostTaskAction(body).toPromise();
+      this.toastService._successMessage();
+      this.goToApproveEventList();
+    } catch (error) {
+      this.toastService._badRequest();
+    }  finally {
+      loader.remove()
+    }
+  }
+
+  goToApproveEventList() {
+    this.closeEventToApprove.emit();
+    this.modalController.dismiss();
+  }
 
   dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
     this.taskParticipants = removeDuplicate(taskParticipants) ;
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index f70060fab..ee61b03c9 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -191,7 +191,7 @@
               <mat-option
                 *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
               >
-              {{recurring.Description}}
+                {{recurring.Description}}
               </mat-option>
             </mat-select>
           </mat-form-field>
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 4ac263492..b8ed791a3 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -14,6 +14,7 @@ import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
+import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -50,14 +51,14 @@ export class AllProcessesPage implements OnInit {
 
   ngOnInit() {
 
-    this.loadAllProcesses();
+    // this.loadAllProcesses();
 
       this.router.events.forEach((event) => {
         if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
           if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
             this.refreshing();
           } else {
-            this.loadAllProcesses();
+            // this.loadAllProcesses();
           }
         }
       });
@@ -66,7 +67,7 @@ export class AllProcessesPage implements OnInit {
   doRefresh() {
 
     setTimeout(() => {
-      this.loadAllProcesses();
+
     }, 1000);
   }
 
@@ -77,61 +78,11 @@ export class AllProcessesPage implements OnInit {
     }, 1000);
   }
 
-  async loadAllProcesses() {
-    let allProcessesList = await this.processesService.GetTasksList("", false).toPromise();
-    //
-
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
-    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
-
-    this.skeletonLoader = true;
-
-    this.allProcessesList = [];
-
-    allProcessesList.forEach(element => {
-      let date = new Date(element.taskStartDate);
-      date.setMonth(date.getMonth() + 1);
-
-      let task = {
-        "SerialNumber": element.serialNumber,
-        "Folio": element.workflowInstanceDataFields.Subject,
-        "Senders": element.workflowInstanceDataFields.Sender,
-        "CreateDate": new Date(element.taskStartDate),
-        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-        "Remetente": element.workflowInstanceDataFields.Remetente,
-        "DocumentsQty": element.totalDocuments,
-        "DocId": element.workflowInstanceDataFields.DispatchDocId,
-        "FolderID": element.workflowInstanceDataFields.FolderID,
-        "WorkflowName": element.workflowDisplayName,
-        "activityInstanceName": element.activityInstanceName,
-        "Status": element.workflowInstanceDataFields.Status,
-        "Agenda": element.workflowInstanceDataFields.Agenda,
-        "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
-      }
-
-      this.allProcessesList.push(task);
-      this.allProcessesList = removeDuplicate(this.allProcessesList)
-
-      this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate');
-
-    });
-
-    this.skeletonLoader = false;
-  }
 
   get AllProcess() {
     return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
   }
 
   get getAllProcessCount() {
@@ -146,9 +97,6 @@ export class AllProcessesPage implements OnInit {
 
   setFormatDate(start: any, end: any, allday: boolean) {
     let customDate;
-    /* start = new Date();
-    end= new Date("2021-08-04T18:01:04.753Z"); */
-    //end = new Date("2021-09-04T18:01:04.753Z");
 
     const totalSeconds = Math.floor((end - (start)) / 1000);;
     const totalMinutes = Math.floor(totalSeconds / 60);
@@ -159,8 +107,6 @@ export class AllProcessesPage implements OnInit {
     const minutes = totalMinutes - (totalDays * 24 * 60) - (hours * 60);
     const seconds = totalSeconds - (totalDays * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60);
 
-    let diffDays = totalDays;
-    let diffMinutes = minutes;
 
     if (totalDays == 0) {
       if (allday) {
@@ -192,6 +138,8 @@ export class AllProcessesPage implements OnInit {
   }
 
   goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+
     if (workflowName == 'Despacho') {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -206,6 +154,8 @@ export class AllProcessesPage implements OnInit {
       }
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+        alert('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -220,9 +170,6 @@ export class AllProcessesPage implements OnInit {
     else if (workflowName == "Pedido de Parecer do Presidente") {
       this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
     }
-    /* else if (workflowName == "Expediente") {
-      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
-    } */
     else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 771ea774b..ee212a27b 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -57,10 +57,9 @@ constructor (
 
     let despachosPr;
 
-
     if(this.loggeduser.Profile != 'PR') {
       despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
-    } else if(this.loggeduser.Profile != 'PR') {
+    } else if(this.loggeduser.Profile == 'PR') {
       despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
     }
 
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 421e35e9e..325a11c39 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
     <div class="theicon">
       <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -30,7 +30,7 @@
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasAssinadoList"
+          *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index cc1650dbb..61470764c 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -75,7 +75,7 @@ export class DiplomasAssinarPage implements OnInit {
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
 
 
-    this.deplomasStore.resetDiplomasList(this.diplomasList);
+    this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
   }
 
 }
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..63a34f256
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..79d03bbc0
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule
+  ],
+  declarations: [DiplomasGerarPage],
+  exports: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..c14e50284
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,100 @@
+<ion-header class="ion-no-border">
+  <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+  <div class="title">
+    <div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div>
+    <div class="theicon">
+      <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
+        <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+</ion-header>
+<ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+  </ion-refresher>
+
+
+  <div class="main-container width-100 overflow-y-auto height-100">
+
+    <div  *ngIf="diplomasList.length >= 1">
+
+
+      <ion-list >
+        <div
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          *ngFor = "let task of deplomasStore.DiplomaGerarList"
+          (click)="goToDiploma(task.SerialNumber)"
+        >
+          <div class="item width-100">
+            <div class="exp-top-detail">
+              <div class="subject">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+              <div class="exp-icon">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+              </div>
+            </div>
+            <div class="exp-bottom-detail">
+              <div class="exp-remetente">
+                <ion-label>{{task.Senders}}</ion-label>
+              </div>
+            </div>
+            <div class="exp-middle-detail">
+              <div class="exp-workflow">
+                <span class="label">{{task.activityInstanceName}}</span>
+              </div>
+              <div class="exp-date">
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </ion-list>
+    </div>
+
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+
+</ion-content>
+
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..8d76ee6cd
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,240 @@
+@import '~src/function.scss';
+/* CONTENT */
+/* :host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+    border: 1px solid red;
+} */
+
+.title{
+  padding: 30px 20px 0 20px !important;
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+  .bottom-title{
+    width: calc(100% - 40px);
+    margin-left: 20px !important;
+    margin-right: 20px !important;
+    margin: 0 auto;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 5px solid #42b9fe;
+
+    .bottom-text{
+      font-size: 15px !important;
+      font-family: Roboto !important;
+      color: #0d89d1 !important;
+    }
+  }
+  .main-container{
+    padding: 0px 20px 0 20px !important;
+    margin: 0;
+    color:#000;
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .ion-item-class{
+    padding: 0;
+
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //background-color: var(--white);
+    margin: 0 auto;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+
+/* New CSS */
+.expediente{
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border:1px solid #e9e9e9 !important;
+  background-color: var(--white);
+  margin-bottom: 10px !important;
+  padding: 15px;
+}
+.exp-list-item{
+  //width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+
+.exp-top-detail{
+  width: 100%;
+  float: left;
+  font-family: Roboto;
+  font-size: 12pt;
+  font-weight: 700;
+  color: var(--title-text-color);
+  padding-left: 3px;
+
+  .subject{
+    width: 84%;
+    float: left;
+  }
+
+  .exp-icon{
+    width: fit-content;
+    float: right;
+   /* font-size: 13px; */
+    margin: 0 !important;
+    padding: 0 !important;
+
+    ion-icon{
+      font-size: 12pt;
+      color: #42b9fe;
+      float: left;
+    }
+    label{
+      font-size: 10pt;
+    }
+  }
+}
+.exp-middle-detail, .exp-bottom-detail{
+  margin-bottom: 5px;
+
+}
+.exp-middle-detail{
+  font-size: 12pt;
+  width: 100%;
+  overflow: auto;
+
+  .exp-workflow{
+    float: left;
+    margin: 0 !important;
+
+    .label{
+      border-radius: 15px;
+      background: #ffb703;
+      /* font-size: 12px; */
+      float: right;
+      padding: 2.5px 13.5px 2.5px 13.5px;
+      color: #fff;
+  }
+  }
+  .exp-date{
+    width: auto;
+    font-family: Roboto;
+    font-size: 10pt;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #797979;
+    float: right;
+  }
+}
+.exp-bottom-detail{
+  font-size: 8pt;
+  width: 100%;
+  overflow: auto;
+  padding-left: 3px;
+
+  .exp-remetente{
+    //width: 200px;
+    font-family: Roboto;
+   /*  font-size: 13px; */
+    font-weight: normal;
+    color: #000000;
+    float: left;
+    /* border: 1px solid red; */
+  }
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..eede7d98a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,68 @@
+import { Component, OnInit } from '@angular/core';
+import { NavigationStart, Router } from '@angular/router';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { DeplomasStore } from 'src/app/store/deplomas.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+@Component({
+  selector: 'app-diplomas-gerars',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+
+  diplomasList:DailyWorkTask[] = [];
+  serialNumber:string;
+  skeletonLoader = true
+
+  deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
+
+  constructor(
+    private processes:ProcessesService,
+    private router: Router,
+    private sortService: SortService,
+    public ThemeService: ThemeService
+    ) {}
+
+  ngOnInit() {
+
+    this.LoadList()
+
+  }
+
+  goToDiploma(serialNumber:any){
+    this.router.navigate(['/home/gabinete-digital/diplomas-gerar', serialNumber, 'gabinete-digital']);
+  }
+
+  doRefresh() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1000);
+  }
+
+  async LoadList() {
+
+    this.skeletonLoader = true
+
+    let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    this.diplomasList = new Array();
+
+    this.skeletonLoader = false;
+
+    let gerarDiploma =  diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
+
+    gerarDiploma.forEach(element => {
+      let task: customTask = this.customTaskPipe.transform(element);
+      this.diplomasList.push(task);
+    });
+
+    this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
+
+    this.deplomasStore.resetDiplomaGerar(this.diplomasList);
+  }
+
+}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index c9702e023..1cda84e29 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -23,11 +23,11 @@
 
   <div class="main-container width-100 overflow-y-auto height-100" [ngSwitch]="segment">
 
-    <div *ngIf="deplomasStore.diplomasList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
+    <div *ngIf="deplomasStore.diplomasReviewList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
       <ion-list *ngSwitchCase="'validar'">
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasList"
+          *ngFor = "let task of deplomasStore.diplomasReviewList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -97,13 +97,13 @@
     </div>
 
     <div
-      *ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
+      *ngIf="!skeletonLoader && deplomasStore.diplomasReviewList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasList.length == 0">
+    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
 
       <ion-list>
         <ion-item>
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 7891cd9f2..14f3884bf 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -14,26 +14,26 @@ import { PermissionService } from 'src/app/services/permission.service';
   styleUrls: ['./diplomas.page.scss'],
 })
 export class DiplomasPage implements OnInit {
-//profile:string;
-diplomasList:DailyWorkTask[] = [];
-diplomasAssinadoList:DailyWorkTask[] = [];
-showLoader: boolean;
-serialNumber:string;
-skeletonLoader = false
 
-@Input() segment:string;
+  diplomasList:DailyWorkTask[] = [];
+  diplomasAssinadoList:DailyWorkTask[] = [];
+  showLoader: boolean;
+  serialNumber:string;
+  skeletonLoader = false
+
+  @Input() segment:string;
 
 
-deplomasStore = DeplomasStore
-customTaskPipe = new CustomTaskPipe()
+  deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
 
-constructor(
-  private processes:ProcessesService,
-  private router: Router,
-  private activatedRoute: ActivatedRoute,
-  public ThemeService: ThemeService,
-  private sortService: SortService,
-  public p: PermissionService,
+  constructor(
+    private processes:ProcessesService,
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public ThemeService: ThemeService,
+    private sortService: SortService,
+    public p: PermissionService,
   ) {}
 
   ngOnInit() {
@@ -69,18 +69,20 @@ constructor(
     this.diplomasList = [];
     let diplomasList = [];
 
-    let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
-    diplomasValidar.forEach(element => {
+    // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
+    diplomas.forEach(element => {
 
       let task = this.pipeTask(element)
       diplomasList.push(task);
     });
 
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
-    this.deplomasStore.resetDiplomasList(this.diplomasList)
+    this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
     let diplomasAssinadoList = []
     let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
     diplomasAssinados.forEach(async element => {
 
       let task = this.pipeTask(element)
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 316960fae..056da1da2 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -75,18 +75,6 @@
               </div>
               <div class="ion-input-class">
 
-                <!-- <ion-select  placeholder="Selecione tipo de evento*"
-                class="d-block d-md-none"
-                [(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
-                interface="action-sheet"
-                Cancel-text="Cancelar" required>
-                  <ion-select-option value="Reunião">Reunião</ion-select-option>
-                  <ion-select-option value="Viagem">Viagem</ion-select-option>
-                  <ion-select-option value="Conferência">Conferência</ion-select-option>
-                  <ion-select-option value="Encontro">Encontro</ion-select-option>
-                </ion-select> -->
-
-
                 <mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
                   <!-- <input matInput type="text" > -->
                   <mat-select [(ngModel)]="eventProcess.workflowInstanceDataFields.Category" >
@@ -116,24 +104,12 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class width-100">
-                <!-- <ion-datetime
-                  class="d-block d-md-none"
-                  placeholder="Início"
-                  [(ngModel)]="startDate"
-                  displayFormat="D MMM YYYY H:mm"
-                  minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="{{minDate}}"
-                  max="2022"
-                >
-                </ion-datetime> -->
 
                 <mat-form-field appearance="none"
                 class="width-100 date-hour-picker">
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
                     [(ngModel)]="startDate"
-                    [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -155,24 +131,16 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class width-100">
-                <!-- <ion-datetime
-                  class="d-block d-md-none"
-                  placeholder="Fim"
-                  [(ngModel)]="endDate"
-                  displayFormat="D MMM YYYY H:mm"
-                  minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="{{minDate}}"
-                  max="2025"
-                >
-                </ion-datetime> -->
+<<<<<<< HEAD
+=======
+
+>>>>>>> secrete-group
 
                 <mat-form-field appearance="none"
                 class="width-100 date-hour-picker">
                   <input matInput [ngxMatDatetimePicker]="fim"
                     placeholder="Choose a date"
                     [(ngModel)]="endDate"
-                    [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -195,15 +163,6 @@
                 <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <!-- <ion-select
-                placeholder="Selecione repetição"
-                class="d-block d-md-none"
-                [(ngModel)]="eventProcess.workflowInstanceDataFields.OccurrenceType"
-                (ngModelChange)="onSelectedRecurringChanged($event)"
-                interface="action-sheet"
-                Cancel-text="Cancelar" required>
-                <ion-select-option *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}">{{recurring.Description}}</ion-select-option>
-                </ion-select> -->
 
                 <mat-form-field
                   class="width-100"
@@ -236,18 +195,6 @@
               </div>
               <div class="ion-input-class flex-grow-1">
 
-                <!-- <ion-datetime
-                class="d-block d-md-none"
-                  placeholder="Última ocorrência"
-                  [(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence"
-                  displayFormat="D MMM YYYY H:mm"
-                  minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="2021"
-                  max="2025"
-                >
-                </ion-datetime> -->
-
                 <mat-form-field class="date-hour-picker">
                   <input matInput [ngxMatDatetimePicker]="occurrrence"
                     placeholder="Choose a date"
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts
new file mode 100644
index 000000000..42c90e474
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.module.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.module.ts
new file mode 100644
index 000000000..3a64808ef
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarOptionsPageRoutingModule } from './diplomas-gerar-options-routing.module';
+
+import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarOptionsPageRoutingModule
+  ],
+  declarations: [DiplomasGerarOptionsPage]
+})
+export class DiplomasGerarOptionsPageModule {}
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html
new file mode 100644
index 000000000..ea2a75bb8
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html
@@ -0,0 +1,12 @@
+<div class="wrapper">
+  <div>
+    <div class="buttons">
+      <button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
+      <button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
+    </div>
+
+  </div>
+</div>
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss
new file mode 100644
index 000000000..c308d718d
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss
@@ -0,0 +1,65 @@
+.wrapper{
+    width: 100% !important;
+    padding-top:20px !important;
+    padding-bottom:20px !important;
+  }
+  .arrow-right{
+      display: none;
+      margin-bottom: 20px;
+      .arrow-right-icon{
+          width: 37px;
+          float: right;
+          font-size: 35px;
+          overflow: hidden;
+      }
+  }
+  .buttons{
+    width: 100% !important;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-around;
+      margin: 0 auto !important;
+  }
+  .solid {
+      display: none;
+      width: 90%;
+      border-top: 1px solid #bbb;
+      margin: 0 auto !important;
+    }
+    .btn-ok, .btn-cancel{
+      //width: 50% !important;
+      margin-bottom: 5px !important;
+      margin-top: 5px !important;
+  }
+  @media only screen and (max-width: 800px) {
+    .container{
+      width: 100% !important;
+    }
+      .btn-ok, .btn-cancel, .btn-delete{
+          width: 47% !important;
+      }
+  }
+  @media only screen and (min-width: 1024px) {
+    .container{
+      width: 100% !important;
+  
+    }
+      .arrow-right{
+          display: flex;
+          justify-content: flex-end;
+      }
+      .btn-cancel{
+          display: none;
+          width: 100% !important;
+          margin-bottom: 10px !important;
+      }
+      .btn-delete, .btn-ok{
+          width: 100% !important;
+          margin-bottom: 10px !important;
+          margin-top: 10px !important;
+      }
+     /*  .solid{
+          display: block;
+      } */
+  }
+  
\ No newline at end of file
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts
new file mode 100644
index 000000000..b22d013a1
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarOptionsPage } from './diplomas-gerar-options.page';
+
+describe('DiplomasGerarOptionsPage', () => {
+  let component: DiplomasGerarOptionsPage;
+  let fixture: ComponentFixture<DiplomasGerarOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
new file mode 100644
index 000000000..639e43881
--- /dev/null
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -0,0 +1,175 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { DespachoService } from 'src/app/Rules/despacho.service'
+import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+
+@Component({
+  selector: 'app-diplomas-gerar-options',
+  templateUrl: './diplomas-gerar-options.page.html',
+  styleUrls: ['./diplomas-gerar-options.page.scss'],
+})
+export class DiplomasGerarOptionsPage implements OnInit {
+  
+  task: customTask
+  fulltask: fullTask;
+  serialNumber: string;
+  
+  constructor(
+    private processes: ProcessesService,
+    public popoverController: PopoverController,
+    private modalController: ModalController,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public ThemeService: ThemeService,
+    private despachoService: DespachoService,
+    private navParams: NavParams,
+    private router: Router,
+  ) { }
+
+  ngOnInit() {
+    this.task = this.navParams.get('task')
+    this.fulltask = this.navParams.get('fulltask')
+    this.serialNumber = this.navParams.get('serialNumber')
+  }
+
+
+  async enviarDiploma({note = '', documents = [], serialnumber}) {
+    
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'add-note-modal-no-height'
+    }
+
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then(async (res) => {
+      if (res.data) {
+
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
+        let body = {
+          "serialNumber": serialnumber,
+          "action": "Enviar diploma",
+          "ActionTypeId": 104,
+          "dataFields": {
+            "ReviewUserComment": res.data.note,
+          },
+          "AttachmentList" : docs,
+        }
+        
+        const loader = this.toastService.loading()
+    
+        try {
+          await this.processes.CompleteTask(body).toPromise();
+          this.modalController.dismiss('sucess');
+          this.toastService._successMessage();
+          this.goBack()
+        } catch (error) {
+          this.toastService._badRequest();
+        } finally {
+          loader.remove()
+        }
+
+
+      }
+    });
+
+  }
+
+  async sendExpedienteToPending() {
+
+    this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
+      this.goBack();
+      this.toastService.successMessage()
+    },
+      error => {
+        this.toastService.badRequest("Processo não enviado para despacho")
+      });
+
+  }
+
+
+  async openBookMeetingModal() {
+    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: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openDelegarModal() {
+    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: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res => {
+      if(res) {
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
+  }
+
+
+  goBack() {
+    
+    this.popoverController.dismiss();
+    this.router.navigate(['/home/gabinete-digital/diplomas-gerar']);
+  }
+
+}
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 f950b0878..817ec8e34 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -208,15 +208,15 @@ export class ViewPublicationsPage implements OnInit {
       });
       await modal.present();
       modal.onDidDismiss().then(() => {
-        //Do nothing
+        // Do nothing
       });
     }
-    else{
+    else {
       this.editPublication.emit(folderId);
     }
   }
 
-  async deletePublication(folderId?:any){
+  async deletePublication(folderId?:any) {
     const loader = this.toastService.loading();
     try {
       await this.publications.DeletePresidentialAction(folderId).toPromise();
diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index d00f1f0f1..8347cf81d 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -8,36 +8,45 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 export class DeplomasService {
 
   private _diplomasAssinadoList  = []
-  private _diplomasList  = []
   private _diplomasReviewList = []
+  private _diplomasGerarList = []
+  private _diplomasParaAssinar = []
 
   private keyNameDiplomasAssinado: string;
-  private keyNameDiplomasList: string;
+  private keyNameDiplomasParaAssinar: string;
+  private keyNameDiplomasGerar: string;
+  private keyNameDiplomasReview: string;
 
   private _diplomasAssinadoListCount  = 0
-  private _diplomasListCount  = 0
   private _diplomasReviewCount = 0
+  private _diplomasGerarListCount = 0;
+  private _diplomasListCount = 0;
 
-  constructor() { 
+  constructor() {
     this.keyNameDiplomasAssinado = (SHA1(this.constructor.name+"diplomasAssinado")).toString()
-    this.keyNameDiplomasList = (SHA1(this.constructor.name+"diplomasList")).toString()
+    this.keyNameDiplomasReview = (SHA1(this.constructor.name+"diplomasReview")).toString()
+    this.keyNameDiplomasGerar = (SHA1(this.constructor.name+"diplomasGerar")).toString()
+    this.keyNameDiplomasParaAssinar = (SHA1(this.constructor.name+"diplomasParaAsinar")).toString()
 
+    setTimeout(() => {
 
-    setTimeout(()=>{
       let restoreDiplomasAssinado = localstoreService.get(this.keyNameDiplomasAssinado, {})
-      let restoreDiplomasList = localstoreService.get(this.keyNameDiplomasList, {})
-      let restoreDiplomasReviewList = localstoreService.get(this.keyNameDiplomasList, {})
+      let restoreDiplomasParaAssinar = localstoreService.get(this.keyNameDiplomasParaAssinar, {})
+      let restoreDiplomasReviewList = localstoreService.get(this.keyNameDiplomasReview, {})
+      let restoreDiplomasGerarList = localstoreService.get(this.keyNameDiplomasGerar, {})
 
       this._diplomasAssinadoList = restoreDiplomasAssinado.list || []
       this._diplomasAssinadoListCount = parseInt(restoreDiplomasAssinado.count)  || 0
 
-      this._diplomasList = restoreDiplomasList.list || []
-      this._diplomasListCount = parseInt(restoreDiplomasList.count) || 0
-
+      this._diplomasParaAssinar = restoreDiplomasParaAssinar.list || []
+      this._diplomasListCount = parseInt(restoreDiplomasParaAssinar.count) || 0
 
       this._diplomasReviewList = restoreDiplomasReviewList.list  || []
       this._diplomasReviewCount = parseInt(restoreDiplomasReviewList.count)  || 0
 
+      this._diplomasGerarList = restoreDiplomasGerarList.list  || []
+      this._diplomasGerarListCount = parseInt(restoreDiplomasGerarList.count)  || 0
+
     }, 10)
     
   }
@@ -60,23 +69,37 @@ export class DeplomasService {
     this.saveDiplomasAssinadoList()
   }
 
-  get diplomasListCount() {
+  get diplomasParaAssinartCount() {
     return this._diplomasListCount || 0
   }
 
-  set diplomasListCount(value) {
-    this._diplomasListCount = value
-    this.saveDiplomasList()
+  set diplomasParaAssinarCount(value) {
+    this._diplomasParaAssinar = value
+    this.saveDiplomasParaAssinar()
   }
 
-  get diplomasList() {
-    return this._diplomasList
+  // get list
+  get diplomasParaAssinarList() {
+    return this._diplomasParaAssinar
   }
 
+  // get list
   get diplomasAssinadoList() {
     return this._diplomasAssinadoList
   }
 
+  // get list
+  get diplomasReviewList() {
+    return this._diplomasReviewList
+  }
+
+  // get list 
+
+
+  get DiplomaGerarList() {
+    return this._diplomasGerarList
+  }
+
   resetDiplomasAssinadoList(value: any[]) {
     
     this._diplomasAssinadoListCount = value.length
@@ -84,11 +107,11 @@ export class DeplomasService {
     this.saveDiplomasAssinadoList()
   }
 
-  resetDiplomasList(value: any[]) {
+  resetDiplomasParaAssinar(value: any[]) {
     
     this._diplomasListCount = value.length
-    this._diplomasList = value
-    this.saveDiplomasList()
+    this._diplomasParaAssinar = value
+    this.saveDiplomasParaAssinar()
   }
 
   resetDiplomasReview(value: any[]) {
@@ -97,10 +120,18 @@ export class DeplomasService {
     this.saveDiplomasReviewList()
   }
 
+  resetDiplomaGerar(value: any[]) {
+
+    this._diplomasGerarListCount = value.length
+    this._diplomasGerarList = value
+
+    this.savetDiplomaGerar()
+  }
+
 
   private saveDiplomasReviewList () {
     setTimeout(()=>{ 
-      localstoreService.set(this.keyNameDiplomasList,{
+      localstoreService.set(this.keyNameDiplomasReview,{
         list: this._diplomasReviewList,
         count: this._diplomasReviewCount,
       })
@@ -117,15 +148,24 @@ export class DeplomasService {
     }, 10)    
   }
 
-  private saveDiplomasList () {
+  private saveDiplomasParaAssinar () {
     setTimeout(()=>{ 
-      localstoreService.set(this.keyNameDiplomasList,{
-        list: this._diplomasList,
+      localstoreService.set(this.keyNameDiplomasParaAssinar,{
+        list: this._diplomasParaAssinar,
         count: this._diplomasListCount,
       })
     }, 10)
   }
 
+  private savetDiplomaGerar() {
+    setTimeout(()=>{ 
+      localstoreService.set(this.keyNameDiplomasGerar,{
+        list: this._diplomasGerarList,
+        count: this._diplomasGerarListCount,
+      })
+    }, 10)
+  }
+
 }
 
 export let DeplomasStore = new DeplomasService() 
diff --git a/src/global.scss b/src/global.scss
index 13612d07a..56e89de31 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -685,6 +685,12 @@ app-despacho-pr ion-content .main-content{
     margin: 0px auto !important;
 }
 
+app-diplomas-gerar ion-content .main-content{
+    max-width: 1366px !important;
+    margin: 0px auto !important;
+}
+
+
 app-pedido ion-content .main-content{
     max-width: 1366px !important;
     margin: 0px auto !important;