From a5f458de2e6fcf998e112366398de24d6b50332c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 28 Feb 2024 09:04:11 +0100
Subject: [PATCH] dix bugs

---
 doc/diplima-generation.md                     |   0
 src/app/app-routing.module.ts                 |  25 +
 src/app/app.module.ts                         |   4 +-
 src/app/home/home-routing.module.ts           |   2 +-
 .../create-process/create-process.page.ts     |   1 -
 .../despacho-pr/despacho-pr.page.html         |   9 +-
 .../despacho-pr/despacho-pr.page.scss         |  73 +--
 .../despacho-pr/despacho-pr.page.ts           |  80 ++-
 .../despachos/despacho/despacho.page.html     |   4 +-
 .../despachos/despacho/despacho.page.scss     |  74 +--
 .../despachos/despacho/despacho.page.ts       |  75 ++-
 .../diploma-assinar/diploma-assinar.page.html |   7 +-
 .../diploma-assinar/diploma-assinar.page.scss |  73 +--
 .../diploma-assinar/diploma-assinar.page.ts   |  65 ++-
 .../diplomas-gerar/diplomas-gerar.page.ts     |  73 ++-
 .../diplomas/diploma/diploma.module.ts        |   2 +-
 .../diplomas/diploma/diploma.page.html        |   4 +-
 .../diplomas/diploma/diploma.page.scss        |  73 +--
 .../diplomas/diploma/diploma.page.ts          |  74 ++-
 .../expediente-detail.page.html               |   6 +-
 .../expediente-detail.page.scss               |  73 +--
 .../expediente-detail.page.ts                 |  54 +-
 .../pedidos/pedido/pedido.page.html           |   4 +-
 .../pedidos/pedido/pedido.page.scss           |  45 +-
 .../pedidos/pedido/pedido.page.ts             |  83 ++-
 .../viewer-attachment.page.html               |  83 +--
 .../new-publication/new-publication.page.ts   |   5 +-
 .../pages/publications/publications.page.html |   1 +
 .../pages/publications/publications.page.ts   |   1 +
 src/app/services/publications.service.ts      |  10 -
 .../services/socket-connection-mcr.service.ts |  66 ++-
 .../task-details/task-details.page.html       |   6 +-
 .../task-details/task-details.page.scss       |   6 +-
 .../pendentes/pendentes.page.ts               |  18 +-
 .../deploma-options-routing.module.ts         |  17 +
 .../deploma-options/deploma-options.module.ts |  30 +
 .../deploma-options/deploma-options.page.html |  36 ++
 .../deploma-options/deploma-options.page.scss |  56 ++
 .../deploma-options.page.spec.ts              |  24 +
 .../deploma-options/deploma-options.page.ts   | 428 ++++++++++++++
 .../despachos-options-routing.module.ts       |  17 +
 .../despachos-options.module.ts               |  20 +
 .../despachos-options.page.html               |  69 +++
 .../despachos-options.page.scss               |  40 ++
 .../despachos-options.page.spec.ts            |  24 +
 .../despachos-options.page.ts                 | 402 +++++++++++++
 .../despachos-pr-options-routing.module.ts    |  17 +
 .../despachos-pr-options.module.ts            |  20 +
 .../despachos-pr-options.page.html            |  41 ++
 .../despachos-pr-options.page.scss            |  49 ++
 .../despachos-pr-options.page.spec.ts         |  24 +
 .../despachos-pr-options.page.ts              | 430 ++++++++++++++
 .../diplomas-gerar-options-routing.module.ts  |  17 +
 .../diplomas-gerar-options.module.ts          |  20 +
 .../diplomas-gerar-options.page.html          |  12 +
 .../diplomas-gerar-options.page.scss          |  67 +++
 .../diplomas-gerar-options.page.spec.ts       |  24 +
 .../diplomas-gerar-options.page.ts            | 208 +++++++
 .../dk-deplomas-options-routing.module.ts     |  17 +
 .../dk-deplomas-options.module.ts             |  20 +
 .../dk-deplomas-options.page.html             |  68 +++
 .../dk-deplomas-options.page.scss             |  38 ++
 .../dk-deplomas-options.page.spec.ts          |  24 +
 .../dk-deplomas-options.page.ts               | 402 +++++++++++++
 .../dk-despachos-options-routing.module.ts    |  17 +
 .../dk-despachos-options.module.ts            |  20 +
 .../dk-despachos-options.page.html            |  69 +++
 .../dk-despachos-options.page.scss            |  40 ++
 .../dk-despachos-options.page.spec.ts         |  24 +
 .../dk-despachos-options.page.ts              | 403 +++++++++++++
 .../dk-despachos-pr-options-routing.module.ts |  17 +
 .../dk-despachos-pr-options.module.ts         |  20 +
 .../dk-despachos-pr-options.page.html         |  41 ++
 .../dk-despachos-pr-options.page.scss         |  49 ++
 .../dk-despachos-pr-options.page.spec.ts      |  24 +
 .../dk-despachos-pr-options.page.ts           | 430 ++++++++++++++
 ...k-diplomas-gerar-options-routing.module.ts |  17 +
 .../dk-diplomas-gerar-options.module.ts       |  20 +
 .../dk-diplomas-gerar-options.page.html       |  12 +
 .../dk-diplomas-gerar-options.page.scss       |  67 +++
 .../dk-diplomas-gerar-options.page.spec.ts    |  24 +
 .../dk-diplomas-gerar-options.page.ts         | 209 +++++++
 .../dk-opts-expediente-routing.module.ts      |  17 +
 .../dk-opts-expediente.module.ts              |  20 +
 .../dk-opts-expediente.page.html              |  24 +
 .../dk-opts-expediente.page.scss              |  66 +++
 .../dk-opts-expediente.page.spec.ts           |  24 +
 .../dk-opts-expediente.page.ts                | 464 +++++++++++++++
 .../dk-request-options-routing.module.ts      |  17 +
 .../dk-request-options.module.ts              |  20 +
 .../dk-request-options.page.html              |  55 ++
 .../dk-request-options.page.scss              |  65 +++
 .../dk-request-options.page.spec.ts           |  24 +
 .../dk-request-options.page.ts                | 400 +++++++++++++
 .../opts-expediente-routing.module.ts         |  17 +
 .../opts-expediente/opts-expediente.module.ts |  20 +
 .../opts-expediente/opts-expediente.page.html |  24 +
 .../opts-expediente/opts-expediente.page.scss |  66 +++
 .../opts-expediente.page.spec.ts              |  24 +
 .../opts-expediente/opts-expediente.page.ts   | 462 +++++++++++++++
 .../request-options-routing.module.ts         |  17 +
 .../request-options/request-options.module.ts |  20 +
 .../request-options/request-options.page.html |  55 ++
 .../request-options/request-options.page.scss |  66 +++
 .../request-options.page.spec.ts              |  24 +
 .../request-options/request-options.page.ts   | 398 +++++++++++++
 .../new-publication/new-publication.page.html |  14 +-
 .../new-publication/new-publication.page.ts   | 552 +++++-------------
 .../upload/upload-streaming.service.ts        |  88 ++-
 src/global.scss                               |  39 +-
 src/style/ios.scss                            |  45 +-
 111 files changed, 7528 insertions(+), 942 deletions(-)
 create mode 100644 doc/diplima-generation.md
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options.page.html
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options.page.html
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.ts
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.html
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.ts
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options-routing.module.ts
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options.module.ts
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options.page.html
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options.page.scss
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options.page.spec.ts
 create mode 100644 src/app/shared/popover/desktop/request-options/request-options.page.ts

diff --git a/doc/diplima-generation.md b/doc/diplima-generation.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 32480604c..a266090e9 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -301,7 +301,32 @@ const routes = [
    {
     path: 'not-found',
     loadChildren: () => import('./pages/not-found/not-found.module').then( m => m.NotFoundPageModule)
+  },
+  {
+    path: 'dk-deplomas-options',
+    loadChildren: () => import('./shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.module').then( m => m.DkDeplomasOptionsPageModule)
+  },
+  {
+    path: 'dk-despachos-options',
+    loadChildren: () => import('./shared/popover/desktop/dk-despachos-options/dk-despachos-options.module').then( m => m.DkDespachosOptionsPageModule)
+  },
+  {
+    path: 'dk-despachos-pr-options',
+    loadChildren: () => import('./shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.module').then( m => m.DkDespachosPrOptionsPageModule)
+  },
+  {
+    path: 'dk-diplomas-gerar-options',
+    loadChildren: () => import('./shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.module').then( m => m.DkDiplomasGerarOptionsPageModule)
+  },
+  {
+    path: 'dk-opts-expediente',
+    loadChildren: () => import('./shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.module').then( m => m.DKOptsExpedientePageModule)
+  },
+  {
+    path: 'dk-request-options',
+    loadChildren: () => import('./shared/popover/desktop/dk-request-options/dk-request-options.module').then( m => m.DKRequestOptionsPageModule)
   }
+
  /*
     path: 'chat',
     component: ChatPage
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b9b3b251e..caa421c4d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -80,8 +80,8 @@ import { AngularFireModule } from '@angular/fire';
 import { AngularFireMessagingModule } from '@angular/fire/messaging';
 import { firebaseConfig } from '../firebase-config';
 import { EditorModule } from '@tinymce/tinymce-angular';
-import { DeplomaOptionsPageModule } from './shared/popover/deploma-options/deploma-options.module';
-import { DiplomaOptionsPage } from './shared/popover/deploma-options/deploma-options.page';
+import { DeplomaOptionsPageModule } from './shared/popover/desktop/deploma-options/deploma-options.module';
+import { DiplomaOptionsPage } from './shared/popover/desktop/deploma-options/deploma-options.page';
 import { CreateProcessPageModule } from './modals/create-process/create-process.module';
 import { CreateProcessPage } from './modals/create-process/create-process.page';
 import { LoggingInterceptorService } from './services/logging-interceptor.service';
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 53b16aa2f..aa2c261c1 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -314,7 +314,7 @@ const routes: Routes = [
           },
           {
             path: 'request-options',
-            loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule)
+            loadChildren: () => import('../shared/popover/desktop/request-options/request-options.module').then( m => m.RequestOptionsPageModule)
           },
         ],
 
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 2e86d337f..4a8e06453 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -326,7 +326,6 @@ export class CreateProcessPage implements OnInit {
     } else {
 
       if (this.loggeduser.Profile != 'PR') {
-        // console.log('Despacho MD');
         switch (this.taskType) {
           case '0': // Despacho
             this.postData = {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index cc2721da8..a70ccdef9 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -16,22 +16,21 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
 
 
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
-        <!-- <div class="solid"></div> -->
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área Jurídica</div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
-        <!-- <div class="solid"></div> -->
+
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <!-- <div class="solid"></div> -->
+
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
@@ -42,7 +41,7 @@
       </div>
 
 
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
index 1ae8e2bcd..3a718de47 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 ion-button{
@@ -52,42 +53,42 @@ ion-button{
   }
 }
 
-@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 !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @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 !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @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%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }
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 1caab174b..c39490a14 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
@@ -11,7 +11,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
+import { DkDespachosPrOptionsPage } from 'src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@@ -24,6 +24,7 @@ import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
 import { DocumentViewerOptionService } from "src/app/services/document-viewer-option.service";
 import { DeviceService } from "src/app/services/device.service"
+import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
 
 @Component({
   selector: 'app-despacho-pr',
@@ -594,32 +595,63 @@ export class DespachoPrPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: DespachosPrOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
 
-    await popover.present();
+    if (window.innerWidth > 500) { 
+      const popover = await this.popoverController.create({
+        component: DkDespachosPrOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        }
+      });
+  
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+  
+        if (res['data'] == 'close') {
+          this.goBack()
+  
+        }
+  
+        this.TaskService.loadDiplomas()
+  
+      }), (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DespachosPrOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+  
+        if (res['data'] == 'close') {
+          this.goBack()
+  
+        }
+  
+        this.TaskService.loadDiplomas()
+  
+      }), (error) => {
+        console.log(error)
+      })
+    }
 
-    popover.onDidDismiss().then((res => {
 
-      if (res['data'] == 'close') {
-        this.goBack()
-
-      }
-
-      this.TaskService.loadDiplomas()
-
-    }), (error) => {
-      console.log(error)
-    })
 
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index 80c458e0e..e6d575846 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -16,7 +16,7 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
 
 
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
@@ -55,7 +55,7 @@
         </div>
 
 
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>
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 1ae8e2bcd..8f8bfeaf4 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 ion-button{
@@ -52,42 +53,43 @@ ion-button{
   }
 }
 
-@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 !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+// @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 !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
-}
+// @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/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index aa0e79655..2cb5e7fe7 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
+import { DkDespachosOptionsPage } from 'src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { DespachoService } from 'src/app/Rules/despacho.service'
 import { fullTask } from 'src/app/models/dailyworktask.model';
@@ -27,6 +27,7 @@ import { DocumentViewerOptionService } from "src/app/services/document-viewer-op
 
 import { fromEvent, merge, interval, Subscription } from 'rxjs';
 import { takeUntil, filter, switchMap, take } from 'rxjs/operators';
+import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 
 @Component({
   selector: 'app-despacho',
@@ -606,31 +607,57 @@ export class DespachoPage implements OnInit {
 
   async openOptions(taskAction?: any) {
 
-    const popover = await this.popoverController.create({
-      component: DespachosOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
+    if (window.innerWidth > 500) { 
+      const model = await this.popoverController.create({
+        component: DkDespachosOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        }
+      });
+  
+      await model.present();
+  
+      model.onDidDismiss().then((res) => {
+        // console.log('res', res.data)
+        if (res.data == 'back') {
+          this.goBack();
+        }
+  
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DespachosOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+  
+      popover.onDidDismiss().then((res) => {
+        // console.log('res', res.data)
+        if (res.data == 'back') {
+          this.goBack();
+        }
+  
+      }, (error) => {
+        console.log(error)
+      })
+  
+      await popover.present();
+    }
 
 
-    popover.onDidDismiss().then((res) => {
-      // console.log('res', res.data)
-      if (res.data == 'back') {
-        this.goBack();
-      }
-
-    }, (error) => {
-      console.log(error)
-    })
-
-    await popover.present();
-
   }
 
 
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index c633527c8..3505439da 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -15,20 +15,17 @@
 
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
         <div class="solid"></div>
       </div>
       <div class="buttons">
         <button class="btn-cancel" shape="round" (click)="openAddNoteModal('Arquivo')">Arquivar</button>
-       <!--  <div class="solid"></div> -->
       </div>
       <div class="buttons">
-        <!-- <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button> -->
-        <!-- <div class="solid"></div> -->
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index df5a39020..a6a28bb1c 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -39,6 +39,7 @@ ion-content, .header-2{
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -230,42 +231,42 @@ ion-button{
   }
 }
 
-@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 !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @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 !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @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%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }
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 92a04682f..ed3e8d9f2 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
@@ -4,7 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { momentG } from 'src/plugin/momentG';
 
 import { ActivatedRoute } from '@angular/router';
-import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { DkDiplomasGerarOptionsPage } from 'src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page';
 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'
@@ -19,6 +19,7 @@ import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
 import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
 import { PermissionService } from 'src/app/services/permission.service';
+import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 
 @Component({
   selector: 'app-diploma-assinar',
@@ -84,26 +85,50 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: DiplomaOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        serialNumber: this.task.SerialNumber,
-        task: this.task,
-        showEnviarPendentes: false,
-        fulltask: this.fulltask,
-        DraftNames: this.DraftNames,
-        DraftIds: this.DraftIds,
-        asDraft: this.asDraft
+    
+    if (window.innerWidth > 500) { 
+      const modalController = await this.popoverController.create({
+        component: DkDiplomasGerarOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false,
+          fulltask: this.fulltask,
+          DraftNames: this.DraftNames,
+          DraftIds: this.DraftIds,
+          asDraft: this.asDraft
+  
+        }
+      });
+      return await modalController.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: DiplomaOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false,
+          fulltask: this.fulltask,
+          DraftNames: this.DraftNames,
+          DraftIds: this.DraftIds,
+          asDraft: this.asDraft
+  
+        },
+        translucent: true
+      });
+      return await popover.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    }
 
-      },
-      translucent: true
-    });
-    return await popover.present().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    })
   }
 
   async LoadTaskDetail(serial: string) {
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
index 09db0b358..5200c4f9f 100644
--- 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
@@ -12,9 +12,10 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 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';
+import { DkDiplomasGerarOptionsPage } from 'src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
 import { TaskService } from 'src/app/services/task.service'
+import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page';
 
 
 @Component({
@@ -70,21 +71,43 @@ export class DiplomasGerarPage implements OnInit {
   }
 
   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().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    })
+
+    
+    if (window.innerWidth > 500) { 
+      const modal = await this.popoverController.create({
+        component: DkDiplomasGerarOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.task.SerialNumber,
+          task: this.task,
+          showEnviarPendentes: false
+        }
+      });
+      return await modal.present().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      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().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      })
+    }
+    
+
+
   }
 
   async LoadTaskDetail(serial: string) {
@@ -122,7 +145,7 @@ export class DiplomasGerarPage implements OnInit {
         this.cc = users.filter(user=>{
           return user.Type == 'CC';
         });
-        
+
 
       });
       this.getDocumentDetails(this.task.FolderId, '361');
@@ -143,7 +166,7 @@ export class DiplomasGerarPage implements OnInit {
   }
 
 
-  
+
   async openDelegarModal() {
     let classs;
     if (window.innerWidth <= 800) {
@@ -222,7 +245,7 @@ export class DiplomasGerarPage implements OnInit {
 
 
   async enviarDiploma({note = '', documents = [], serialnumber}) {
-    
+
     let classs;
     if (window.innerWidth <= 800) {
       classs = 'modal modal-desktop'
@@ -267,9 +290,9 @@ export class DiplomasGerarPage implements OnInit {
           },
           "AttachmentList" : docs,
         }
-        
+
         const loader = this.toastService.loading()
-    
+
         try {
           await this.processes.CompleteTask(body).toPromise();
           this.modalController.dismiss('sucess');
@@ -290,7 +313,7 @@ export class DiplomasGerarPage implements OnInit {
     await modal.present();
 
   }
-  
+
   async viewDocument(DocId:string, Document) {
 
     const modal = await this.modalController.create({
@@ -317,8 +340,8 @@ export class DiplomasGerarPage implements OnInit {
   getDocumentDetails(forlderId:string, applicationId:string) {
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
-      
-      
+
+
     })
   }
 
@@ -349,7 +372,7 @@ export class DiplomasGerarPage implements OnInit {
     }
 
   }
-  
+
 
   toDateString(e) {
     return new Date(e).toDateString()
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
index f2afb676a..3c26a3120 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
@@ -8,7 +8,7 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module';
 
 import { DiplomaPage } from './diploma.page';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
-import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { DiplomaOptionsPage } from 'src/app/shared/popover/desktop/deploma-options/deploma-options.page';
 import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module';
 
 @NgModule({
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index 60b684cfa..dc5cf6f6f 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -16,7 +16,7 @@
       [fulltask]="fulltask"
     ></app-task-details>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
@@ -30,7 +30,7 @@
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
         <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="!task">
       <ion-list>
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
index c69e20a36..0bffada72 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
@@ -7,6 +7,7 @@
 .content{
   margin: 0;
   float: left;
+  width: 100%;
 }
 
 
@@ -53,42 +54,42 @@ ion-button{
   }
 }
 
-@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 !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @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 !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @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%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 92da3fe48..87ec0ec07 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -7,7 +7,7 @@ import { momentG } from 'src/plugin/momentG';
 
 import { ActivatedRoute } from '@angular/router';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
-import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { DkDeplomasOptionsPage } from 'src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
@@ -21,6 +21,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { TaskService } from 'src/app/services/task.service'
 import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
+import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
+import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 
 
 @Component({
@@ -95,28 +97,56 @@ export class DiplomaPage implements OnInit {
 
   async openOptions() {
 
-    const popover = await this.popoverController.create({
-      component: DiplomaOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        serialNumber: this.serialNumber,
-        task: this.task,
-        fulltask: this.fulltask,
-        showEnviarPendentes: false
-      },
-      translucent: true
-    });
+    
+    if (window.innerWidth > 500) { 
+    
+      const model = await this.popoverController.create({
+        component: DkDeplomasOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          serialNumber: this.serialNumber,
+          task: this.task,
+          fulltask: this.fulltask,
+          showEnviarPendentes: false
+        }
+      });
+  
+      model.onDidDismiss().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      }).catch((e) => {
+        console.log(e)
+      })
+  
+  
+      await model.present();
+    } else {
+      const popover = await this.popoverController.create({
+        component: DiplomaOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          serialNumber: this.serialNumber,
+          task: this.task,
+          fulltask: this.fulltask,
+          showEnviarPendentes: false
+        },
+        translucent: true
+      });
+  
+      popover.onDidDismiss().then(() => {
+        this.TaskService.loadDiplomas()
+      }, (error) => {
+        console.log(error)
+      }).catch((e) => {
+        console.log(e)
+      })
+  
+  
+      let a = await popover.present();
+    }
+    
 
-    popover.onDidDismiss().then(() => {
-      this.TaskService.loadDiplomas()
-    }, (error) => {
-      console.log(error)
-    }).catch((e) => {
-      console.log(e)
-    })
-
-
-    let a = await popover.present();
   }
 
   async LoadTaskDetail(serial: string) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 818dbf609..56808951e 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -1,7 +1,7 @@
 <ion-content class="container-wrapper" >
   <div *ngIf="task" class="main-content  d-flex height-100 overflow-hidden">
     <div class="width-100 d-flex flex-column content" *ngIf="task">
-        <app-task-details 
+        <app-task-details
           *ngIf="task"
           [task]=task
           [intervenientes]=intervenientes
@@ -15,7 +15,7 @@
         ></app-task-details>
     </div>
 
-    <div class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
@@ -32,7 +32,7 @@
         <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div class="solid"></div>
       </div>
-    </div>
+    </div> -->
 
   </div>
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index e9927f52f..d2f2922d8 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -8,6 +8,7 @@
   padding: 0px 0px 0 0px !important;
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -277,45 +278,45 @@ ion-button{
 
 
 
-@media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
-}
-@media only screen and (min-width: 801px) {
-  .menu-ptions{
-    display: none !important;
-  }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+// @media only screen and (max-width: 800px) {
+//   .content{
+//     width: 100% !important;
+//   }
+//   .aside-right{
+//     display: none;
+//   }
+// }
+// @media only screen and (min-width: 801px) {
+//   .menu-ptions{
+//     display: none !important;
+//   }
+//   .content{
+//     width: 65%;
+//     border-right: 1px solid #d8d8d8;
+//   }
 
-  .aside-right{
-    width: 35%;
-  }
-}
+//   .aside-right{
+//     width: 35%;
+//   }
+// }
 
-@media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
-}
+// @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%;
-  }
-}
+// @media only screen and (min-width: 1140px){
+//   .content{
+//     width: 75%;
+//   }
+//   .aside-right{
+//     width: 25%;
+//   }
+// }
 
 .option-desc {
   display: flex;
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index ba840baf1..f349632ff 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG } from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { DKOptsExpedientePage } from 'src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchList } from 'src/app/models/search-document';
@@ -31,6 +31,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service';
+import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 
 
 @Component({
@@ -591,21 +592,42 @@ export class ExpedienteDetailPage implements OnInit {
 
   async openOptions(taskAction?: any) {
 
-    const popover = await this.popoverController.create({
-      component: OptsExpedientePage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-      },
-      translucent: true
-    });
-    return await popover.present().then(() => {
-      this.TaskService.loadExpedientes()
-    }, (error) => {
-      console.log(error)
-    })
+    
+    if (window.innerWidth > 500) { 
+    
+      const model = await this.popoverController.create({
+        component: DKOptsExpedientePage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+        }
+      });
+      return await model.present().then(() => {
+        this.TaskService.loadExpedientes()
+      }, (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: OptsExpedientePage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+        },
+        translucent: true
+      });
+      return await popover.present().then(() => {
+        this.TaskService.loadExpedientes()
+      }, (error) => {
+        console.log(error)
+      })
+  
+    }
+
   }
 
   openNewGroupPage() {
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index e6a7b932f..758ba497e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -55,7 +55,7 @@
       </ion-item>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+    <!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
         <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
@@ -105,6 +105,6 @@
           <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index bf0712704..631f4dbb5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -8,6 +8,7 @@
   padding: 0px 0px 0 0px !important;
   margin: 0;
   float: left;
+  width: 100%;
 }
 .color-red{
   font-weight: 500;
@@ -162,21 +163,21 @@ ion-button{
 }
 
 @media only screen and (max-width: 800px) {
-  .content{
-    width: 100% !important;
-  }
-  .aside-right{
-    display: none;
-  }
+  // .content{
+  //   width: 100% !important;
+  // }
+  // .aside-right{
+  //   display: none;
+  // }
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
     display: none !important;
   }
-  .content{
-    width: 65%;
-    border-right: 1px solid #d8d8d8;
-  }
+  // .content{
+  //   width: 65%;
+  //   border-right: 1px solid #d8d8d8;
+  // }
 
   .aside-right{
     width: 35%;
@@ -184,19 +185,19 @@ ion-button{
 }
 
 @media only screen and (min-width: 1024px){
-  .content{
-    width: 70%;
-  }
-  .aside-right{
-    width: 30%;
-  }
+  // .content{
+  //   width: 70%;
+  // }
+  // .aside-right{
+  //   width: 30%;
+  // }
 }
 
 @media only screen and (min-width: 1140px){
-  .content{
-    width: 75%;
-  }
-  .aside-right{
-    width: 25%;
-  }
+  // .content{
+  //   width: 75%;
+  // }
+  // .aside-right{
+  //   width: 25%;
+  // }
 }
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index dea93c087..dd7c03c80 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -10,7 +10,7 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
+import { DKRequestOptionsPage } from 'src/app/shared/popover/desktop/dk-request-options/dk-request-options.page';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { ToastService } from 'src/app/services/toast.service';
 import { ForwardPage } from 'src/app/modals/forward/forward.page';
@@ -27,6 +27,7 @@ import { RouteService } from 'src/app/services/route.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service'
+import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
 
 @Component({
   selector: 'app-pedido',
@@ -248,32 +249,64 @@ export class PedidoPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
-    const popover = await this.popoverController.create({
-      component: RequestOptionsPage,
-      cssClass: 'exp-options',
-      componentProps: {
-        task: this.task,
-        serialNumber: this.task.SerialNumber,
-        fulltask: this.fulltask,
-        taskAction: taskAction,
-        showEnviarPendentes: false,
-        actions: this.taskArrayActions
-      },
-      translucent: true
-    });
-    await popover.present();
 
-    popover.onDidDismiss().then((res => {
-      this.TaskService.loadPedidos();
-      if (res['data'] == 'close') {
-        this.goBack()
-      }
-      this.TaskService.loadPedidos();
+    
+    if (window.innerWidth > 500) { 
+      const model = await this.popoverController.create({
+        component: DKRequestOptionsPage,
+        cssClass: 'exp-options-desktop',
+        componentProps: {
+          task: this.task,
+          serialNumber: this.task.SerialNumber,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false,
+          actions: this.taskArrayActions
+        }
+      });
+      await model.present();
+  
+      model.onDidDismiss().then((res => {
+        this.TaskService.loadPedidos();
+        if (res['data'] == 'close') {
+          this.goBack()
+        }
+        this.TaskService.loadPedidos();
+  
+  
+      }), (error) => {
+        console.log(error)
+      })
+    } else {
+      const popover = await this.popoverController.create({
+        component: RequestOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          serialNumber: this.task.SerialNumber,
+          fulltask: this.fulltask,
+          taskAction: taskAction,
+          showEnviarPendentes: false,
+          actions: this.taskArrayActions
+        },
+        translucent: true
+      });
+      await popover.present();
+  
+      popover.onDidDismiss().then((res => {
+        this.TaskService.loadPedidos();
+        if (res['data'] == 'close') {
+          this.goBack()
+        }
+        this.TaskService.loadPedidos();
+  
+  
+      }), (error) => {
+        console.log(error)
+      })
+    }
+    
 
-
-    }), (error) => {
-      console.log(error)
-    })
   }
 
   async repreciar(note: string, documents: any) {
diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
index 9081f1b12..96b2972cb 100644
--- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
+++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
@@ -1,52 +1,55 @@
 <div class="height-100 d-flex flex-column overflow-hidden width-100">
 
-  <div class="overflow-x-auto d-flex pa-10 attachment-list" style="background-color: #d9d9d9;"  *ngIf="showAttachmentList">
+  <div class="d-flex overflow-x-auto pa-10 width-100">
+    <div style="background-color: #d9d9d9;"  *ngIf="showAttachmentList">
 
-    <div *ngFor="let attachment of taskViewerAttachment; let i = index"
-      class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
-      >
-      <div class="attachment"  (touchstart)="startHold($event, attachment, i)" (touchend)="endHold()" (click)="clickDocument(attachment, i )">
+      <div *ngFor="let attachment of taskViewerAttachment; let i = index"
+        class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
+        >
+        <div class="attachment"  (touchstart)="startHold($event, attachment, i)" (touchend)="endHold()" (click)="clickDocument(attachment, i )">
+
+          <div class="attach-title-item tex-left">
+            {{ attachment.Assunto || "Sem assunto" }}
+            <br>
+            {{ attachment.Sender }}
+            <br>
+            <span class="document-type" *ngIf="isSelectedAttachmentIsDraft(attachment)">Rascunho</span>
+            <br *ngIf="isSelectedAttachmentIsDraft(attachment)">
+            {{ attachment.DocDate | date: 'dd/MM/yy' }}
+          </div>
+
+
+          <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu" style="
+              width: 0px;
+              height: 0px;
+              /* top: -40px; */
+              position: absolute;
+          "></button>
+          <mat-menu #menu="matMenu">
+            <button (click)="openExpedientActionsModal('0', attachment)" mat-menu-item>
+              <span>Efetuar Despacho</span>
+            </button>
+            <button (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
+              <span>Solicitar Parecer</span>
+            </button>
+            <button  *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
+              <span>Pedido de Deferimento</span>
+            </button>
+            <button (click)="openBookMeetingModal(attachment)" mat-menu-item>
+              <span>Marcar Reunião</span>
+            </button>
+            <button *ngIf="p.userRole('PR')" mat-menu-item>
+              <span>Assinar</span>
+            </button>
+          </mat-menu>
 
-        <div class="attach-title-item tex-left">
-          {{ attachment.Assunto || "Sem assunto" }}
-          <br>
-          {{ attachment.Sender }}
-          <br>
-          <span class="document-type" *ngIf="isSelectedAttachmentIsDraft(attachment)">Rascunho</span>
-          <br *ngIf="isSelectedAttachmentIsDraft(attachment)">
-          {{ attachment.DocDate | date: 'dd/MM/yy' }}
         </div>
-
-
-        <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu" style="
-            width: 0px;
-            height: 0px;
-            /* top: -40px; */
-            position: absolute;
-        "></button>
-        <mat-menu #menu="matMenu">
-          <button (click)="openExpedientActionsModal('0', attachment)" mat-menu-item>
-            <span>Efetuar Despacho</span>
-          </button>
-          <button (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
-            <span>Solicitar Parecer</span>
-          </button>
-          <button  *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('1', attachment)" mat-menu-item >
-            <span>Pedido de Deferimento</span>
-          </button>
-          <button (click)="openBookMeetingModal(attachment)" mat-menu-item>
-            <span>Marcar Reunião</span>
-          </button>
-          <button *ngIf="p.userRole('PR')" mat-menu-item>
-            <span>Assinar</span>
-          </button>
-        </mat-menu>
-
       </div>
-    </div>
 
+    </div>
   </div>
 
+
   <div [ngClass]="{'d-none': draft}" #iframeContainer class="height-100 flex-1" ></div>
 
 
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 2718dc842..0e7686d61 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -24,10 +24,7 @@ import { RouteService } from 'src/app/services/route.service';
 import { FileService } from 'src/app/services/functions/file.service';
 import { FilePicker } from '@capawesome/capacitor-file-picker';
 import { CapacitorVideoPlayer } from 'capacitor-video-player';
-import { CaptureError, CaptureImageOptions, MediaCapture, MediaFile } from '@awesome-cordova-plugins/media-capture/ngx';
-import { Capacitor } from '@capacitor/core';
-import { File } from '@ionic-native/file/ngx';
-import { Media } from '@ionic-native/media/ngx';
+import { CaptureImageOptions, MediaCapture } from '@awesome-cordova-plugins/media-capture/ngx';
 import { checkFileTypeService } from 'src/app/services/checkFileType.service';
 import { FileValidatorService } from "src/app/services/file/file-validator.service"
 import { PublicationAttachmentEntity } from 'src/app/shared/publication/upload/upload-streaming.service';
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index e2464cccf..c6b1b08e9 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -202,6 +202,7 @@
         [publicationType]="publicationType"
         [folderId]="folderId"
         [documentId]="documentId"
+        [publication]="publication"
 
         (closeDesktopComponent)="closeDesktopComponent($event)"
         (goBacktoPublicationDetails)="goBacktoPublicationDetails()"
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 39f73b349..1d4638de6 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -470,6 +470,7 @@ export class PublicationsPage implements OnInit {
       this.idSelected = this.folderId;
     }
 
+    console.log({publication})
     this.publication = publication;
     this.documentId = publication?.DocumentId
     this.desktopComponent.showAddNewPublication = true;
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 674409284..786524fbc 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -229,16 +229,6 @@ GetIdsPublicationNext(id:any){
      /*  params: params */
     };
 
-/*     this.http.post<any>(`${geturl}`, body, options).subscribe(
-      (resposta) => {
-        console.log('Resposta da solicitação POST:', resposta);
-      },
-      (erro) => {
-        console.error('Erro na solicitação POST:', erro);
-      });
- */
-
-
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
diff --git a/src/app/services/socket-connection-mcr.service.ts b/src/app/services/socket-connection-mcr.service.ts
index 4dbd9ac16..0490b2406 100644
--- a/src/app/services/socket-connection-mcr.service.ts
+++ b/src/app/services/socket-connection-mcr.service.ts
@@ -81,45 +81,66 @@ class ReconnectingWebSocketSignalR {
 
   connect() {
     console.log("try to connect=================================")
-    this.stop = false
+    this.stop = false;
+
+    // Limpar a conexão anterior, se existir
+
+    if (this.connection && this.connection.state !== signalR.HubConnectionState.Disconnected) {
+      this.connection.stop();
+    }
 
     this.connection = new signalR.HubConnectionBuilder()
-    .withUrl("https://gdcmapi-dev.dyndns.info/FileHub", {
-      transport: signalR.HttpTransportType.LongPolling,
-      accessTokenFactory: () => SessionStore.user.Authorization
-    }).configureLogging(signalR.LogLevel.Information)
-    .build();
-
+      .withUrl('https://gdcmapi-dev.dyndns.info/FileHub', {
+        transport: signalR.HttpTransportType.LongPolling,
+        accessTokenFactory: () => SessionStore.user.Authorization
+      })
+      .configureLogging(signalR.LogLevel.Information)
+      .build();
 
     this.connection.start()
-    .then(() => {
-      this.isOpen = true;
-      console.log('WebSocket connection established');
+      .then(() => {
+        this.isOpen = true;
+        console.log('WebSocket connection established');
+        this.onConnect.forEach(callback => callback());
+        this.whenConnected.forEach(callback => callback());
 
+      }).catch((error) => {
 
-      this.onConnect.forEach(callback => callback());
-      this.whenConnected.forEach(callback => callback())
-    })
-    .catch((error) => {
-      console.error("Error starting SignalR connection:", error);
-    });
+        console.error("Error starting SignalR connection:", error);
+        // Adicione tratamento de erros detalhado conforme necessário
+        // Exemplo: Verificar se o erro é devido à perda de conexão com a internet
 
+        if (error.message.includes("Failed to fetch")) {
+          console.error("Erro de conexão com a internet");
+        }
+        // Tentar reconectar após um atraso
+        if (!this.stop) {
+          setTimeout(() => {
+            this.connect();
+          }, 1000); // Ajuste o atraso conforme necessário
+        }
+      });
 
     this.connection.on("ReceiveMessage", (message) => {
-      const data: any = JSON.parse(message)
-      console.log("ReceiveMessage", data)
+
+      const data = JSON.parse(message);
+
+      console.log("ReceiveMessage", data);
+
       this.callbacks.forEach(callback => callback(data));
-    })
+
+    });
 
     this.connection.onclose((error) => {
       console.log('WebSocket connection closed..');
       this.isOpen = false;
       this.onDisconnect.forEach(callback => callback());
-      // Attempt to reconnect after a delay
-      if(this.stop == false) {
+      // Tentar reconectar após um atraso
+      if (!this.stop && (!error || error.message !== "Connection stopped by client.")) {
         setTimeout(() => {
           this.connect();
-        }, 1000); // Adjust the delay as needed
+        }, 1000); // Ajuste o atraso conforme necessário
+
       }
 
     });
@@ -179,7 +200,6 @@ class ReconnectingWebSocketSignalR {
 }
 
 interface socketResponse {
-
   index: string
   Guid: string
   IsCompleted: Boolean
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
index e745bceb6..d2077ebff 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
@@ -25,7 +25,7 @@
 
     <div class="overflow-y-auto height-100 width-60 visionDesktop-block"  style="overflow: hidden; margin-right:20px;">
       <app-viewer-attachment *ngIf="mergedArray.length >= 1" [showAttachmentList]=false [selectedIndex]="selectedIndex" [taskViewerAttachment]="mergedArray" class="height-100" ></app-viewer-attachment>
-    </div>
+      </div>
 
     <div  class=" flex-1 d-flex flex-column height-100 d-flex overflow-y-auto-desktop"  >
       <div class="upper-content" >
@@ -51,7 +51,7 @@
         flex-direction: column;
         height: 100%;
         flex-grow: 1;
-      ">
+      " class="overflow-y-auto-desktop">
         <div class="middle-content" *ngIf="dropButton">
           <h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
@@ -86,7 +86,7 @@
               <ion-label class="d-block" >
                 <div class="d-flex" >
 
-                  <div class="flex-1">
+                  <div class="flex-1 overflow-hidden">
                     <p class="attach-title-item overflow-hidden">{{ Document.Assunto || "Sem assunto" }} <span class="document-type" *ngIf="Document.content">Rascunho</span></p>
                     <p class="overflow-hidden"><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
                   </div>
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
index a030067a5..3538bd4f8 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
@@ -183,9 +183,6 @@ ion-button{
   }
 }
 @media only screen and (min-width: 801px) {
-  .div-icon{
-    display: none;
-  }
   .content{
     width: 65%;
     border-right: 1px solid #d8d8d8;
@@ -261,7 +258,8 @@ ion-button{
   }
 
   .mobile-header {
-    flex-grow: 1;
+    display: flex;
+    justify-content: space-around;
   }
 
   .content-details {
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index ad347b67c..be4244646 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -46,7 +46,7 @@ export class PendentesPage implements OnInit {
     private router: Router,
     private sortService: SortService,
     private storage: Storage,
-    public TaskService: TaskService,    
+    public TaskService: TaskService,
     public ThemeService: ThemeService) {
       this.loggeduser = SessionStore.user;
   }
@@ -82,7 +82,7 @@ export class PendentesPage implements OnInit {
 
   }
 
-  
+
   ngOnDestroy() {
     this.listSubscription.delete()
     this.routerSubscription?.unsubscribe();
@@ -99,7 +99,7 @@ export class PendentesPage implements OnInit {
   async dynamicSearch() {
 
     if(this.showSearch && this.searchSubject) {
-      
+
       const list = this.pendentesstore.list.filter((task) => {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();
@@ -146,11 +146,11 @@ export class PendentesPage implements OnInit {
       this.listToPresent = pendentesList
       this.pendentesstore.reset(pendentesList);
       this.storage.set('pendente-list',pendentesList).then(() => {
-        
+
       })
 
       this.dynamicSearch()
-    
+
     }, (error) => {
       this.skeletonLoader = false;
       if(error.status == 0){
@@ -165,7 +165,7 @@ export class PendentesPage implements OnInit {
         this.listToPresent =pendentes
       })
   }
-  
+
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
@@ -183,13 +183,13 @@ export class PendentesPage implements OnInit {
 
   async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
 
-    // 
+    //
 
     if(WorkflowName == 'Despacho') {
       this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
     }
     else if (WorkflowName == 'Despacho do Presidente da República') {
-      this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']);
+      this.router.navigate(['/home/gabinete-digital/despachos-pr', SerialNumber, 'gabinete-digital']);
     }
     else if(WorkflowName == 'Pedido de Parecer' || WorkflowName == 'Pedido de Deferimento' || WorkflowName == 'Pedido de Parecer do Presidente') {
       this.router.navigate(['/home/gabinete-digital/pedidos',SerialNumber,'gabinete-digital']);
@@ -207,7 +207,7 @@ export class PendentesPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
     }
     else  {
-      
+
     }
 
   }
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts
new file mode 100644
index 000000000..3b1c53b2a
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomaOptionsPage } from './deploma-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomaOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DeplomaOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts
new file mode 100644
index 000000000..e6866f35a
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DeplomaOptionsPageRoutingModule } from './deploma-options-routing.module';
+
+import { DiplomaOptionsPage } from './deploma-options.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { CreateProcessPageModule } from 'src/app/modals/create-process/create-process.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DeplomaOptionsPageRoutingModule,
+    CreateProcessPageModule
+  ],
+  declarations: [
+    DiplomaOptionsPage,
+  ],
+  exports: [DiplomaOptionsPage],
+  entryComponents: [
+    DiplomaOptionsPage,
+    CreateProcessPage
+  ]
+})
+export class DeplomaOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html
new file mode 100644
index 000000000..87e350eda
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html
@@ -0,0 +1,36 @@
+<ion-content class="options-container">
+
+  <!-- <div class="buttons">
+    <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura</button>
+    <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
+    <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+  </div> -->
+
+  <div class="buttons">
+    <div *ngIf="task" class="aside-right flex-column height-100 width-100">
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
+        <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
+        <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+
+
+        <div class="solid"></div>
+      </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
+        <button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
+      </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+        <button *ngIf="p.userRole('PR')" (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinar</button>
+      </div>
+      <div class="buttons width-100">
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
+      </div>
+      <div class="buttons width-100" *ngIf="task.activityInstanceName != 'Assinar Diploma'">
+        <button (click)="openExpedientActionsModal('0',task)" class="btn-cancel" shape="round" >Efetuar despacho</button>
+      </div>
+    </div>
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss
new file mode 100644
index 000000000..60dbe2483
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss
@@ -0,0 +1,56 @@
+@import '~src/function.scss';
+
+.options-container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+}
+.arrow-right {
+    margin-bottom: 20px;
+    .arrow-right-icon {
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+    margin: 5px 5px 5px 5px !important;
+  }
+
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 100% !important;
+        min-width: 300px;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        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;
+    } */
+}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts
new file mode 100644
index 000000000..46b0d3958
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DeplomaOptionsPage } from './deploma-options.page';
+
+describe('DeplomaOptionsPage', () => {
+  let component: DeplomaOptionsPage;
+  let fixture: ComponentFixture<DeplomaOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DeplomaOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DeplomaOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts
new file mode 100644
index 000000000..e9ca3988c
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts
@@ -0,0 +1,428 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+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 { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { AttachmentList } from 'src/app/models/Excludetask';
+import { DespachoService } from 'src/app/Rules/despacho.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
+import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
+
+@Component({
+  selector: 'app-deploma-options',
+  templateUrl: './deploma-options.page.html',
+  styleUrls: ['./deploma-options.page.scss'],
+})
+export class DiplomaOptionsPage implements OnInit {
+
+
+  serialNumber: string;
+  profile: string;
+  task: any
+  fulltask: any
+  DraftIds = ""
+  DraftNames = ""
+  asDraft: boolean;
+
+
+  constructor(
+    public popoverController: PopoverController,
+    private modalController: ModalController,
+    private processes: ProcessesService,
+    private navParams: NavParams,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public p: PermissionService,
+    private despachoService: DespachoService,
+    private httpErroHandle: HttpErrorHandle,
+    public TaskService: TaskService) {
+    this.serialNumber = this.navParams.get('serialNumber');
+    this.task = this.navParams.get('task');
+    this.fulltask = this.navParams.get('fulltask');
+
+    this.DraftIds = this.navParams.get("DraftIds");
+    this.DraftNames = this.navParams.get("DraftNames");
+    this.asDraft = this.navParams.get('asDraft');
+
+
+    console.log('this.task', this.task)
+
+  }
+
+  ngOnInit() {
+    console.log(this.task.activityInstanceName)
+
+  }
+
+  async openAddNoteModal(actionName: string) {
+    // this.popoverController.dismiss();
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        actionName: actionName
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    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,
+        }
+
+        if (actionName == 'Solicitar assinatura') {
+          await this.askSignature(res.data.note, docs);
+          this.goBack();
+        } else if (actionName == 'Solicitar alteração') {
+          await this.askToChange(res.data.note, docs);
+          this.goBack();
+        } else if (actionName == 'Assinar Diploma') {
+          await this.sign(res.data.note, docs);
+          this.goBack();
+        } else if (actionName == 'Concluir diploma') {
+          await this.finish(res.data.note, docs);
+          this.goBack();
+        } else if (actionName == 'Arquivo') {
+          await this.arquivar(res.data.note, docs);
+          this.goBack();
+        } else if (actionName == 'AssinarNew') {
+          await this.AssinarNew(res.data.note, docs)
+        }
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async askToChange(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Retificar",
+      "ActionTypeId": 99999841,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.close();
+      this.toastService._successMessage()
+    } catch (error) {
+      if (error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    } finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then(
+      () => { },
+      (error) => {
+        console.log(error)
+      }
+    )
+  }
+
+
+  async askSignature(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Aprovar",
+      "ActionTypeId": 99999840,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.close();
+      this.toastService._successMessage()
+    } catch (error) {
+      if (error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    } finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async sign(note?: string, documents?: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Assinado",
+      "ActionTypeId": 99999842,
+      "FolderId": this.task.FolderID,
+      "dataFields": {
+        "ReviewUserComment": note,
+        "InstanceIDNew": this.task.InstanceID,
+        "DraftIds": "",
+      },
+      "AttachmentList": {
+        "ProcessInstanceID": this.task.InstanceID,
+        /* "DraftIds": null, */
+        "Attachments": []
+      },
+    }
+
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Assinado')
+    } catch (error) {
+      if (error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+        this.toastService._badRequest()
+      }
+    } finally { }
+  }
+
+  async AssinarNew(note?, doc?) {
+
+    if (this.asDraft) {
+
+      this.modalController.dismiss()
+      const modal = await this.modalController.create({
+        component: PopupQuestionPage,
+        componentProps: {
+          title: 'Deseja assinar este Diploma?',
+          /* message: 'Nota: Ao Efetuar esta operação, o tratamento deste diploma não poderá ser realizado a partir da caixa de correspondência' */
+
+        },
+        cssClass: "popup-question discart-expedient-modal",
+        backdropDismiss: true
+      });
+
+      modal.onDidDismiss().then(async (res) => {
+        const data = res.data
+        if (data == "Yes") {
+
+          console.log(' diploma options Draft draft',this.DraftIds)
+          let body = {
+            "InstanceId": this.task.InstanceID,
+            "FolderId": this.task.FolderID,
+            "DraftIds": this.task.DraftIds,
+            "OriginalFileName": this.DraftNames
+          }
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.presidentialActionsSignature(body).toPromise()
+            await this.sign()
+            this.TaskService.loadDiplomas()
+            this.goBack();
+          } catch (error) {
+            this.httpErroHandle.httpStatusHandle(error)
+          }
+          finally {
+            loader.remove()
+          }
+        }
+
+      }, (error) => {
+        console.log(error)
+      });
+
+      await modal.present();
+    } else {
+      this.httpErroHandle.validationMessagge("diplomaAsDraft");
+    }
+
+  }
+
+
+  async finish(note: string, documents: any) {
+
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Concluir",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise();
+      this.toastService._successMessage('Processo concluído')
+    } catch (error) {
+      if (error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note: string, documents: AttachmentList) {
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Arquivar')
+      this.close();
+    } catch (error) {
+      this.httpErroHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+    modal.onDidDismiss().then(async (res) => {
+
+
+      if (res['data'] == 'openDiscart') {
+        await this.distartExpedientModal();
+      }
+
+      this.goBack();
+    }, (error) => {
+      console.log(error)
+    }).catch(e => {
+      console.log(e)
+    })
+
+    await modal.present();
+  }
+
+  async distartExpedientModal() {
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+      componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(res => {
+      if (res['data'] == 'close') {
+        this.close();
+        /*
+        this.close();
+        this.openMenu(); */
+      }
+
+    }, (error) => {
+      console.log(error)
+    }).catch(e => {
+      console.log(e)
+    })
+
+    await modal.present();
+
+  }
+
+  goBack() {
+    this.RouteService.goBack()
+    this.TaskService.loadDiplomas()
+  }
+
+
+  close() {
+    this.popoverController.dismiss();
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts
new file mode 100644
index 000000000..247b1696e
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosOptionsPage } from './despachos-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachosOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachosOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts
new file mode 100644
index 000000000..1819906f6
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-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 { DespachosOptionsPageRoutingModule } from './despachos-options-routing.module';
+
+import { DespachosOptionsPage } from './despachos-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DespachosOptionsPageRoutingModule
+  ],
+  declarations: [DespachosOptionsPage]
+})
+export class DespachosOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html
new file mode 100644
index 000000000..43eb6c605
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html
@@ -0,0 +1,69 @@
+<ion-content class="options-container">
+  <div class="arrow-right" (click)="goBack('no')">
+    <button class="btn-no-color">
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+
+  <div class="width-100 pr-options"  *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName == 'Despacho do Presidente da República' ">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1 width-50 pr-10">
+        <button class="btn-cancel desk" shape="round" > Responder ao {{ environment.PR}} </button>
+        <button (click)="openAddNoteModal('Executado')" class="btn-cancel width-100" shape="round" >Executado</button>
+        <button class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
+        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>
+        <button class="btn-cancel desk" shape="round"> Outras opções </button>
+        <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
+      </div>
+      <div class="flex-grow-1 width-50 pl-10">
+        <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
+        <button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para Pendentes</button>
+      </div>
+    </div>
+    <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      </div>
+    </div>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
+    <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss
new file mode 100644
index 000000000..0fc2784b5
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.scss
@@ -0,0 +1,40 @@
+@import '~src/function.scss';
+
+.options-container {
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+
+}
+.arrow-right {
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon {
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+    margin: 5px 5px 5px 5px !important;
+  }
+
+.pr-options {
+    .btn-ok, .btn-cancel{
+        width: 100% !important;
+    }
+}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts
new file mode 100644
index 000000000..80e0e3a7f
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosOptionsPage } from './despachos-options.page';
+
+describe('DespachosOptionsPage', () => {
+  let component: DespachosOptionsPage;
+  let fixture: ComponentFixture<DespachosOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachosOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachosOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts
new file mode 100644
index 000000000..5d918d424
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.ts
@@ -0,0 +1,402 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service'
+
+@Component({
+  selector: 'app-despachos-options',
+  templateUrl: './despachos-options.page.html',
+  styleUrls: ['./despachos-options.page.scss'],
+})
+export class DespachosOptionsPage implements OnInit {
+
+  task: customTask
+  fulltask: fullTask;
+  serialNumber: string;
+  environment = environment
+
+  constructor(
+    private processes: ProcessesService,
+    private modalController: ModalController,
+    public popoverController: PopoverController,
+    private navParams: NavParams,
+    private toastService: ToastService,
+    public p: PermissionService,
+    public ThemeService: ThemeService,
+    private RouteService: RouteService,
+    private httpErrorHandle: HttpErrorHandle,
+    public TaskService: TaskService
+    ) {
+
+      this.task = this.navParams.get('task')
+      this.fulltask = this.navParams.get('fulltask')
+
+
+      this.serialNumber = this.task.SerialNumber
+    }
+
+  ngOnInit() {
+  }
+
+
+  async openTaskProcessModal(taskAction: any, task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then( res => {
+      // this.goBack();
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
+      loader.remove()
+
+      this.goBack('back');
+    },(error)=>{
+      loader.remove()
+      this.httpErrorHandle.httpStatusHandle(error)
+    });
+  }
+
+  async distartExpedientModal() {
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.goBack('back');
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async openBookMeetingModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(() => {
+      this.goBack('no');
+    }, (error) => {
+      console.log(error)
+    })
+
+    await modal.present();
+  }
+
+  async openDelegarModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack('back');
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async generateDiploma(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }     finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      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,
+        }
+
+        if(actionName == 'Executado') {
+          await this.executado(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+         await this.arquivar(res.data.note, docs);
+        }
+        else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+        }
+        else if(actionName == 'Concluido') {
+          this.concluir(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução') {
+          await this.reexecutar(res.data.note, docs);
+        }
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+  }
+
+
+
+  async concluir(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
+      this.TaskService.loadDiplomas()
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage('Processo arquivado')
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não arquivado')
+      }
+    }     finally {
+      loader.remove()
+    }
+
+
+  }
+
+
+  async executado(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.goBack('back');
+      this.toastService._successMessage()
+    } catch(error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+
+
+  async reexecutar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+  goBack(params) {
+    this.popoverController.dismiss(params)
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts
new file mode 100644
index 000000000..ad795c4a1
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosPrOptionsPage } from './despachos-pr-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachosPrOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachosPrOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.module.ts
new file mode 100644
index 000000000..9d9d93f52
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-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 { DespachosPrOptionsPageRoutingModule } from './despachos-pr-options-routing.module';
+
+import { DespachosPrOptionsPage } from './despachos-pr-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DespachosPrOptionsPageRoutingModule
+  ],
+  declarations: [DespachosPrOptionsPage]
+})
+export class DespachosPrOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html
new file mode 100644
index 000000000..56bd1cd09
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.html
@@ -0,0 +1,41 @@
+<ion-content class="options-container">
+  <div class="arrow-right" (click)="close()">
+    <button class="btn-no-color">
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+  <div class="width-100">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1 width-50 pr-10">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Responder ao {{ environment.PR}} </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Outras opções </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      </div>
+      <div class="flex-grow-1 width-50 pl-10">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
+        <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+    <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+
+    <!-- <div class="solid"></div>
+    <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button> -->
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss
new file mode 100644
index 000000000..1922fb246
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.scss
@@ -0,0 +1,49 @@
+@import '~src/function.scss';
+
+:host {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+.options-container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+   width: 100%;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+.btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
+}
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts
new file mode 100644
index 000000000..4d505a9c7
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPrOptionsPage } from './despachos-pr-options.page';
+
+describe('DespachosPrOptionsPage', () => {
+  let component: DespachosPrOptionsPage;
+  let fixture: ComponentFixture<DespachosPrOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachosPrOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachosPrOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts
new file mode 100644
index 000000000..c1f36ad52
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-pr-options/despachos-pr-options.page.ts
@@ -0,0 +1,430 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController } from '@ionic/angular';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { environment } from 'src/environments/environment';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
+
+
+@Component({
+  selector: 'app-despachos-pr-options',
+  templateUrl: './despachos-pr-options.page.html',
+  styleUrls: ['./despachos-pr-options.page.scss'],
+})
+export class DespachosPrOptionsPage implements OnInit {
+
+
+  task: any;
+  fulltask: any;
+  serialNumber: string;
+  profile: string
+  environment = environment
+
+  constructor(private activateRoute: ActivatedRoute,
+    private processes: ProcessesService,
+    private router: Router,
+    private modalController: ModalController,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public p: PermissionService,
+    public ThemeService: ThemeService,
+    public TaskService: TaskService,
+    private httpErroHandle: HttpErrorHandle,
+  ) { }
+
+  ngOnInit() {
+
+    this.profile = "mdgpr";
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialNumber = params["serialNumber"];
+
+      }
+    });
+
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if(this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
+
+  }
+
+  close () {
+    this.goBack()
+  }
+
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    // this.modalController.dismiss();
+    this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then( (res)=> {
+
+      if(res['data']=='openDiscart') {
+
+
+        this.distartExpedientModal();
+
+      } else {
+        this.goBack()
+      }
+
+      this.modalController.dismiss('close')
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
+
+      this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
+      this.modalController.dismiss('close')
+      loader.remove()
+    },(error)=>{
+      loader.remove()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não encontrado')
+      }
+    });
+  }
+
+  async distartExpedientModal() {
+    this.modalController.dismiss();
+
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /*
+        this.close();
+        this.openMenu(); */
+      }
+      this.modalController.dismiss('close')
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async openBookMeetingModal(task: any) {
+    this.modalController.dismiss();
+    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,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=> {},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+
+  }
+
+  async openDelegarModal(task: any) {
+    this.modalController.dismiss();
+    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
+    });
+
+    modal.onDidDismiss().then(res => {
+      if(res) {
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async generateDiploma(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.close();
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+    this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    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,
+        }
+
+        if(actionName == 'Executado') {
+          await this.executado(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+          await this.arquivar(res.data.note, docs);
+        }
+        else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução') {
+          await this.reexecutar(res.data.note, docs);
+        }
+        else if(actionName == 'Concluido') {
+          await this.concluir(res.data.note, docs);
+        }
+
+        this.goBack();
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async concluir(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Concluir Despacho')
+      this.close();
+    } catch (error) {
+    if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService.successMessage('Processo arquivado')
+      this.close();
+    } catch (error) {
+      this.toastService.badRequest('Processo não arquivado')
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async executado(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Executado')
+      this.close();
+      this.toastService.successMessage()
+    } catch(error) {
+      this.toastService.badRequest()
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async reexecutar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Reexecução')
+      this.toastService.successMessage()
+      this.close();
+    } catch (error) {
+      this.toastService.badRequest()
+    }     finally {
+      loader.remove()
+    }
+  }
+
+  goBack() {
+    this.RouteService.goBack();
+    this.TaskService.loadDiplomas()
+  }
+
+  cancle() {
+    this.modalController.dismiss()
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options-routing.module.ts
new file mode 100644
index 000000000..42c90e474
--- /dev/null
+++ b/src/app/shared/popover/desktop/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/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.module.ts
new file mode 100644
index 000000000..3a64808ef
--- /dev/null
+++ b/src/app/shared/popover/desktop/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/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.html
new file mode 100644
index 000000000..5f0257527
--- /dev/null
+++ b/src/app/shared/popover/desktop/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/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss
new file mode 100644
index 000000000..22c26e431
--- /dev/null
+++ b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.scss
@@ -0,0 +1,67 @@
+@import '~src/function.scss';
+
+.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: rem(35);
+          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/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.spec.ts
new file mode 100644
index 000000000..b22d013a1
--- /dev/null
+++ b/src/app/shared/popover/desktop/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/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts
new file mode 100644
index 000000000..8db44ef05
--- /dev/null
+++ b/src/app/shared/popover/desktop/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -0,0 +1,208 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.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';
+import { RouteService } from 'src/app/services/route.service';
+import { TaskService } from 'src/app/services/task.service'
+
+@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 toastService: ToastService,
+    public ThemeService: ThemeService,
+    private despachoService: DespachoService,
+    private navParams: NavParams,
+    private router: Router,
+    private RouteService: RouteService,
+    public TaskService: TaskService
+  ) { }
+
+  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'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:false
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    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) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
+
+            this.toastService._badRequest();
+          }
+        } finally {
+          loader.remove()
+        }
+
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
+      this.goBack();
+      this.toastService._badRequest("Processo enviado para Pendentes")
+      loader.remove()
+    },
+    error => {
+      loader.remove()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest("Processo não enviado para Pendentes")
+      }
+    });
+  }
+
+
+  async openBookMeetingModal() {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+  }
+
+  async openDelegarModal() {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(res => {
+      if(res) {
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+
+    await modal.present();
+  }
+
+
+  goBack() {
+
+    this.popoverController.dismiss();
+    this.RouteService.goBack();
+    this.TaskService.loadDespachos();
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options-routing.module.ts b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options-routing.module.ts
new file mode 100644
index 000000000..1a78a21f0
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DkDeplomasOptionsPage } from './dk-deplomas-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DkDeplomasOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DkDeplomasOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.module.ts b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.module.ts
new file mode 100644
index 000000000..4d09bf71b
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-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 { DkDeplomasOptionsPageRoutingModule } from './dk-deplomas-options-routing.module';
+
+import { DkDeplomasOptionsPage } from './dk-deplomas-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DkDeplomasOptionsPageRoutingModule
+  ],
+  declarations: [DkDeplomasOptionsPage]
+})
+export class DkDeplomasOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.html b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.html
new file mode 100644
index 000000000..f7f874f11
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.html
@@ -0,0 +1,68 @@
+<ion-content class="options-container">
+  <div class="arrow-right" (click)="goBack('no')">
+    <button class="btn-no-color">
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+  
+  <div class="width-100 pr-options"  *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName == 'Despacho do Presidente da República' ">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1 width-50 pr-10">
+        <button class="btn-cancel desk" shape="round" > Responder ao {{ environment.PR}} </button>
+        <button (click)="openAddNoteModal('Executado')" class="btn-cancel width-100" shape="round" >Executado</button>
+        <button class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
+        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>
+        <button class="btn-cancel desk" shape="round"> Outras opções </button>
+        <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
+      </div>
+      <div class="flex-grow-1 width-50 pl-10">
+        <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
+        <button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para Pendentes</button>
+      </div>
+    </div>
+    <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      </div>
+    </div>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
+    <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.scss b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.scss
new file mode 100644
index 000000000..104fc7fae
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.scss
@@ -0,0 +1,38 @@
+@import '~src/function.scss';
+
+.options-container {
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+
+}
+.arrow-right {
+    margin-bottom: 20px;
+    .arrow-right-icon {
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+    margin: 5px 5px 5px 5px !important;
+  }
+
+.pr-options {
+    .btn-ok, .btn-cancel{
+        width: 100% !important;
+    }
+}
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.spec.ts b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.spec.ts
new file mode 100644
index 000000000..9906c30e6
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DkDeplomasOptionsPage } from './dk-deplomas-options.page';
+
+describe('DkDeplomasOptionsPage', () => {
+  let component: DkDeplomasOptionsPage;
+  let fixture: ComponentFixture<DkDeplomasOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DkDeplomasOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DkDeplomasOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.ts b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.ts
new file mode 100644
index 000000000..6bff06daf
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-deplomas-options/dk-deplomas-options.page.ts
@@ -0,0 +1,402 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service'
+
+@Component({
+  selector: 'app-dk-deplomas-options',
+  templateUrl: './dk-deplomas-options.page.html',
+  styleUrls: ['./dk-deplomas-options.page.scss'],
+})
+export class DkDeplomasOptionsPage implements OnInit {
+
+
+  task: customTask
+  fulltask: fullTask;
+  serialNumber: string;
+  environment = environment
+
+  constructor(
+    private processes: ProcessesService,
+    private modalController: ModalController,
+    public popoverController: PopoverController,
+    private navParams: NavParams,
+    private toastService: ToastService,
+    public p: PermissionService,
+    public ThemeService: ThemeService,
+    private RouteService: RouteService,
+    private httpErrorHandle: HttpErrorHandle,
+    public TaskService: TaskService
+    ) {
+
+      this.task = this.navParams.get('task')
+      this.fulltask = this.navParams.get('fulltask')
+
+
+      this.serialNumber = this.task.SerialNumber
+    }
+
+  ngOnInit() {
+  }
+
+
+  async openTaskProcessModal(taskAction: any, task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then( res => {
+      // this.goBack();
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
+      loader.remove()
+
+      this.goBack('back');
+    },(error)=>{
+      loader.remove()
+      this.httpErrorHandle.httpStatusHandle(error)
+    });
+  }
+
+  async distartExpedientModal() {
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.goBack('back');
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async openBookMeetingModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(() => {
+      this.goBack('no');
+    }, (error) => {
+      console.log(error)
+    })
+
+    await modal.present();
+  }
+
+  async openDelegarModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack('back');
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async generateDiploma(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }     finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      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,
+        }
+
+        if(actionName == 'Executado') {
+          await this.executado(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+         await this.arquivar(res.data.note, docs);
+        }
+        else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+        }
+        else if(actionName == 'Concluido') {
+          this.concluir(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução') {
+          await this.reexecutar(res.data.note, docs);
+        }
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+  }
+
+
+
+  async concluir(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
+      this.TaskService.loadDiplomas()
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage('Processo arquivado')
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não arquivado')
+      }
+    }     finally {
+      loader.remove()
+    }
+
+
+  }
+
+
+  async executado(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.goBack('back');
+      this.toastService._successMessage()
+    } catch(error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+
+
+  async reexecutar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+  goBack(params) {
+    this.popoverController.dismiss(params)
+  }
+}
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options-routing.module.ts b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options-routing.module.ts
new file mode 100644
index 000000000..13c9a9a7d
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DkDespachosOptionsPage } from './dk-despachos-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DkDespachosOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DkDespachosOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.module.ts b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.module.ts
new file mode 100644
index 000000000..645420cac
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-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 { DkDespachosOptionsPageRoutingModule } from './dk-despachos-options-routing.module';
+
+import { DkDespachosOptionsPage } from './dk-despachos-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DkDespachosOptionsPageRoutingModule
+  ],
+  declarations: [DkDespachosOptionsPage]
+})
+export class DkDespachosOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.html b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.html
new file mode 100644
index 000000000..43eb6c605
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.html
@@ -0,0 +1,69 @@
+<ion-content class="options-container">
+  <div class="arrow-right" (click)="goBack('no')">
+    <button class="btn-no-color">
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+
+  <div class="width-100 pr-options"  *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName == 'Despacho do Presidente da República' ">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1 width-50 pr-10">
+        <button class="btn-cancel desk" shape="round" > Responder ao {{ environment.PR}} </button>
+        <button (click)="openAddNoteModal('Executado')" class="btn-cancel width-100" shape="round" >Executado</button>
+        <button class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
+        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>
+        <button class="btn-cancel desk" shape="round"> Outras opções </button>
+        <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
+      </div>
+      <div class="flex-grow-1 width-50 pl-10">
+        <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
+        <button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para Pendentes</button>
+      </div>
+    </div>
+    <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      </div>
+    </div>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
+    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+    <button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+  </div>
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
+    <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+    <div class="solid"></div>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+    <div class="solid"></div>
+    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.scss b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.scss
new file mode 100644
index 000000000..0fc2784b5
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.scss
@@ -0,0 +1,40 @@
+@import '~src/function.scss';
+
+.options-container {
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+
+}
+.arrow-right {
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon {
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+    margin: 5px 5px 5px 5px !important;
+  }
+
+.pr-options {
+    .btn-ok, .btn-cancel{
+        width: 100% !important;
+    }
+}
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.spec.ts b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.spec.ts
new file mode 100644
index 000000000..71ea195b8
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DkDespachosOptionsPage } from './dk-despachos-options.page';
+
+describe('DkDespachosOptionsPage', () => {
+  let component: DkDespachosOptionsPage;
+  let fixture: ComponentFixture<DkDespachosOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DkDespachosOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DkDespachosOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.ts b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.ts
new file mode 100644
index 000000000..6bc087d82
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-options/dk-despachos-options.page.ts
@@ -0,0 +1,403 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service'
+
+@Component({
+  selector: 'app-dk-despachos-options',
+  templateUrl: './dk-despachos-options.page.html',
+  styleUrls: ['./dk-despachos-options.page.scss'],
+})
+export class DkDespachosOptionsPage implements OnInit {
+
+  task: customTask
+  fulltask: fullTask;
+  serialNumber: string;
+  environment = environment
+
+  constructor(
+    private processes: ProcessesService,
+    private modalController: ModalController,
+    public popoverController: PopoverController,
+    private navParams: NavParams,
+    private toastService: ToastService,
+    public p: PermissionService,
+    public ThemeService: ThemeService,
+    private RouteService: RouteService,
+    private httpErrorHandle: HttpErrorHandle,
+    public TaskService: TaskService
+    ) {
+
+      this.task = this.navParams.get('task')
+      this.fulltask = this.navParams.get('fulltask')
+
+
+      this.serialNumber = this.task.SerialNumber
+    }
+
+  ngOnInit() {
+  }
+
+
+  async openTaskProcessModal(taskAction: any, task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then( res => {
+      // this.goBack();
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
+      loader.remove()
+
+      this.goBack('back');
+    },(error)=>{
+      loader.remove()
+      this.httpErrorHandle.httpStatusHandle(error)
+    });
+  }
+
+  async distartExpedientModal() {
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.goBack('back');
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async openBookMeetingModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(() => {
+      this.goBack('no');
+    }, (error) => {
+      console.log(error)
+    })
+
+    await modal.present();
+  }
+
+  async openDelegarModal(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack('back');
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async generateDiploma(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }     finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      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,
+        }
+
+        if(actionName == 'Executado') {
+          await this.executado(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+         await this.arquivar(res.data.note, docs);
+        }
+        else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+        }
+        else if(actionName == 'Concluido') {
+          this.concluir(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução') {
+          await this.reexecutar(res.data.note, docs);
+        }
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+  }
+
+
+
+  async concluir(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
+      this.TaskService.loadDiplomas()
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage('Processo arquivado')
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não arquivado')
+      }
+    }     finally {
+      loader.remove()
+    }
+
+
+  }
+
+
+  async executado(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.goBack('back');
+      this.toastService._successMessage()
+    } catch(error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+
+
+  async reexecutar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.goBack('back');
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+  goBack(params) {
+    this.popoverController.dismiss(params)
+  }
+
+
+}
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options-routing.module.ts b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options-routing.module.ts
new file mode 100644
index 000000000..080d594bf
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DkDespachosPrOptionsPage } from './dk-despachos-pr-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DkDespachosPrOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DkDespachosPrOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.module.ts b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.module.ts
new file mode 100644
index 000000000..1367d99ef
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-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 { DkDespachosPrOptionsPageRoutingModule } from './dk-despachos-pr-options-routing.module';
+
+import { DkDespachosPrOptionsPage } from './dk-despachos-pr-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DkDespachosPrOptionsPageRoutingModule
+  ],
+  declarations: [DkDespachosPrOptionsPage]
+})
+export class DkDespachosPrOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.html b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.html
new file mode 100644
index 000000000..56bd1cd09
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.html
@@ -0,0 +1,41 @@
+<ion-content class="options-container">
+  <div class="arrow-right" (click)="close()">
+    <button class="btn-no-color">
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+  <div class="width-100">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1 width-50 pr-10">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Responder ao {{ environment.PR}} </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Outras opções </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      </div>
+      <div class="flex-grow-1 width-50 pl-10">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
+        <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+    <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+
+    <!-- <div class="solid"></div>
+    <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button> -->
+  </div>
+
+</ion-content>
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.scss b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.scss
new file mode 100644
index 000000000..f45ba4e5d
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.scss
@@ -0,0 +1,49 @@
+@import '~src/function.scss';
+
+:host {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+.options-container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+   width: 100%;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+.btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
+}
\ No newline at end of file
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.spec.ts b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.spec.ts
new file mode 100644
index 000000000..0514d638e
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DkDespachosPrOptionsPage } from './dk-despachos-pr-options.page';
+
+describe('DkDespachosPrOptionsPage', () => {
+  let component: DkDespachosPrOptionsPage;
+  let fixture: ComponentFixture<DkDespachosPrOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DkDespachosPrOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DkDespachosPrOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.ts b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.ts
new file mode 100644
index 000000000..e2a4eac92
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-despachos-pr-options/dk-despachos-pr-options.page.ts
@@ -0,0 +1,430 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController } from '@ionic/angular';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+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 { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+import { environment } from 'src/environments/environment';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
+
+
+@Component({
+  selector: 'app-dk-despachos-pr-options',
+  templateUrl: './dk-despachos-pr-options.page.html',
+  styleUrls: ['./dk-despachos-pr-options.page.scss'],
+})
+export class DkDespachosPrOptionsPage implements OnInit {
+
+
+  task: any;
+  fulltask: any;
+  serialNumber: string;
+  profile: string
+  environment = environment
+
+  constructor(private activateRoute: ActivatedRoute,
+    private processes: ProcessesService,
+    private router: Router,
+    private modalController: ModalController,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public p: PermissionService,
+    public ThemeService: ThemeService,
+    public TaskService: TaskService,
+    private httpErroHandle: HttpErrorHandle,
+  ) { }
+
+  ngOnInit() {
+
+    this.profile = "mdgpr";
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialNumber = params["serialNumber"];
+
+      }
+    });
+
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if(this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
+
+  }
+
+  close () {
+    this.goBack()
+  }
+
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    // this.modalController.dismiss();
+    this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then( (res)=> {
+
+      if(res['data']=='openDiscart') {
+
+
+        this.distartExpedientModal();
+
+      } else {
+        this.goBack()
+      }
+
+      this.modalController.dismiss('close')
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
+
+      this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
+      this.modalController.dismiss('close')
+      loader.remove()
+    },(error)=>{
+      loader.remove()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não encontrado')
+      }
+    });
+  }
+
+  async distartExpedientModal() {
+    this.modalController.dismiss();
+
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /*
+        this.close();
+        this.openMenu(); */
+      }
+      this.modalController.dismiss('close')
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async openBookMeetingModal(task: any) {
+    this.modalController.dismiss();
+    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,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=> {},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+
+  }
+
+  async openDelegarModal(task: any) {
+    this.modalController.dismiss();
+    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
+    });
+
+    modal.onDidDismiss().then(res => {
+      if(res) {
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async generateDiploma(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService._successMessage()
+      this.close();
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+    this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    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,
+        }
+
+        if(actionName == 'Executado') {
+          await this.executado(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+          await this.arquivar(res.data.note, docs);
+        }
+        else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+        }
+        else if(actionName == 'Reexecução') {
+          await this.reexecutar(res.data.note, docs);
+        }
+        else if(actionName == 'Concluido') {
+          await this.concluir(res.data.note, docs);
+        }
+
+        this.goBack();
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+  async concluir(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Concluir Despacho')
+      this.close();
+    } catch (error) {
+    if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async arquivar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService.successMessage('Processo arquivado')
+      this.close();
+    } catch (error) {
+      this.toastService.badRequest('Processo não arquivado')
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async executado(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Executado')
+      this.close();
+      this.toastService.successMessage()
+    } catch(error) {
+      this.toastService.badRequest()
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+
+  async reexecutar(note:string, documents:any){
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErroHandle.httpsSucessMessagge('Reexecução')
+      this.toastService.successMessage()
+      this.close();
+    } catch (error) {
+      this.toastService.badRequest()
+    }     finally {
+      loader.remove()
+    }
+  }
+
+  goBack() {
+    this.RouteService.goBack();
+    this.TaskService.loadDiplomas()
+  }
+
+  cancle() {
+    this.modalController.dismiss()
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options-routing.module.ts b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options-routing.module.ts
new file mode 100644
index 000000000..e635f2a31
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DkDiplomasGerarOptionsPage } from './dk-diplomas-gerar-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DkDiplomasGerarOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DkDiplomasGerarOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.module.ts b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.module.ts
new file mode 100644
index 000000000..8059b4db7
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-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 { DkDiplomasGerarOptionsPageRoutingModule } from './dk-diplomas-gerar-options-routing.module';
+
+import { DkDiplomasGerarOptionsPage } from './dk-diplomas-gerar-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DkDiplomasGerarOptionsPageRoutingModule
+  ],
+  declarations: [DkDiplomasGerarOptionsPage]
+})
+export class DkDiplomasGerarOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.html b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.html
new file mode 100644
index 000000000..5f0257527
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-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/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.scss b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.scss
new file mode 100644
index 000000000..22c26e431
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.scss
@@ -0,0 +1,67 @@
+@import '~src/function.scss';
+
+.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: rem(35);
+          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/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.spec.ts b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.spec.ts
new file mode 100644
index 000000000..502e4302c
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DkDiplomasGerarOptionsPage } from './dk-diplomas-gerar-options.page';
+
+describe('DkDiplomasGerarOptionsPage', () => {
+  let component: DkDiplomasGerarOptionsPage;
+  let fixture: ComponentFixture<DkDiplomasGerarOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DkDiplomasGerarOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DkDiplomasGerarOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.ts b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.ts
new file mode 100644
index 000000000..04b6ee275
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-diplomas-gerar-options/dk-diplomas-gerar-options.page.ts
@@ -0,0 +1,209 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+import { ThemeService } from 'src/app/services/theme.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';
+import { RouteService } from 'src/app/services/route.service';
+import { TaskService } from 'src/app/services/task.service'
+
+@Component({
+  selector: 'app-dk-diplomas-gerar-options',
+  templateUrl: './dk-diplomas-gerar-options.page.html',
+  styleUrls: ['./dk-diplomas-gerar-options.page.scss'],
+})
+export class DkDiplomasGerarOptionsPage implements OnInit {
+
+
+  task: customTask
+  fulltask: fullTask;
+  serialNumber: string;
+
+  constructor(
+    private processes: ProcessesService,
+    public popoverController: PopoverController,
+    private modalController: ModalController,
+    private toastService: ToastService,
+    public ThemeService: ThemeService,
+    private despachoService: DespachoService,
+    private navParams: NavParams,
+    private router: Router,
+    private RouteService: RouteService,
+    public TaskService: TaskService
+  ) { }
+
+  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'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps: {
+        showAttachmentBtn: true,
+        actionName:false
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    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) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
+
+            this.toastService._badRequest();
+          }
+        } finally {
+          loader.remove()
+        }
+
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
+      this.goBack();
+      this.toastService._badRequest("Processo enviado para Pendentes")
+      loader.remove()
+    },
+    error => {
+      loader.remove()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest("Processo não enviado para Pendentes")
+      }
+    });
+  }
+
+
+  async openBookMeetingModal() {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask:this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+  }
+
+  async openDelegarModal() {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(res => {
+      if(res) {
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+
+    await modal.present();
+  }
+
+
+  goBack() {
+
+    this.popoverController.dismiss();
+    this.RouteService.goBack();
+    this.TaskService.loadDespachos();
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente-routing.module.ts b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente-routing.module.ts
new file mode 100644
index 000000000..cec4c4070
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DKOptsExpedientePage } from './dk-opts-expediente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DKOptsExpedientePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DKOptsExpedientePageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.module.ts b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.module.ts
new file mode 100644
index 000000000..9efb4b9d0
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.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 { DKOptsExpedientePageRoutingModule } from './dk-opts-expediente-routing.module';
+
+import { DKOptsExpedientePage } from './dk-opts-expediente.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DKOptsExpedientePageRoutingModule
+  ],
+  declarations: [DKOptsExpedientePage]
+})
+export class DKOptsExpedientePageModule {}
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html
new file mode 100644
index 000000000..6568a3d28
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html
@@ -0,0 +1,24 @@
+<ion-content class="options-container width-100 ">
+  <div class="width-100">
+    <div class="d-flex width-100">
+      <div class="flex-grow-1 flex-wrap d-flex">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"  class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="(task.Status || '') != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
+        <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
+        <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+
+  </div>
+</ion-content>
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss
new file mode 100644
index 000000000..391fb1401
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss
@@ -0,0 +1,66 @@
+@import '~src/function.scss';
+
+.options-container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+   width: 100%;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 100% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        // display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete, .btn-ok{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
+    color: var(--profile-text-color);
+}
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.spec.ts b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.spec.ts
new file mode 100644
index 000000000..0bc993587
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DKOptsExpedientePage } from './dk-opts-expediente.page';
+
+describe('DKOptsExpedientePage', () => {
+  let component: DKOptsExpedientePage;
+  let fixture: ComponentFixture<DKOptsExpedientePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DKOptsExpedientePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DKOptsExpedientePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.ts b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.ts
new file mode 100644
index 000000000..92548ec39
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.ts
@@ -0,0 +1,464 @@
+import { Component, OnInit } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { expedienteTask } from 'src/app/models/dailyworktask.model';
+import { SearchList } from 'src/app/models/search-document';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { ExpedienteService } from 'src/app/Rules/expediente.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
+import { RouteService } from 'src/app/services/route.service';
+import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service';
+import { DataService } from 'src/app/services/data.service';
+
+@Component({
+  selector: 'app-dk-opts-expediente',
+  templateUrl: './dk-opts-expediente.page.html',
+  styleUrls: ['./dk-opts-expediente.page.scss'],
+})
+export class DKOptsExpedientePage implements OnInit {
+
+
+  task: expedienteTask
+  fulltask: any;
+  profile:string;
+  caller:string;
+
+  showEnviarPendentes = false
+  searchDocumentPipe = new SearchDocumentPipe()
+  documents:SearchList[] = [];
+
+  SessionStore = SessionStore;
+  environment = environment
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes: ProcessesService,
+    private toastService: ToastService,
+    private router: Router,
+    public p: PermissionService,
+    private attachmentsService: AttachmentsService,
+    private RouteService: RouteService,
+    private expedienteService: ExpedienteService,
+    public ThemeService: ThemeService,
+    private httpErrorHanlde: HttpErrorHandle,
+    public TaskService: TaskService,
+    private dataService: DataService,
+  ) {
+
+  }
+
+  ngOnInit() {
+
+  }
+
+  async openNewGroupPage() {
+
+    // this.dataService.set("newGroup", true);
+    // this.dataService.set("task", this.task);
+    // this.dataService.set("newGroupName", this.task.Folio);
+    // this.dataService.set("documents", this.fulltask.Documents);
+    // this.dataService.set("link", window.location.pathname);
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+        task: this.task,
+        documents: this.fulltask.Documents,
+      },
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      })
+
+      await modal.present();
+  }
+
+  close() {
+    if( window.innerWidth < 801) {
+      this.popoverController.dismiss();
+    }
+    else{
+      this.popoverController.dismiss();
+    }
+  }
+
+  goBack() {
+    this.TaskService.loadExpedientes()
+    this.RouteService.goBack()
+  }
+
+  attachDocument(){
+    this.getDoc();
+  }
+
+  async getDoc() {
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true
+      }
+    });
+
+      modal.onDidDismiss().then( async (res)=>{
+        if(res){
+          const data = res.data;
+          this.documents.push(data.selected);
+          this.documents.forEach((element: any) =>{
+
+            let body = {
+              "InstanceID": this.task.InstanceID,
+              "WorkflowDisplayName": this.task.WorkflowName,
+              "FolderID": this.task.FolderId,
+              "DispatchNumber": this.task.DispatchNumber,
+              "AttachmentsProcessLastInstanceID": this.task.AttachmentsProcessLastInstanceID,
+              "Attachments": []
+            }
+
+            const Attachments = this.searchDocumentPipe.transformToAttachment(element)
+            body.Attachments = Attachments;
+
+            const loader = this.toastService.loading()
+
+            this.attachmentsService.AddAttachment(body).subscribe((res)=> {
+              this.toastService._successMessage()
+            }, (error) => {
+              this.httpErrorHanlde.httpStatusHandle(error)
+            },()=> {
+              loader.remove()
+            });
+
+        });
+
+        this.popoverController.dismiss()
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+    let classs;
+    if( window.innerWidth < 801) {
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'add-note-modal'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+        showAttachmentBtn: false,
+        actionName:actionName
+      },
+      cssClass: classs,
+      //backdropDismiss: true
+    });
+
+    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,
+        }
+
+        if(actionName == 'Aprovar') {
+          await this.approve(res.data.note, docs);
+        }
+        else if(actionName == 'Revisão') {
+          await this.sendToReview(res.data.note, docs);
+        }
+        this.popoverController.dismiss();
+        this.goBack();
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async sendToReview(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.task.SerialNumber,
+      "action": "Retificar",
+      "ActionTypeId": 99999877,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.TaskService.loadExpedientes()
+      this.close();
+      this.toastService._successMessage()
+    } catch(error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    } finally {
+      loader.remove()
+    }
+  }
+
+  sendExpedienteToPending() {
+    this.close();
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.TaskService.loadExpedientes()
+      this.goBack();
+    },(error) => {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não encontrado')
+      }
+    });
+  }
+
+  async approve(note:string, documents:any){
+    let body = {
+      "serialNumber": this.task.SerialNumber,
+      "action": "Aprovar",
+      "ActionTypeId": 100000004 ,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise();
+      this.TaskService.loadExpedientes()
+      this.close();
+      this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror')
+    } catch(error) {
+      this.httpErrorHanlde.httpStatusHandle(error)
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+  async openBookMeetingModal() {
+    this.close();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+
+
+    this.close();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then(async res=>{
+
+      let body = res['data'];
+      if(res['data']){
+        const loader = this.toastService.loading()
+        try {
+          await this.processes.CompleteTask(body).toPromise();
+          this.TaskService.loadExpedientes()
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+              this.toastService._badRequest('Processo não descartado')
+            }
+          } finally {
+            loader.remove()
+        }
+      }
+      else{
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async distartExpedientModal(body:any){
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+
+    modal.onDidDismiss().then( async (res) => {
+
+
+      if(body == 'descartar') {
+        if(res['data']== 'Yes') {
+
+          const loader = this.toastService.loading()
+
+          try {
+            await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise()
+            this.TaskService.loadExpedientes()
+            this.toastService._successMessage('Processo descartado');
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+              this.toastService._badRequest('Processo não descartado')
+            }
+          } finally {
+            loader.remove()
+          }
+
+
+        }
+        else if(res['data'] == 'No'){
+          //Do nothing
+        }
+      }
+      else{
+        if(res['data']== 'Yes') {
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.CompleteTask(body).toPromise();
+            this.toastService._successMessage('Processo descartado');
+            this.TaskService.loadExpedientes()
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+            this.toastService._badRequest('Processo não descartado')
+            }
+          }     finally {
+            loader.remove()
+          }
+          this.goBack();
+        }
+        else if(res['data'] == 'No'){
+
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
+            this.TaskService.loadExpedientes()
+            this.toastService._successMessage();
+            this.goBack();
+          } catch (error) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
+            this.toastService._badRequest()
+          }
+          }     finally {
+            loader.remove()
+          }
+        }
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+
+}
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options-routing.module.ts b/src/app/shared/popover/desktop/dk-request-options/dk-request-options-routing.module.ts
new file mode 100644
index 000000000..195619109
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DKRequestOptionsPage } from './dk-request-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DKRequestOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DKRequestOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options.module.ts b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.module.ts
new file mode 100644
index 000000000..bc3648d2c
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-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 { DKRequestOptionsPageRoutingModule } from './dk-request-options-routing.module';
+
+import { DKRequestOptionsPage } from './dk-request-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DKRequestOptionsPageRoutingModule
+  ],
+  declarations: [DKRequestOptionsPage]
+})
+export class DKRequestOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.html b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.html
new file mode 100644
index 000000000..593e95eae
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.html
@@ -0,0 +1,55 @@
+<div class="wrapper">
+  <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button  (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <!-- <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> -->
+      <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+  </div>
+
+  <div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente' ">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
+      <button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'">Iniciar Conversa</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.scss b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.scss
new file mode 100644
index 000000000..87ba77bba
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.scss
@@ -0,0 +1,65 @@
+@import '~src/function.scss';
+
+.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: rem(35);
+        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: 100% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+  .container{
+    width: 100% !important;
+
+  }
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        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;
+    } */
+}
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.spec.ts b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.spec.ts
new file mode 100644
index 000000000..d8786450b
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DKRequestOptionsPage } from './dk-request-options.page';
+
+describe('DKRequestOptionsPage', () => {
+  let component: DKRequestOptionsPage;
+  let fixture: ComponentFixture<DKRequestOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DKRequestOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DKRequestOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.ts b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.ts
new file mode 100644
index 000000000..99a4ba32e
--- /dev/null
+++ b/src/app/shared/popover/desktop/dk-request-options/dk-request-options.page.ts
@@ -0,0 +1,400 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
+import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { PedidoService } from 'src/app/Rules/pedido.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
+import { ForwardPage } from 'src/app/modals/forward/forward.page';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+
+
+@Component({
+  selector: 'app-dk-request-options',
+  templateUrl: './dk-request-options.page.html',
+  styleUrls: ['./dk-request-options.page.scss'],
+})
+export class DKRequestOptionsPage implements OnInit {
+
+
+  task:any;
+  fulltask: any;
+  profile:string;
+  serialNumber : string;
+  showEnviarPendentes = false;
+  taskActions = [];
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes: ProcessesService,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    public p: PermissionService,
+    private pedidoService: PedidoService,
+    private httpErrorHandle: HttpErrorHandle
+  ) {
+    this.task = this.navParams.get('task');
+    this.fulltask = this.navParams.get('fulltask');
+    this.serialNumber = this.navParams.get('serialNumber');
+    this.taskActions = this.navParams.get('actions');
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialNumber = params["serialNumber"];
+        //
+      }
+    });
+
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if (this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
+
+    this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
+
+    if(!this.showEnviarPendentes) this.showEnviarPendentes = false
+
+  }
+
+  ngOnInit() {
+
+    this.profile = "mdgpr";
+
+    window.onresize = (event) => {
+      if( window.innerWidth >= 800){
+        this.popoverController.dismiss();
+      }
+    };
+  }
+
+  checkStringInArray(str) {
+    return this.taskActions.includes(str);
+  }
+
+  close() {
+    this.popoverController.dismiss('close')
+  }
+  cancel(){
+    this.popoverController.dismiss();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+
+      this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
+      this.close();
+      loader.remove()
+    }, (error)=> {
+      loader.remove()
+
+      this.httpErrorHandle.httpStatusHandle(error)
+    });
+
+  }
+
+  async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{}
+      , (error) => {
+        console.log(error)
+      })
+
+      await modal.present();
+  }
+
+  async openNewGroupPage(){
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+        task: this.task,
+        documents: this.fulltask.Documents,
+      },
+    });
+
+    modal.onDidDismiss().then( () => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async newGroup(){
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+      },
+    });
+    await modal.present();
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      })
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then(res=> {
+
+      if(res['data']=='openDiscart') {
+
+
+      } else {
+        this.popoverController.dismiss('close')
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async repreciar(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reapreciação",
+      "ActionTypeId": 100000009,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.close();
+      this.httpErrorHandle.httpsSucessMessagge('Solicitar Reapreciação')
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error);
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    modal.onDidDismiss().then(async (res) => {
+
+
+      const DocumentToSave = res.data.documents.map((e) => {
+        return {
+          ApplicationId: e.ApplicationType,
+          SourceId: e.Id,
+        }
+      });
+
+      let docs = {
+        ProcessInstanceID: "",
+        Attachments: DocumentToSave,
+      }
+
+
+      if(res.data) {
+        if(actionName == 'Solicitar Reapreciação') {
+
+          await this.repreciar(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+          await this.arquivar(res.data.note, docs);
+          this.popoverController.dismiss('close')
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async arquivar(note:string, documents:any) {
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.pedidoService.arquivar({serialNumber: this.serialNumber,
+        documents,
+        note
+      }).toPromise()
+
+      this.httpErrorHandle.httpsSucessMessagge('Arquivar')
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    } finally {
+      loader.remove()
+    }
+
+  }
+
+  async openDarParecer(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DarParecerPage,
+      componentProps: {
+        serialNumber: this.task.SerialNumber,
+        ProcessInstanceID: this.task.ProcessInstanceID,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then( () => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async openForwardModal(tasK: any) {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: ForwardPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(() => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async openDelegarModal(task: any) {
+
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then( async (res)=> {
+
+      if(res['data']=='close') {
+        this.popoverController.dismiss('close');
+      }
+
+    }, (error) => {
+      console.log(error)
+    })
+
+    await modal.present();
+  }
+
+
+
+}
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts
new file mode 100644
index 000000000..b0ca6d569
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: OptsExpedientePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class OptsExpedientePageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.module.ts
new file mode 100644
index 000000000..f2d9a571d
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.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 { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    OptsExpedientePageRoutingModule
+  ],
+  declarations: [OptsExpedientePage]
+})
+export class OptsExpedientePageModule {}
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html
new file mode 100644
index 000000000..6568a3d28
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.html
@@ -0,0 +1,24 @@
+<ion-content class="options-container width-100 ">
+  <div class="width-100">
+    <div class="d-flex width-100">
+      <div class="flex-grow-1 flex-wrap d-flex">
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"  class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="(task.Status || '') != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
+        <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
+        <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </div>
+    </div>
+
+  </div>
+</ion-content>
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss
new file mode 100644
index 000000000..391fb1401
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.scss
@@ -0,0 +1,66 @@
+@import '~src/function.scss';
+
+.options-container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+   width: 100%;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: rem(35);
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 100% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        // display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete, .btn-ok{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
+    color: var(--profile-text-color);
+}
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts
new file mode 100644
index 000000000..2db20e545
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+describe('OptsExpedientePage', () => {
+  let component: OptsExpedientePage;
+  let fixture: ComponentFixture<OptsExpedientePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OptsExpedientePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OptsExpedientePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts
new file mode 100644
index 000000000..585c2c96f
--- /dev/null
+++ b/src/app/shared/popover/desktop/opts-expediente/opts-expediente.page.ts
@@ -0,0 +1,462 @@
+import { Component, OnInit } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { expedienteTask } from 'src/app/models/dailyworktask.model';
+import { SearchList } from 'src/app/models/search-document';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { ExpedienteService } from 'src/app/Rules/expediente.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
+import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
+import { RouteService } from 'src/app/services/route.service';
+import { SessionStore } from 'src/app/store/session.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service';
+import { DataService } from 'src/app/services/data.service';
+
+@Component({
+  selector: 'app-opts-expediente',
+  templateUrl: './opts-expediente.page.html',
+  styleUrls: ['./opts-expediente.page.scss'],
+})
+export class OptsExpedientePage implements OnInit {
+
+  task: expedienteTask
+  fulltask: any;
+  profile:string;
+  caller:string;
+
+  showEnviarPendentes = false
+  searchDocumentPipe = new SearchDocumentPipe()
+  documents:SearchList[] = [];
+
+  SessionStore = SessionStore;
+  environment = environment
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes: ProcessesService,
+    private toastService: ToastService,
+    private router: Router,
+    public p: PermissionService,
+    private attachmentsService: AttachmentsService,
+    private RouteService: RouteService,
+    private expedienteService: ExpedienteService,
+    public ThemeService: ThemeService,
+    private httpErrorHanlde: HttpErrorHandle,
+    public TaskService: TaskService,
+    private dataService: DataService,
+  ) {
+
+  }
+
+  ngOnInit() {
+
+  }
+
+  async openNewGroupPage() {
+
+    // this.dataService.set("newGroup", true);
+    // this.dataService.set("task", this.task);
+    // this.dataService.set("newGroupName", this.task.Folio);
+    // this.dataService.set("documents", this.fulltask.Documents);
+    // this.dataService.set("link", window.location.pathname);
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+        task: this.task,
+        documents: this.fulltask.Documents,
+      },
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      })
+
+      await modal.present();
+  }
+
+  close() {
+    if( window.innerWidth < 801) {
+      this.popoverController.dismiss();
+    }
+    else{
+      this.popoverController.dismiss();
+    }
+  }
+
+  goBack() {
+    this.TaskService.loadExpedientes()
+    this.RouteService.goBack()
+  }
+
+  attachDocument(){
+    this.getDoc();
+  }
+
+  async getDoc() {
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true
+      }
+    });
+
+      modal.onDidDismiss().then( async (res)=>{
+        if(res){
+          const data = res.data;
+          this.documents.push(data.selected);
+          this.documents.forEach((element: any) =>{
+
+            let body = {
+              "InstanceID": this.task.InstanceID,
+              "WorkflowDisplayName": this.task.WorkflowName,
+              "FolderID": this.task.FolderId,
+              "DispatchNumber": this.task.DispatchNumber,
+              "AttachmentsProcessLastInstanceID": this.task.AttachmentsProcessLastInstanceID,
+              "Attachments": []
+            }
+
+            const Attachments = this.searchDocumentPipe.transformToAttachment(element)
+            body.Attachments = Attachments;
+
+            const loader = this.toastService.loading()
+
+            this.attachmentsService.AddAttachment(body).subscribe((res)=> {
+              this.toastService._successMessage()
+            }, (error) => {
+              this.httpErrorHanlde.httpStatusHandle(error)
+            },()=> {
+              loader.remove()
+            });
+
+        });
+
+        this.popoverController.dismiss()
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+    let classs;
+    if( window.innerWidth < 801) {
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'add-note-modal'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+        showAttachmentBtn: false,
+        actionName:actionName
+      },
+      cssClass: classs,
+      //backdropDismiss: true
+    });
+
+    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,
+        }
+
+        if(actionName == 'Aprovar') {
+          await this.approve(res.data.note, docs);
+        }
+        else if(actionName == 'Revisão') {
+          await this.sendToReview(res.data.note, docs);
+        }
+        this.popoverController.dismiss();
+        this.goBack();
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async sendToReview(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.task.SerialNumber,
+      "action": "Retificar",
+      "ActionTypeId": 99999877,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.TaskService.loadExpedientes()
+      this.close();
+      this.toastService._successMessage()
+    } catch(error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest()
+      }
+    } finally {
+      loader.remove()
+    }
+  }
+
+  sendExpedienteToPending() {
+    this.close();
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.TaskService.loadExpedientes()
+      this.goBack();
+    },(error) => {
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+
+        this.toastService._badRequest('Processo não encontrado')
+      }
+    });
+  }
+
+  async approve(note:string, documents:any){
+    let body = {
+      "serialNumber": this.task.SerialNumber,
+      "action": "Aprovar",
+      "ActionTypeId": 100000004 ,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise();
+      this.TaskService.loadExpedientes()
+      this.close();
+      this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror')
+    } catch(error) {
+      this.httpErrorHanlde.httpStatusHandle(error)
+    }  finally {
+      loader.remove()
+    }
+
+  }
+
+  async openBookMeetingModal() {
+    this.close();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      }
+    )
+
+    await modal.present();
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+
+
+    this.close();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then(async res=>{
+
+      let body = res['data'];
+      if(res['data']){
+        const loader = this.toastService.loading()
+        try {
+          await this.processes.CompleteTask(body).toPromise();
+          this.TaskService.loadExpedientes()
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+              this.toastService._badRequest('Processo não descartado')
+            }
+          } finally {
+            loader.remove()
+        }
+      }
+      else{
+
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async distartExpedientModal(body:any){
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+
+
+    modal.onDidDismiss().then( async (res) => {
+
+
+      if(body == 'descartar') {
+        if(res['data']== 'Yes') {
+
+          const loader = this.toastService.loading()
+
+          try {
+            await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise()
+            this.TaskService.loadExpedientes()
+            this.toastService._successMessage('Processo descartado');
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+              this.toastService._badRequest('Processo não descartado')
+            }
+          } finally {
+            loader.remove()
+          }
+
+
+        }
+        else if(res['data'] == 'No'){
+          //Do nothing
+        }
+      }
+      else{
+        if(res['data']== 'Yes') {
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.CompleteTask(body).toPromise();
+            this.toastService._successMessage('Processo descartado');
+            this.TaskService.loadExpedientes()
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+
+            this.toastService._badRequest('Processo não descartado')
+            }
+          }     finally {
+            loader.remove()
+          }
+          this.goBack();
+        }
+        else if(res['data'] == 'No'){
+
+          const loader = this.toastService.loading()
+
+          try {
+            await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
+            this.TaskService.loadExpedientes()
+            this.toastService._successMessage();
+            this.goBack();
+          } catch (error) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
+            this.toastService._badRequest()
+          }
+          }     finally {
+            loader.remove()
+          }
+        }
+      }
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+}
diff --git a/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts b/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts
new file mode 100644
index 000000000..59bb38c36
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { RequestOptionsPage } from './request-options.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: RequestOptionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class RequestOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/request-options/request-options.module.ts b/src/app/shared/popover/desktop/request-options/request-options.module.ts
new file mode 100644
index 000000000..fddddf01d
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-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 { RequestOptionsPageRoutingModule } from './request-options-routing.module';
+
+import { RequestOptionsPage } from './request-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RequestOptionsPageRoutingModule
+  ],
+  declarations: [RequestOptionsPage]
+})
+export class RequestOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.html b/src/app/shared/popover/desktop/request-options/request-options.page.html
new file mode 100644
index 000000000..593e95eae
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-options.page.html
@@ -0,0 +1,55 @@
+<div class="wrapper">
+  <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button  (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <!-- <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> -->
+      <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+  </div>
+
+  <div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente' ">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
+      <button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'">Iniciar Conversa</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.scss b/src/app/shared/popover/desktop/request-options/request-options.page.scss
new file mode 100644
index 000000000..fc0b2ccf2
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-options.page.scss
@@ -0,0 +1,66 @@
+@import '~src/function.scss';
+
+.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: rem(35);
+        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;
+    } */
+}
diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts b/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts
new file mode 100644
index 000000000..41c8cefda
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { RequestOptionsPage } from './request-options.page';
+
+describe('RequestOptionsPage', () => {
+  let component: RequestOptionsPage;
+  let fixture: ComponentFixture<RequestOptionsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RequestOptionsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(RequestOptionsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/popover/desktop/request-options/request-options.page.ts b/src/app/shared/popover/desktop/request-options/request-options.page.ts
new file mode 100644
index 000000000..0296cee4d
--- /dev/null
+++ b/src/app/shared/popover/desktop/request-options/request-options.page.ts
@@ -0,0 +1,398 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
+import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { PedidoService } from 'src/app/Rules/pedido.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
+import { ForwardPage } from 'src/app/modals/forward/forward.page';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+
+
+@Component({
+  selector: 'app-request-options',
+  templateUrl: './request-options.page.html',
+  styleUrls: ['./request-options.page.scss'],
+})
+export class RequestOptionsPage implements OnInit {
+
+  task:any;
+  fulltask: any;
+  profile:string;
+  serialNumber : string;
+  showEnviarPendentes = false;
+  taskActions = [];
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes: ProcessesService,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    public p: PermissionService,
+    private pedidoService: PedidoService,
+    private httpErrorHandle: HttpErrorHandle
+  ) {
+    this.task = this.navParams.get('task');
+    this.fulltask = this.navParams.get('fulltask');
+    this.serialNumber = this.navParams.get('serialNumber');
+    this.taskActions = this.navParams.get('actions');
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialNumber = params["serialNumber"];
+        //
+      }
+    });
+
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if (this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
+
+    this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
+
+    if(!this.showEnviarPendentes) this.showEnviarPendentes = false
+
+  }
+
+  ngOnInit() {
+
+    this.profile = "mdgpr";
+
+    window.onresize = (event) => {
+      if( window.innerWidth >= 800){
+        this.popoverController.dismiss();
+      }
+    };
+  }
+
+  checkStringInArray(str) {
+    return this.taskActions.includes(str);
+  }
+
+  close() {
+    this.popoverController.dismiss('close')
+  }
+  cancel(){
+    this.popoverController.dismiss();
+  }
+
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+
+      this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
+      this.close();
+      loader.remove()
+    }, (error)=> {
+      loader.remove()
+
+      this.httpErrorHandle.httpStatusHandle(error)
+    });
+
+  }
+
+  async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(
+      ()=>{}
+      , (error) => {
+        console.log(error)
+      })
+
+      await modal.present();
+  }
+
+  async openNewGroupPage(){
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+        task: this.task,
+        documents: this.fulltask.Documents,
+      },
+    });
+
+    modal.onDidDismiss().then( () => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async newGroup(){
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: NewGroupPage,
+      cssClass: 'modal modal-desktop',
+      componentProps: {
+        name: this.task.Folio,
+      },
+    });
+    await modal.present();
+    modal.onDidDismiss().then(
+      ()=>{},
+      (error) => {
+        console.log(error)
+      })
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: CreateProcessPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+        fulltask: this.fulltask
+      },
+      cssClass: classs,
+    });
+
+    modal.onDidDismiss().then(res=> {
+
+      if(res['data']=='openDiscart') {
+
+
+      } else {
+        this.popoverController.dismiss('close')
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async repreciar(note:string, documents:any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Reapreciação",
+      "ActionTypeId": 100000009,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.close();
+      this.httpErrorHandle.httpsSucessMessagge('Solicitar Reapreciação')
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error);
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+        showAttachmentBtn: true,
+        actionName:actionName
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+
+    modal.onDidDismiss().then(async (res) => {
+
+
+      const DocumentToSave = res.data.documents.map((e) => {
+        return {
+          ApplicationId: e.ApplicationType,
+          SourceId: e.Id,
+        }
+      });
+
+      let docs = {
+        ProcessInstanceID: "",
+        Attachments: DocumentToSave,
+      }
+
+
+      if(res.data) {
+        if(actionName == 'Solicitar Reapreciação') {
+
+          await this.repreciar(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar') {
+          await this.arquivar(res.data.note, docs);
+          this.popoverController.dismiss('close')
+        }
+      }
+
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async arquivar(note:string, documents:any) {
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.pedidoService.arquivar({serialNumber: this.serialNumber,
+        documents,
+        note
+      }).toPromise()
+
+      this.httpErrorHandle.httpsSucessMessagge('Arquivar')
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    } finally {
+      loader.remove()
+    }
+
+  }
+
+  async openDarParecer(task: any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DarParecerPage,
+      componentProps: {
+        serialNumber: this.task.SerialNumber,
+        ProcessInstanceID: this.task.ProcessInstanceID,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then( () => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+
+  }
+
+  async openForwardModal(tasK: any) {
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: ForwardPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then(() => {
+      this.popoverController.dismiss('close');
+    }, (error) => {
+      console.log(error)
+    });
+
+    await modal.present();
+  }
+
+  async openDelegarModal(task: any) {
+
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    this.modalController.dismiss()
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    modal.onDidDismiss().then( async (res)=> {
+
+      if(res['data']=='close') {
+        this.popoverController.dismiss('close');
+      }
+
+    }, (error) => {
+      console.log(error)
+    })
+
+    await modal.present();
+  }
+
+
+}
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 507ae0b7f..5a51efaec 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -3,7 +3,7 @@
     <!--     <div class="back-icon">
       <ion-icon class="font-35-rem" (click)="goBack()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
     </div> -->
-    <div class="div-title" (click)="uploadChunk()">
+    <div class="div-title" >
       <ion-label class="title">{{ publicationTitle }}</ion-label> <br>
       <i style="margin-top: -3px; font-size: 15px;"> Campos marcados com * são obrigatórios</i>
     </div>
@@ -16,7 +16,7 @@
 
     <div *ngIf="publicationType!='1'" class="ion-item-container"
       [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
-      <ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="pub.Title" name="title"
+      <ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="publicationFormMV.form.Title" name="title"
         placeholder="Título*"></ion-input>
     </div>
 
@@ -27,7 +27,7 @@
         </div>
         <div class="ion-textarea-class flex-grow-1"
           [class.input-error]="Form?.get('Message')?.invalid && validateFrom ">
-          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="pub.Message"
+          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="publicationFormMV.form.Message"
             name="description" ngDefaultControl rows="12" cols="20" placeholder="Corpo de texto*"></ion-textarea>
         </div>
       </div>
@@ -40,12 +40,12 @@
 
 
     <!-- Captured -->
-    <div *ngIf="seletedContent.length > 0">
+    <div *ngIf="publicationFormMV.form.Files.length > 0">
       <ion-label class="attached-title pb-10">Anexos</ion-label>
       <div>
         <div class="d-flex" >
 
-          <div *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" lot="start" class="mr-10">
+          <div *ngFor="let seleted of publicationFormMV.form.Files.slice(0, displayLimit), let i = index" lot="start" class="mr-10">
 
             <div>
 
@@ -80,10 +80,6 @@
 
           </div>
 
-          <ion-label class="pl-10">
-            <p>{{capturedImageTitle}}</p>
-            <p hidden>size</p>
-          </ion-label>
         </div>
         <!-- <button class="btn-no-color" (click)="clear()">
           <ion-icon name="close"></ion-icon>
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index afe5a46d9..577e23681 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -13,15 +13,13 @@ import { checkFileTypeService } from 'src/app/services/checkFileType.service';
 import { FileValidatorService } from "src/app/services/file/file-validator.service";
 import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service";
 import { LakefsRepositoryService } from '../../repository/lakefs/lakefs-repository.service';
-import { ok, err, Result } from 'neverthrow';
 
-import { ObjectMergeNotification, SocketConnectionMCRService } from "src/app/services/socket-connection-mcr.service"
+import { SocketConnectionMCRService } from "src/app/services/socket-connection-mcr.service"
 import { CMAPIService } from '../../repository/CMAPI/cmapi.service';
 import { environment } from 'src/environments/environment';
-import { CaptureError, CaptureImageOptions, MediaCapture, MediaFile } from '@awesome-cordova-plugins/media-capture/ngx';
-import { Filesystem, Directory, Encoding, FilesystemDirectory } from '@capacitor/filesystem';
+import { CaptureImageOptions, MediaCapture } from '@awesome-cordova-plugins/media-capture/ngx';
+import { Filesystem, FilesystemDirectory } from '@capacitor/filesystem';
 import { Platform } from '@ionic/angular';
-import { Capacitor } from '@capacitor/core';
 import { PublicationAttachmentEntity, PublicationFormMV } from '../upload/upload-streaming.service';
 import { PublicationFormMVService } from "src/app/shared/publication/upload/publication-form-mv.service"
 
@@ -38,7 +36,6 @@ enum ActionType {
 })
 export class NewPublicationPage implements OnInit {
   showLoader: boolean;
-  pub: Publication = new Publication();
 
   publicationTitle: string;
   imgUrl: any;
@@ -65,7 +62,6 @@ export class NewPublicationPage implements OnInit {
   fileType: string;
   filecontent: boolean;
   captureContent: any;
-  seletedContent: PublicationAttachmentEntity[] = []
   displayLimit = 4;
   filesSizeSum = 0;
   photoOrVideo: boolean = false;
@@ -83,84 +79,35 @@ export class NewPublicationPage implements OnInit {
     private httpErroHandle: HttpErrorHandle,
     public PublicationFolderService: PublicationFolderService,
     public checkFileType: checkFileTypeService,
+    private mediaCapture: MediaCapture,
+    private httpErrorHandle: HttpErrorHandle,
+    private platform: Platform,
     private FileValidatorService: FileValidatorService,
     private MiddlewareServiceService: MiddlewareServiceService,
     private LakefsRepositoryService: LakefsRepositoryService,
     private SocketConnectionMCRService: SocketConnectionMCRService,
-    private CMAPIService: CMAPIService,
-    private mediaCapture: MediaCapture,
-    private httpErrorHandle: HttpErrorHandle,
-    private platform: Platform,
   ) {
     this.publicationTitle = 'Nova Publicação';
-
-    if (this.publication) {
-      this.seletedContent = this.publication.Files;
-      this.filecontent = true;
-    }
-
   }
 
   ngOnInit() {
-
-    this.publication = {
-      DateIndex: "",
-      DocumentId: 0,
-      ProcessId: "",
-      Title: "",
-      Message: "",
-      DatePublication: "",
-      Files: [],
-      OriginalFileName: "",
-    }
-    this.pub = this.publication;
-
-    this.setTitle();
+    this.setAction();
     this.setData()
   }
 
   setData() {
-    if (!this.publicationType) {
-      setTimeout(() => {
-        this.setData()
-      }, 500)
+    if(this.publication) {
+      this.processData(this.publication)
     } else {
-      // this.pub = this.publication
-      // this.publication = null
       this.getPublicationDetail()
     }
   }
 
   getPublicationDetail() {
-    console.log('edit 1', this.publicationType)
     if (this.publicationType != ActionType.new) {
       this.showLoader = true;
       this.publications.GetPublicationWithArrayOfFilesById(this.documentId).subscribe(res => {
-        this.publication = {
-          DateIndex: res.DateIndex,
-          DocumentId: res.DocumentId,
-          ProcessId: res.ProcessId,
-          Title: res.Title,
-          Message: res.Message,
-          DatePublication: res.DatePublication,
-          Files: res.Files,
-          OriginalFileName: res.OriginalFileName,
-          FileExtension: res.FileExtension,
-        }
-        console.log('edit', this.publication)
-        this.pub = this.publication;
-
-        console.log("this.publication.Files", this.publication.Files)
-        this.seletedContent = this.publication.Files.map(e => {
-          return new PublicationAttachmentEntity(
-            {
-              base64: e.FileBase64,
-              extension: e.FileExtension,
-              OriginalFileName: e.OriginalFileName,
-              FileType: this.checkFileType.checkFileType(e.FileExtension) as any
-            }
-          )
-        })
+        this.processData(res)
         this.showLoader = false;
       }, (error) => {
         console.log(error)
@@ -170,6 +117,34 @@ export class NewPublicationPage implements OnInit {
     }
   }
 
+  processData(res) {
+    this.publicationFormMV.form.Files = []
+    this.publicationFormMV.form.setData({
+      DateIndex: res.DateIndex,
+      DocumentId: res.DocumentId,
+      ProcessId: res.ProcessId,
+      Title: res.Title,
+      Message: res.Message,
+      DatePublication: res.DatePublication
+    })
+
+    const newFiles: PublicationAttachmentEntity[] = res.Files.map(e => {
+      return new PublicationAttachmentEntity(
+        {
+          base64: e.FileBase64,
+          extension: e.FileExtension,
+          OriginalFileName: e.OriginalFileName,
+          FileType: this.checkFileType.checkFileType(e.FileExtension) as any
+        }
+      )
+    })
+
+    for(const files of newFiles) {
+      this.publicationFormMV.form.Files.push(files)
+    }
+
+  }
+
   async takePicture() {
     const capturedImage = await Camera.getPhoto({
       quality: 50,
@@ -200,15 +175,9 @@ export class NewPublicationPage implements OnInit {
           FileType: 'image'
         }
       )
-
       newAttachment.needUpload()
-
-      this.seletedContent.push(newAttachment)
-
+      this.publicationFormMV.form.Files.push(newAttachment)
     });
-    /* }  else {
-      this.toastService._badRequest("Imagem inválida")
-    } */
   }
 
   async laodPicture() {
@@ -240,9 +209,8 @@ export class NewPublicationPage implements OnInit {
           FileType: 'image'
         }
       )
-
       newAttachment.needUpload();
-      this.seletedContent.push(newAttachment)
+      this.publicationFormMV.form.Files.push(newAttachment)
     });
 
   }
@@ -259,21 +227,9 @@ export class NewPublicationPage implements OnInit {
     result.files.forEach(async blobFile => {
       console.log(blobFile)
       if (this.checkFileType.checkFileType(blobFile.mimeType) == 'image' || this.checkFileType.checkFileType(blobFile.mimeType) == 'video') {
-        /* console.log('converte new way',this.getBase64(blobFile)) */
-
-        /* const blob = await fetch(
-          Capacitor.convertFileSrc(blobFile.path)
-        ).then(r => r.blob()); */
-
-        /*  console.log(await blob.arrayBuffer());
-
-
-
-           console.log("base64 :data:video/mp4;base64,",this.arrayBufferToBase64(await blob.arrayBuffer())) */
 
         this.convertBlobToBase64(blobFile.blob).then((value: string) => {
 
-
           this.filesSizeSum = this.filesSizeSum + blobFile.size
           if (this.fileSizeToMB(this.filesSizeSum) <= 20) {
 
@@ -292,12 +248,11 @@ export class NewPublicationPage implements OnInit {
             )
 
             newAttachment.needUpload()
-
-            this.seletedContent.push(newAttachment)
-
+            this.publicationFormMV.form.Files.push(newAttachment)
             this.filecontent = true;
+
           } else {
-            if (this.seletedContent.length === 0)
+            if (this.publicationFormMV.form.Files.length === 0)
               this.filesSizeSum = 0
 
             this.httpErroHandle.validationMessagge('filessize');
@@ -310,32 +265,7 @@ export class NewPublicationPage implements OnInit {
       }
 
     });
-
-
-
-
-    /*       this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
-      this.capturedImageTitle = 'foto';
-
-
-      const validation = await this.FileValidatorService.ValidateImage(this.capturedImage)
-
-      if(validation.isOk) {
-
-        const compressedImage = await this.compressImageBase64(
-          this.capturedImage,
-          800, // maxWidth
-          800, // maxHeight
-          0.9  // quality
-        ).then((picture) => {
-          console.log('Selected: ', picture)
-          this.capturedImage = picture
-        });
-      } else {
-        this.toastService._badRequest("Imagem inválida")
-      } */
-
-  };
+  }
 
   async loadVideoTablet() {
 
@@ -363,8 +293,7 @@ export class NewPublicationPage implements OnInit {
                   OriginalFileName: 'video',
                   FileType: this.checkFileType.checkFileType( this.removeTextBeforeSlash(element.mimeType, '/')) as any
                 })
-                this.seletedContent.push(fileObject)
-                console.log('Files array',this.seletedContent)
+                this.publicationFormMV.form.Files.push(fileObject)
               })
               .catch((err) => console.error(err));
           } catch (error) {
@@ -373,7 +302,7 @@ export class NewPublicationPage implements OnInit {
 
         }
       } else {
-        if (this.seletedContent.length === 0)
+        if (this.publicationFormMV.form.Files.length === 0)
           this.filesSizeSum = 0
 
         this.httpErrorHandle.validationMessagge('filessize')
@@ -389,11 +318,11 @@ export class NewPublicationPage implements OnInit {
   injectValidation() {
 
     this.Form = new FormGroup({
-      Subject: new FormControl(this.pub.Title, [
+      Subject: new FormControl(this.publicationFormMV.form.Title, [
         Validators.required,
         // Validators.minLength(4)
       ]),
-      Message: new FormControl(this.pub.Message, [
+      Message: new FormControl(this.publicationFormMV.form.Message, [
         Validators.required,
         Validators.maxLength(1000)
       ])
@@ -408,46 +337,18 @@ export class NewPublicationPage implements OnInit {
 
     if (this.Form.invalid) {
       return false
-    } else {
-
-    }
-
-
-    if (this.seletedContent.length == 0) {
-
-      const newAttachment = new PublicationAttachmentEntity(
-        {
-          base64: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgMAAAIJCAIAAAC3IqlmAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAABSKSURBVHhe7d1ncuNGo4bRu/8lfh5F5qToBdyWNJbHDYgAmETqPVXnh4PAhKp+iMDu/3v9+28AkikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEcHYen56Wq9VkOr25vfvfX7/Kv1Z/AIelBPDNnp6fV+v1dDa7u7//69dVGfor682m2gQOSwngpF5eX9ebh9l8cT8aXV1fV4N+q/liUT0IHJYSwHE9PD7OF8vReHJ9c1sN8T2NJ9PqMeGwlAAO6eMUfxm7b27vWk/17ODu/r56FjgsJYDdfZ7iv727/3XV61TPDq6ub15eX6unhgNSAujr+eVlvdnM5vP70ej65qYar4/K7UMclRLAlzYPv0/xH/BUz27KkUf12uCAlAB+K9+7F8u3U/xHPdWzm9nc7UMckRIQ6uMU/2Q6u7sfXV2f9FTPDspxSfX64YCUgAh/nOIf39zefu+pnh2Uw5TqHcEBKQE/0+bhYb5YjCeTMzzVs4PyFkrMqvcIh6IE/AQfp/gn0+lFnOrZzcPjY/Wu4VCUgMvzz138l3qq50/ly36p12w2r/5703K1qj4HOBQl4Nz9c4p/MRpPbu/uLv1Uz83t3XgyLcP6nz8RWK7W1Z81lfJ9/j0clhJwXl5eX99P8S9/xqme8vrLgct8sShvqnqnf3p4fKw2bBqNx9VWcChKwDd7eHybqGc6m5UR8/rm4k/13N7dl/eyWq+fnp+rd7pF6V9n88rBRLUVHIoScFIfp/h/xqme92/8t+WNLJbL/S/nlgOg6vEr5encPsSRKAFH9HGK/yed6nm7ujuflzd18CnhykdUPV3T9lNMsDMl4GA+TvH/sFM9ZYB+v7o74FTPbsqBRfUCmhZLtw9xFErA7h4en95P9cw/5mi79FM95S38c3X3G+7cX28eqpfUVBJbbQUHoQT09fT8/HGqZzyZ3t3fX/qpnuubt1M9H1d3z+H8e/l4q1fYVEJVbQUHoQS0K4Pj5uFhsfz3VE81Kl2Wq+u3Uz2lYe9Xd890rv/OuJa9UG0CB6EEvHl5ff15p3rKG3m/uvtw8Ku7R1KKW72RSnlfg25OhZ6UINfPOtVzez8aTaaz5WrYjfxnpXSrel9NZa9VW8H+lCBXnxkOztP73Zxvp3pKyb7l6u6RlGOy6p02lbdcbQX7U4JcfS5RnoP3uzl/n+pZrTc/+NdVD49P1Xtvmkyn1VawPyWIVo0y5+D9G//t/Wg8nc3eb+QPWsn95fW1+jSa7u5H1VawPyWIdg6Xhd9P9YzKV933Uz0Xc3X3SDrv0SofV7UJ7E8JopUhuBpoju39VM/9eDKZzRergdO0JRiNJ9Un1hR1nMRpKEG0aY8FUvZRvsK+3805Lk+0XK2sutWpHBhVn2HTau32IQ5MCaKtN5tqlNnT9fuMDZPpbLF8O9Vj7syhyodWfaRN88Wi2gr2pATRykhdjTKDvF3bff/hbhmbSlSctdjf03P3HikfeLUV7EkJ0lWjzBb/nOp5u5tzuVo/PD6GX909kupjbyr1rTaBPSlBuvK9vhpoKmX0XyxXTvWcTJ/bhzSYw1KCdJ1z3RTVJhzVeNJ9+5Br7xyWEqSbLxbVKNPkG+gp9VmyZrVeV1vBPpQgXZ+bVcrfVFtxPOX7fvX5N83m82or2IcSpOszw8Fs7rbF03l57b5oPBpPqq1gH0pA97hjqawTqz7/ptu7u2oT2IcS0H2zyq+r62qTQWazOYPc3N5Vu6BS9ki1yQFVu48ESkCvm1WqTQa5vbuvHo1zVu0+EigBvW5W2WeqOCW4LNXuI4ES0OtmleVq99sWleCyVLuPBErAm2osaNpnqSwluCzV7iOBEvDmV9eSNTe3u9+sogSXpdp9JFAC3nQO1n/9uqo26U8JLku1+0igBLyZTGfVcNBUbdKfElyWaveRQAl4s1ytq+GgafOw46xnSnBZqt1HAiXgzdPzczUcNO28VJYSXJZq95FACfitGg6adp5zQgkuS7X7SKAE/Na5ZE35g2qTnpTgslS7jwRKwG9396NqRGiqNumpTwmqTTgS+4JWSsBv09m8GhGadptzwuhzPuwLWikBv603m2pEaNptqSyjz/mwL2ilBPz2/PJSjQhNk+ms2qoPo8/5sC9opQT8qxoRmso4Um3Sh9HnfNgXtFIC/nWkJWuMPufDvqCVEvCv+9G4GhSaqk36MPqcD/uCVkrAv+aLRTUoND08Dp5zwuhzPuwLWikB/9o8PFSDQtN8say26rTz6NPn9dDqq+WIlYBWSsC/Xl5fq0GhaTQePOeEEpyeEjCIEvAfPZasua026aQEp6cEDKIE/MfN7V01LlR2WLJGCU5PCRhECfiP8WRSjQtNzy8v1VbbKcHpKQGDKAH/sVguq3GhabXeVFttpwSnpwQMogT8x8PjYzUuNE1nw+acUILTUwIGUQJq1bjQdHc/qjbZ7vQl+HV1PRqPZ/P5erN5fn4pyj+Ufy3/sfOS+M+gBAyiBNQOvmTNiUtwPxo/Pj1VD/Wp/K8+P6W+dErAIEpA7e7+wIPFKUuwWPb64VufyyEXTQkYRAmoTabTamhoenj88kt308lKMGjN/T5Ta1wuJWAQJaC2XK2qoaGp51fvD6cpwQ4/eSubVA/yYygBgygBtcenp2poaBpPJtVWW5ymBOvNsHtbiz7LtF0oJWAQJaBFNTQ0lQGl2mSLE5Tgq4GvU9mweqifQQkYRAlocdgla05Qgt0WWC7Wm2GXIi6FEjCIEtCiz32W/eecOEEJnp6fq217enl9/evXVfVoP4ASMIgS0GLa45xJ//Pyxy7BoAOUpj53zV4cJWAQJaDFat19KbXUotrqK8cuQXn8asNBvvdSwfXNbZ/PZyglYBAloMXzy0s1OjTdj/ouWXPsEux5THCMgbin8so/VwMtY3fnlOD9KQGDKAHtyiBVDRCV/vfvH7sExZbpJbb7xusE5XnXm4fq9ZQwdM720YcSMIgS0O6AS9acoAR73Dv0bT8p+Oo193/XWygBgygB7Ubj7iVren4TP0EJvhr4OpUNq4c6jcVyVb2SPy1X6+rvh1ICBlEC2s3m3dPybB/OPp2gBMXnCff++izGcAx95kfac1okJWAQJaBdn1F4Mp1WW7U6TQmubwbPO9T5A7pj6H/P1WQ6q7btTwkYRAlo9/L6Wg0QTT2XrDlNCYqeZfrQZ8rVgxv0Cos+5+haKQGDKAFfOtSSNScrQXFze9f54+fyBwe8X7O/MqxXr6SPPp9ekxIwiBLwpT4/vi2HDtVWTacsQVEKtWXS7PK/vuW20fvRsCU/Pz09P1/fDL6vVAkYRAn40njSff6keUd804lL8KEcr5TBdzqbr9brovxD+deD3Kq/g/IJ9EnmVx4eH4fWSwkYRAn4Up8lHmfz7ttgvqUE5+P65nbnCfI+9Zn/409KwCBKwJf63GTZZ8ma5BKUo5Cdf/9cGbT2shIwiBKwTTVGNJWRpdqkKbYEJQTlLVRvah+zed/fwSkBgygB2xxkyZrYEuywoGanPhdvCiVgECVgmz5L1nSe/cgswXLV6wfYO7i7H1XP1aQEDKIEbDOddf/MtXPICyzBlttY9/fy+tp5rKYEDKIEbFNG+WqYaOqcPiGtBH3up9pTOQ7bfl+pEjCIErBNGXGqYaKpc8maqBKUo6jqXRzJ9g9HCRhECejQuWRN59RvOSUYT4ZNK7SnLZNXKwGDKAEdbu+6l6zZ/gPakBL0X87zgL6avFoJGEQJ6NBnOswyZFdb/SmhBHf3e62qv4/W+0qVgEGUgA59fs00X2y7VebHl6DPBKhH1byvVAkYRAnosFp3r6S4fdr9n12C65ub/acV2l91X6kSMIgS0KEMc9VI0bR9yZofXIJfV9c7rJp5DE/PL3/eV6oEDKIEdNtzyZofXIJNj0m5T+bPGQOVgEGUgG59pjfYcobkp5ZgtV5XL/jbfZ7KUwIGUQK69Vnyd8uw+CNLsFgea1qhPX3cV6oEDKIEdJsv9lqy5ueVoIy21Us9K6XcSsAgSkC39aZ7RN6yXPsPK0HnPEvnQAkYRAno9vL6un2+s+L27q7a6tNPKsH2+2XPnxLQSgnoZZ8la769BOUFDFr68StbjnsuhRLQSgnopc+SNZuH9jvrv7cEn79/fn557XMT1Fe2/2biUigBrZSAXvZZsua7SlCetzkJRHmRnbOrNpWH2j7L3qVQAlopAb30W7KmfWr+bynB9qmQRuPuQ5xP1ze3T+WAovEgl0gJaKUE9PLn71e/8tW0zCcuQXm6PgP3ar25ue24+FFcXd90LtR8QZSAVkpAX50nVb5asuaUJRh6p/9kOttyW1T5X19d/LhQSkArJaCvPkvWtM45cZoS3N2XQ4Fd5gRdbx6+upK83myqP750SkArJaCvPkvWtA6dxy5BKdD+P/otj1BNtPfVBfCLpgS0UgL6ms3bF0r8U+t12qOWoHydP9TyAA+Pj+PJ79ottl5wvlxKQCsloK+dl6w5UgkOcijQVA4FZvMLmE9iN0pAKyWgr8enp2rIaGr9+dUxSnA/OtihQBQloJUSMMBuS9YctgTlObb/VoAtlIBWSsAAfWZraN59f8AS3I/Gj08OBXanBLRSAgbYbcmag5SgHAoslg4F9qUEtFICBthtyZr9SzAaT37SD32/kRLQSgkYYL3ZVKNGU3Pq5n1KcHV9c7brRF4iJaCVEjDA0/PzX8OXrNmnBG4QOiwloJUSMEyfJWuquaCNPufDvqCVEjDMDkvWGH3Oh31BKyVgmB2WrDH6nA/7glZKwDBllK8GjqY/l6x5en42+pwP+4JWSsAwm4deS9aUYIwn05vbjomsP1XPwpEoAa2UgGGeX147l6zZQfUsHIkS0EoJGKxzyZodVE/BkSgBrZSAwfosWTNU9RQciRLQSgkYrM+SNUNVT8GRKAGtlIDB+ixZM1T1FByJEtBKCRisz5I1Q1VPwZEoAa2UgF10LlkzVPX4HIkS0EoJ2EWfJWsGqR6fI1ECWikBu+izZM0g1eNzJEpAKyVgF32WrBmkjFCcRvXJN1X7mgRKwC76LFnz4a9fV31GH85Hta9JoATsYsuSNdc3t+PJZLFcPjz+Xm9SCS7L514mhxKwo48la35dXd/dj2bzeTlKeHl9rf7mgxJclmr3kUAJ2NHjU991JZXgslS7jwRKwNEpwWWpdh8JlICjU4LLUu0+EigBR6cEl6XafSRQAo5OCS5LtftIoAQcnRJclmr3kUAJODoluCzV7iOBEnB0SnBZqt1HAiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQDSKQFAOiUASKcEAOmUACCdEgCkUwKAdEoAkE4JANIpAUA6JQBIpwQA6ZQAIJ0SAKRTAoB0SgCQTgkA0ikBQDolAEinBADplAAgnRIApFMCgHRKAJBOCQCy/f33/wPavQjXs/ARnQAAAABJRU5ErkJggg==",
-          extension: "png",
-          OriginalFileName: "foto",
-          FileType: 'image'
-        }
-      )
-
-      this.seletedContent.push(newAttachment)
     }
 
 
     if (this.publicationType == ActionType.edit) {
 
-      if (this.seletedContent.length >= 1) {
+      if (this.publicationFormMV.form.Files.length >= 1) {
         const loader = this.toastService.loading()
 
-        this.publication = {
-          DateIndex: this.publication.DateIndex,
-          DocumentId: this.publication.DocumentId,
-          ProcessId: this.publication.ProcessId,
-          Title: this.pub.Title,
-          Message: this.pub.Message,
-          DatePublication: this.publication.DatePublication,
-          Files: this.seletedContent,
-        }
-
-        this.publicationFormMV.setDataToFrom(this.publication)
         const upload = await this.publicationFormMV.uploadVideosFiles()
 
         if(upload) {
-          this.publication.Files = this.publication.Files.map((e:PublicationAttachmentEntity)=> {
+          this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity)=> {
             if(e.FileType == 'video') {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
@@ -457,15 +358,17 @@ export class NewPublicationPage implements OnInit {
 
         }
 
-        this.publication.Files = this.publication.Files.map( (e: PublicationAttachmentEntity) => ({
+        const publication: any = Object.assign({}, this.publicationFormMV.form)
+
+        publication.Files = publication.Files.map( (e:PublicationAttachmentEntity) => ({
           FileBase64: e.Base64,
           FileExtension: e.FileExtension,
-          OriginalFileName: e.OriginalFileName || 'foto'
+          OriginalFileName:  e.OriginalFileName || 'foto'
         }))
 
         try {
 
-          const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+          const response = await this.publications.UpdatePublication(publication.ProcessId, publication).toPromise()
 
           this.httpErroHandle.httpsSucessMessagge('Editar publicação')
 
@@ -474,7 +377,7 @@ export class NewPublicationPage implements OnInit {
         } catch (error) {
           this.httpErroHandle.httpStatusHandle(error)
           if (error.status == 404) {
-            this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
+            this.PublicationFolderService.deletePost(this.publicationFormMV.form.ProcessId, this.publicationFormMV.form.DocumentId)
             this.goBack();
           }
         } finally {
@@ -490,50 +393,41 @@ export class NewPublicationPage implements OnInit {
     }
     else {
       let time = new Date()
-      if (this.seletedContent.length >= 1) {
-        this.publication = {
-          DateIndex: time,
-          DocumentId: null,
-          ProcessId: this.folderId,
-          Title: this.pub.Title,
-          Message: this.pub.Message,
-          DatePublication: time,
-          OriginalFileName: this.capturedImageTitle || 'foto',
-          Files: this.seletedContent,
-        }
+      if (this.publicationFormMV.form.Files.length >= 1) {
+
 
-        this.publicationFormMV.setDataToFrom(this.publication)
         const upload = await this.publicationFormMV.uploadVideosFiles()
 
         if(upload) {
-          this.publication.Files = this.publication.Files.map((e:PublicationAttachmentEntity) => {
+          this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity) => {
             if(e.FileType == 'video') {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
               e.Base64 = ""
             }
-
-
             return e
           })
 
 
 
+          const publication: any = Object.assign({}, this.publicationFormMV.form)
 
-          this.publication.Files = this.publication.Files.map( (e:PublicationAttachmentEntity) => ({
+          publication.Files = publication.Files.map( (e:PublicationAttachmentEntity) => ({
             FileBase64: e.Base64,
             FileExtension: e.FileExtension,
             OriginalFileName:  e.OriginalFileName || 'foto'
           }))
 
-
-
+          publication.DocumentId = null;
+          publication.ProcessId = this.folderId
 
           const loader = this.toastService.loading()
 
           try {
 
-            await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
+            console.log({publication})
+
+            await this.publications.CreatePublication(publication.ProcessId, publication).toPromise()
             if (this.publicationTitle == '1') {
 
             } else if (this.publicationTitle == '2') {
@@ -572,16 +466,15 @@ export class NewPublicationPage implements OnInit {
   }
 
   clear() {
-    this.capturedImageTitle = '';
-    this.seletedContent = [];
+    this.publicationFormMV.form.Files = [];
   }
 
   deletePublicationImage() {
 
-    this.publication.Files = []
+    this.publicationFormMV.form.Files = []
   }
 
-  setTitle() {
+  setAction() {
     if (this.publicationType == ActionType.newRapid) {
       this.publicationTitle = 'Nova Publicação Rápida';
     }
@@ -590,7 +483,6 @@ export class NewPublicationPage implements OnInit {
     }
     else if (this.publicationType == ActionType.edit) {
       this.publicationTitle = 'Editar Publicação';
-      this.pub = this.publication;
     }
   }
 
@@ -782,218 +674,6 @@ export class NewPublicationPage implements OnInit {
   }
 
 
-
-  /*   async compressVideoBase64(base64String: string, maxWidth: number, maxHeight: number, quality: number): Promise<string> {
-      return new Promise(async (resolve, reject) => {
-        try {
-          // Decode the base64 video string to an ArrayBuffer
-          const videoBuffer = this.base64ToArrayBuffer(this.removeTextBeforeSlash(base64String,','));
-
-          // Create a Blob from the ArrayBuffer
-          const videoBlob = new Blob([videoBuffer], { type: 'video/mp4' });
-
-          // Create an object URL from the Blob
-          const videoObjectUrl = URL.createObjectURL(videoBlob);
-
-          // Create a video element
-          const video = document.createElement('video');
-
-          // Create a source element and set its type attribute
-          const source = document.createElement('source');
-          source.type = 'video/mp4';
-
-          // Set the source URL
-          source.src = videoObjectUrl;
-
-          // Append the source element to the video element
-          video.appendChild(source);
-
-          // Wait for the video to load
-          video.addEventListener('loadedmetadata', async () => {
-            const canvas = document.createElement('canvas');
-            let newWidth = video.videoWidth;
-            let newHeight = video.videoHeight;
-
-            if (newWidth > maxWidth) {
-              newHeight *= maxWidth / newWidth;
-              newWidth = maxWidth;
-            }
-
-            if (newHeight > maxHeight) {
-              newWidth *= maxHeight / newHeight;
-              newHeight = maxHeight;
-            }
-
-            canvas.width = newWidth;
-            canvas.height = newHeight;
-
-            const context = canvas.getContext('2d');
-
-            // Create a function to draw each video frame onto the canvas
-            const drawFrame = () => {
-              context?.drawImage(video, 0, 0, newWidth, newHeight);
-
-              // Convert the canvas to a Blob with the correct MIME type
-              canvas.toBlob(async (blob) => {
-                if (blob) {
-                  // Read the Blob as an ArrayBuffer
-                  const compressedVideoBuffer = await this.readBlobAsArrayBuffer(blob);
-
-                  // Convert the ArrayBuffer back to base64
-                  const compressedBase64 = this.arrayBufferToBase64(compressedVideoBuffer);
-
-                  resolve(compressedBase64);
-                } else {
-                  reject('Error creating compressed video blob.');
-                }
-              }, 'video/mp4', quality);
-
-              // Request the next video frame
-              requestAnimationFrame(drawFrame);
-            };
-
-            // Start drawing frames
-            drawFrame();
-
-            // Start playing the video
-            video.play();
-          });
-
-        } catch (error) {
-          reject(error);
-        }
-      });
-    } */
-
-
-
-
-  /*  async compressVideoBase64(base64String: string, maxWidth: number, maxHeight: number, quality: number): Promise<string> {
-     return new Promise(async (resolve, reject) => {
-       try {
-         // Decode the base64 video string to an ArrayBuffer
-         const videoBuffer = this.base64ToArrayBuffer(this.removeTextBeforeSlash(base64String,','));
-
-         // Create a Blob from the ArrayBuffer
-         const videoBlob = new Blob([videoBuffer], { type: 'video/mp4' });
-
-         // Create an object URL from the Blob
-         const videoObjectUrl = URL.createObjectURL(videoBlob);
-
-         // Create a video element
-         const video = document.createElement('video');
-         video.src = videoObjectUrl;
-
-         // Wait for the video to load metadata
-         video.addEventListener('loadedmetadata', async () => {
-           const canvas = document.createElement('canvas');
-           let newWidth = video.videoWidth;
-           let newHeight = video.videoHeight;
-
-           if (newWidth > maxWidth) {
-             newHeight *= maxWidth / newWidth;
-             newWidth = maxWidth;
-           }
-
-           if (newHeight > maxHeight) {
-             newWidth *= maxHeight / newHeight;
-             newHeight = maxHeight;
-           }
-
-           canvas.width = newWidth;
-           canvas.height = newHeight;
-
-           const context = canvas.getContext('2d');
-           context?.drawImage(video, 0, 0, newWidth, newHeight);
-
-           // Convert the canvas to a Blob with the correct MIME type
-           canvas.toBlob(async (blob) => {
-             if (blob) {
-               // Read the Blob as an ArrayBuffer
-               const compressedVideoBuffer = await this.readBlobAsArrayBuffer(blob);
-
-               // Convert the ArrayBuffer back to base64
-               const compressedBase64 = this.arrayBufferToBase64(compressedVideoBuffer);
-
-               resolve(compressedBase64);
-             } else {
-               reject('Error creating compressed video blob.');
-             }
-           }, 'video/mp4', quality);
-
-         });
-
-       } catch (error) {
-         reject(error);
-       }
-     });
-   } */
-
-
-  /*   async compressVideoBase64(base64String: string, maxWidth: number, maxHeight: number, quality: number): Promise<string> {
-      return new Promise(async (resolve, reject) => {
-        try {
-          // Decode the base64 video string to an ArrayBuffer
-
-          const trimmedBase64 = base64String.trim();
-          console.log(this.removeTextBeforeSlash(trimmedBase64,','))
-          const videoBuffer = this.base64ToArrayBuffer(this.removeTextBeforeSlash(trimmedBase64,','));
-
-          // Create a Blob from the ArrayBuffer
-          const videoBlob = new Blob([videoBuffer], { type: 'video/mp4' });
-
-          // Create an object URL from the Blob
-          const videoObjectUrl = URL.createObjectURL(videoBlob);
-
-          // Create a video element
-          const video = document.createElement('video');
-          video.src = videoObjectUrl;
-
-          // Wait for the video to load metadata
-          video.addEventListener('loadedmetadata', async () => {
-            const canvas = document.createElement('canvas');
-            let newWidth = video.videoWidth;
-            let newHeight = video.videoHeight;
-
-            if (newWidth > maxWidth) {
-              newHeight *= maxWidth / newWidth;
-              newWidth = maxWidth;
-            }
-
-            if (newHeight > maxHeight) {
-              newWidth *= maxHeight / newHeight;
-              newHeight = maxHeight;
-            }
-
-            canvas.width = newWidth;
-            canvas.height = newHeight;
-
-            const context = canvas.getContext('2d');
-            context?.drawImage(video, 0, 0, newWidth, newHeight);
-
-            // Convert the canvas to a Blob
-            canvas.toBlob(async (blob) => {
-              if (blob) {
-                // Read the Blob as an ArrayBuffer
-                const compressedVideoBuffer = await this.readBlobAsArrayBuffer(blob);
-
-                // Convert the ArrayBuffer back to base64
-                const compressedBase64 = this.arrayBufferToBase64(compressedVideoBuffer);
-
-                resolve(compressedBase64);
-              } else {
-                reject('Error creating compressed video blob.');
-              }
-            }, 'video/mp4', quality);
-
-          });
-
-        } catch (error) {
-          reject(error);
-        }
-      });
-    } */
-
   private base64ToArrayBuffer(base64: string): ArrayBuffer {
     const binaryString = window.atob(base64);
     const len = binaryString.length;
@@ -1031,27 +711,7 @@ export class NewPublicationPage implements OnInit {
   }
 
   deleteFromSeletedContent(index) {
-    this.seletedContent.splice(index, 1)
-  }
-
-
-
-  async uploadChunk() {
-    let time = new Date()
-
-    this.publication = {
-      DateIndex: time,
-      DocumentId: null,
-      ProcessId: this.folderId,
-      Title: this.pub.Title,
-      Message: this.pub.Message,
-      DatePublication: time,
-      OriginalFileName: this.capturedImageTitle || 'foto',
-      Files: this.seletedContent,
-    }
-
-
-
+    this.publicationFormMV.form.Files.splice(index, 1)
   }
 
   chossePhotoOrVideo() {
@@ -1086,11 +746,11 @@ export class NewPublicationPage implements OnInit {
 
               }
               )
-              this.seletedContent.push(fileObject)
+              this.publicationFormMV.form.Files.push(fileObject)
             })
             .catch((err) => console.error(err));
         } else {
-          if (this.seletedContent.length === 0)
+          if (this.publicationFormMV.form.Files.length === 0)
             this.filesSizeSum = 0
 
           this.httpErrorHandle.validationMessagge('filessize')
@@ -1112,3 +772,71 @@ export class NewPublicationPage implements OnInit {
       return true;
   }
 }
+
+
+
+import { Observable, of, Subject } from 'rxjs';
+import { tap, switchMap, delay, map } from 'rxjs/operators';
+
+function shareResponse<T>(): MethodDecorator {
+  return function (
+    target: any,
+    propertyKey: string | symbol,
+    descriptor: PropertyDescriptor
+  ): PropertyDescriptor {
+    const originalMethod = descriptor.value;
+
+    descriptor.value = function (...args: any[]): Observable<T> {
+      // Create a subject to broadcast the response
+      const responseSubject = new Subject<T>();
+
+      // Use switchMap to ensure only one subscription is active at a time
+      return responseSubject.pipe(
+        switchMap(() => {
+          // If no ongoing execution, trigger the original method
+          if (!this.isExecuting) {
+            this.isExecuting = true;
+
+            // Call the original method
+            const result = originalMethod.apply(this, args);
+
+            // Convert the result to an observable if it's not already
+            const resultObservable = result instanceof Observable ? result : of(result);
+
+            // Tap into the result to broadcast it to all subscribers
+            return resultObservable.pipe(
+              tap((response) => {
+                responseSubject.next(response);
+                this.isExecuting = false;
+              })
+            );
+          } else {
+            // If ongoing execution, return an empty observable
+            return of();
+          }
+        })
+      );
+    };
+
+    return descriptor;
+  };
+}
+
+class ApiService {
+  private isExecuting = false;
+
+  @shareResponse<number>()
+  fetchData(): Observable<number> {
+    // Simulate fetching data locally (replace it with your own data source)
+    const localData: number[] = [1, 2, 3, 4, 5];
+    return of(localData.reduce((sum, value) => sum + value, 0));
+  }
+}
+
+const apiService = new ApiService();
+
+// Example usage
+apiService.fetchData().subscribe((result) => console.log('Subscriber 1:', result));
+
+// This subscriber will receive the same result without triggering a new execution
+apiService.fetchData().subscribe((result) => console.log('Subscriber 2:', result));
diff --git a/src/app/shared/publication/upload/upload-streaming.service.ts b/src/app/shared/publication/upload/upload-streaming.service.ts
index 8f8053d7b..419e81128 100644
--- a/src/app/shared/publication/upload/upload-streaming.service.ts
+++ b/src/app/shared/publication/upload/upload-streaming.service.ts
@@ -21,6 +21,7 @@ export class UploadStreamingService {
     private CMAPIService: CMAPIService,
     private sanitizer: DomSanitizer
   ) {
+    this.CMAPIService
     window["sanitizer"] = this.sanitizer
   }
 }
@@ -75,35 +76,38 @@ class UploadFileUseCase {
 
         if(needUpload) {
 
-          // upload every chunk at onces
-          const request = readAndUploadChunk(index).then(async(uploadRequest) => {
+          // // upload every chunk at onces
+          // const request = readAndUploadChunk(index).then(async(uploadRequest) => {
 
-            if(uploadRequest.isErr()) {
-              connection = false
-              const pingRequest = await this.CMAPIService.ping()
-              if( pingRequest.isErr()) {
-                errorMessage = UploadError.noConnection
-              } else {
-                errorMessage = UploadError.slow
-              }
-            }
+          //   if(uploadRequest.isErr()) {
 
-          })
-          allRequest.push(request)
+          //     if(connection) {
+          //       connection = false
+          //       const pingRequest = await this.CMAPIService.ping()
+          //       if( pingRequest.isErr()) {
+          //         errorMessage = UploadError.noConnection
+          //       } else {
+          //         errorMessage = UploadError.slow
+          //       }
+          //     }
+          //   }
+
+          // })
+          // allRequest.push(request)
 
           // one by one chunk upload
-          // const request = readAndUploadChunk(index)
-          // allRequest.push(request)
-          // const uploadRequest = await request
+          const request = readAndUploadChunk(index)
+          allRequest.push(request)
+          const uploadRequest = await request
 
-          // if(uploadRequest.isErr()) {
-          //   const pingRequest = await this.CMAPIService.ping()
-          //   if( pingRequest.isErr()) {
-          //     return resolve(err(UploadError.noConnection))
-          //   } else {
-          //     return resolve(err(UploadError.slow))
-          //   }
-          // }
+          if(uploadRequest.isErr()) {
+            const pingRequest = await this.CMAPIService.ping()
+            if( pingRequest.isErr()) {
+              return resolve(err(UploadError.noConnection))
+            } else {
+              return resolve(err(UploadError.slow))
+            }
+          }
 
         }
       }
@@ -183,7 +187,7 @@ interface IPublicationFormModelEntity  {
   Title: any
   Message: any
   DatePublication: any
-  Files: PublicationAttachmentEntity[]
+  Files?: PublicationAttachmentEntity[]
 }
 
 interface PublicationAttachmentEntityParams {
@@ -196,22 +200,24 @@ interface PublicationAttachmentEntityParams {
 
 export class PublicationFormModel implements IPublicationFormModelEntity {
   constructor() {}
-  DateIndex: any;
-  DocumentId: any;
-  ProcessId: any;
+  DateIndex: any = new Date()
+  DocumentId: any = null
+  ProcessId: any  = null
   Title: any;
   Message: any;
-  DatePublication: any;
+  DatePublication = new Date()
   OriginalFileName: string;
-  Files: PublicationAttachmentEntity[];
+  Files: PublicationAttachmentEntity[] = []
 
   hasSet = false
 
   setData(data: IPublicationFormModelEntity) {
+    if(data.Files) {
+      data.Files = []
+    }
     if(!this.hasSet) {
       Object.assign(this, data)
     }
-
     this.hasSet = true
   }
 }
@@ -219,7 +225,7 @@ export class PublicationFormModel implements IPublicationFormModelEntity {
 export class PublicationFormMV {
 
   private UploadFileUseCase = new UploadFileUseCase()
-  private form = new PublicationFormModel()
+  form = new PublicationFormModel()
   ObjectMergeNotification =  new ObjectMergeNotification()
 
   constructor() {
@@ -329,6 +335,24 @@ export class PublicationFormMV {
     })
 
   }
+
+  get uploadPercentage() {
+
+    const videosFiles = this.getVideoFiles()
+    const percentageArray = videosFiles.map((e) => e.chucksManager.calculatePercentage())
+
+    // Check if the array is not empty
+    if (percentageArray.length === 0) {
+      return null;
+    }
+
+    let sum = percentageArray.reduce((acc, percentage) => acc + percentage, 0);
+
+    // Calculate the average percentage
+    let averagePercentage = sum / percentageArray.length;
+
+    return averagePercentage;
+  }
 }
 
 
diff --git a/src/global.scss b/src/global.scss
index 9f4d8163f..529b90b15 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -787,7 +787,7 @@ app-header-no-search  .ion-toolbar{
 
 
 
-    }
+  }
 
 
 // mobile
@@ -1679,3 +1679,40 @@ h5, .buttons{
   width: 450px;
   height: 350px;
 }
+
+
+
+
+
+
+
+
+.aside-gabinete-modal{
+  .modal-wrapper{
+      position: absolute;
+      right: 0px;
+      height: 100%;
+      width: 400px;
+  }
+}
+
+
+.aside-gabinete-modal::part(content) {
+  position: absolute;
+  height: 100%;
+  width: 348px;
+  top: 0px !important;
+  border: 0px !important;
+  max-height: 100% !important;
+  right: 0px !important;
+  /* min-height: 100%; */
+  left: auto !important;
+}
+
+
+.aside-gabinete-modal::part(background) {
+  position: absolute;
+  right: 0px;
+  height: 100%;
+  width: 400px;
+}
diff --git a/src/style/ios.scss b/src/style/ios.scss
index cb2053a12..cb7af3340 100644
--- a/src/style/ios.scss
+++ b/src/style/ios.scss
@@ -39,11 +39,12 @@
 
 
 
-.aside-modal::part(content) {
-    position: absolute;
-    right: 0px;
-    height: 100%;
-    width: 400px;
+.aside-mode-poppover::part {
+  position: absolute;
+  left: calc(100% - 400px);
+  height: 1000px;
+  width: 400px;
+  top: 0px;
 }
 
 .modal-width-100-width-background::part(content),
@@ -141,16 +142,34 @@ ion-modal::part(content) {
 
 
 .transparentblack-modal::part(content) {
-    --background: rgb(44, 39, 45);
+  --background: rgb(44, 39, 45);
+}
+
+.exp-options::part(content) {
+  width: 100% !important;
+  left: 0 !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  top: unset !important;
+}
+
+.exp-options-desktop::part(content) {
+  width: 400px !important;
+  height: 100% !important;
+  left: calc(100% - 400px) !important;
+  bottom: 0 !important;
+  top: 0 !important;
 }
 
 
-.exp-options::part(content) {
-    width: 100% !important;
-    left: 0 !important;
-    bottom: 0 !important;
-    right: 0 !important;
-    top: unset !important;
+
+
+.exp-options-gabinete::part(background), .exp-options-gabinete::part(content),  .exp-options-gabinete {
+  width: 50% !important;
+  left: 0 !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  top: unset !important;
 }
 
 
@@ -201,4 +220,4 @@ ion-toolbar {
 
 .header-fix {
     padding-top: var(--ion-safe-area-top);
-}
\ No newline at end of file
+}