diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index d6cd2a7e0..4dc4e6002 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -238,6 +238,10 @@ const routes = [
   },
  {
     path: 'set-room-owner',
     loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule)
+  },
+  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
   }
 
 
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 2964c13c1..f436776da 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -75,17 +75,6 @@ const routes: Routes = [
         ],
 
       },
-      // {
-      //   path: 'login',
-      //   children: [
-      //     {
-      //       path:'',
-      //       loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule)
-      //     },
-      //   ],
-      //   canActivate: [LoginGuard]
-
-      // },
       {
         path: 'agenda',
         children: [
@@ -244,6 +233,19 @@ const routes: Routes = [
               },
             ]
           },
+          {
+            path: 'diplomas-gerar',
+            children: [
+              {
+                path: '',
+                loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then(m => m.DiplomasGerarPageModule),
+              },
+              {
+                path:':SerialNumber/:caller',
+                loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module').then(m => m.DiplomasGerarPageRoutingModule),
+              },
+            ]
+          },
           {
             path:'event-list',
             children: [
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index 6555495ab..12d6328fd 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -15,15 +15,16 @@ export class EmendMessageModalPage implements OnInit {
     public ThemeService: ThemeService
   ) {
     this.emendMessage = '';
-   }
+  }
 
-  ngOnInit() {
+  ngOnInit() {}
+
+  close() {
+    this.modalController.dismiss({option:'close', note: this.emendMessage});
   }
-  close(){
-    this.modalController.dismiss('');
-  }
-  save(){
-    this.modalController.dismiss(this.emendMessage);
+
+  save() {
+    this.modalController.dismiss({option:'save', note: this.emendMessage});
   }
 
 }
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 6d54d86ef..d9178ec38 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -106,7 +106,7 @@ export class EventActionsPopoverPage implements OnInit {
     .then( async (res) => {
       
       
-      if(res.data !== ''){
+      if(res.data.note !== ''){
         let body = { "serialNumber": this.serialNumber, 
         "action": "Emendar",
             "dataFields": {
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index 651625538..ddae3b550 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -186,7 +186,7 @@ ion-button{
   }
 }
 
-@media only screen and (min-width: 1140px){
+@media only screen and (min-width: 1140px) {
   .content{
     width: 75%;
   }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 34c53fd33..eaaa3f150 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -1,10 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { momentG }  from 'src/plugin/momentG';
 
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@@ -93,9 +92,6 @@ export class DiplomaAssinarPage implements OnInit {
       }
 
       this.fulltask = res;
-      
-
-      
 
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
@@ -188,7 +184,6 @@ export class DiplomaAssinarPage implements OnInit {
 
   }
 
-
   toDateString(e) {
     return new Date(e).toDateString()
   }
@@ -196,5 +191,4 @@ export class DiplomaAssinarPage implements OnInit {
     this.modalController.dismiss();
   }
 
-
 }
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..7971f1204
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  },
+  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..8468ae276
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
+import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule,
+    HeaderPageModule,
+    BtnModalDismissPageModule
+  ],
+  declarations: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..b2d4bfe92
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,111 @@
+<ion-header class="ion-no-border">
+  <app-header > </app-header>
+</ion-header>
+
+
+<ion-header class="ion-no-border header-2">
+  <div class="title">
+    <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
+    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="theicon btn-refresh">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+    <div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas por Assinar</h3></div>
+  </div>
+</ion-header>
+<ion-content>
+
+  <div class="main-content width-100 overflow-y-auto height-100">
+
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+    </ion-refresher>
+    <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+
+    <div class="width-100" *ngIf="diplomasList.length >= 1">
+
+      <div *ngIf="diplomasList">
+        <ion-list >
+          <!-- *ngFor = "let task of parecerList; let i = index"
+          (click)="viewExpedientDetail(task.SerialNumber)" -->
+          <div
+            class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor = "let task of diplomasList"
+            (click)="goToDiploma(task.SerialNumber)"
+          >
+            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
+            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="subject">
+                  <ion-label>{{ task.Folio }}</ion-label>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <div class="exp-remetente">
+                  <ion-label>{{task.Senders}}</ion-label>
+                </div>
+              </div>
+              <div class="exp-middle-detail">
+                <div class="exp-workflow">
+                  <span class="label">{{task.activityInstanceName}}</span>
+                </div>
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </ion-list>
+      </div>
+    </div>
+
+    <!-- Empty -->
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+</ion-content>
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..69e728cfa
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,256 @@
+@import '~src/function.scss';
+
+:host{
+  margin: 0;
+}
+
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+
+ion-content, .header-2, .main-content{
+  padding: 30px 20px 0 20px !important;
+}
+
+.main-content {
+  padding-top: 0px !important;
+}
+
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+    .header-top{
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+      .middle{
+        padding: 0!important;
+        float: left;
+        width: 280px;
+        margin: 2.5px 0 0 5px;
+        display: flex;
+        align-items: center;
+
+        }
+        .right{
+          padding: 0!important;
+          float: right;
+          font-size: 25px;
+          color: #0782c9;
+          margin: 5px 0 0 0;
+        }
+      }
+      .header-bottom{
+         width: 310px;
+        overflow: auto;
+        margin: 0 auto;
+
+        .header-bottom-icon{
+          width: 30px;
+          font-size: 25px;
+          float: left;
+          padding: 2px;
+        }
+        .header-bottom-contacts{
+          width: 275px;
+          font-size: 15px;
+          color: #797979;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          float: left;
+            padding: 5px;
+          margin: 1px;
+        }
+      }
+
+        .title{
+          font-size: 25px;
+          overflow: auto;
+          float: left;
+          padding-top: 4px;
+          padding-left: 5px;
+        }
+        .div-icon{
+          width: 40px;
+          float: right;
+          font-size: 35px;
+          overflow: auto;
+          padding: 1px;
+        }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #ffb703;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    font-size: 18px;
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: 16px !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..5218ec16a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,102 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+
+@Component({
+  selector: 'app-diplomas-gerars',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+  //profile:string;
+  diplomasList:DailyWorkTask[] = [];
+  showLoader: boolean;
+  totalDocs:any;
+  serialNumber:string;
+ 
+  @Input() profile:string;
+  @Input() segment:string;
+ 
+  customTaskPipe = new CustomTaskPipe()
+  skeletonLoader = true
+ 
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    private alertService: AlertService,
+    private router: Router,
+    private sortService: SortService,
+   public ThemeService: ThemeService) {
+    }
+ 
+   ngOnInit() {
+     const location = window.location
+     const pathname = location.pathname + location.search
+ 
+     this.LoadList()
+ 
+     this.router.events.forEach((event) => {
+       if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
+         if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+           this.refreshing()
+         } else {
+           this.LoadList()
+         }
+       }
+     });
+   }
+ 
+ 
+ 
+   goToDiploma(serialNumber:any){
+     this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']);
+ 
+   }
+ 
+  async refreshing() {
+     setTimeout(() => {
+       this.LoadList();
+     }, 1000);
+   }
+ 
+   doRefresh(event) {
+ 
+     setTimeout(() => {
+       this.LoadList();
+     }, 1000);
+   }
+ 
+   async LoadList(){
+ 
+     this.skeletonLoader = true
+ 
+     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+     this.diplomasList = [];
+ 
+     // let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
+     
+     diplomas.forEach(element => {
+       let task: customTask = this.customTaskPipe.transform(element)
+       this.diplomasList.push(task);
+     });
+ 
+     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
+ 
+ 
+     this.skeletonLoader = false
+     this.showLoader = false;
+ 
+   }
+ 
+   goBack() {
+     this.router.navigate(['/home/gabinete-digital']);
+     // window.history.back()
+   }
+}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..63a34f256
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..33f015d4d
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+import { HeaderPageModule } from 'src/app/shared/header/header.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule,
+    HeaderPageModule
+  ],
+  declarations: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..60beaf445
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,128 @@
+<ion-header class="ion-no-border">
+  <app-header > </app-header>
+</ion-header>
+
+<ion-content class="container-wrapper">
+  <div class="main-content d-flex height-100 width-100 overflow-hidden">
+    <div class="content d-flex flex-column" *ngIf="task">
+      <div class="main-header">
+        <div class="title-content width-100 d-flex justify-space-between">
+          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1 ">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon" (click)="openOptions()">
+              <!-- <ion-menu-button autoHide="false">
+                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+              </ion-menu-button> -->
+              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="line"></div>
+      <div class="middle-content">
+        <h5 *ngIf="intervenientes">Intervenientes</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <div *ngFor="let interveniente of intervenientes">
+              <p>{{interveniente.Name}}</p>
+            </div>
+          </ion-label>
+        </ion-item>
+        <div *ngIf="cc.length > 0">
+          <h5>Com conhecimento</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label>
+              <div *ngFor="let c of cc">
+                <p>{{c.Name}}</p>
+              </div>
+            </ion-label>
+          </ion-item>
+        </div>
+        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+          </ion-item>
+        </div>
+      </div>
+      <div class="bottom-content width-100">
+        <ion-list>
+          <h5>Documentos Anexados</h5>
+          <ion-item *ngFor="let attachment of attachments"
+            class="ion-no-margin ion-no-padding cursor-pointer"
+          >
+            <ion-label
+              (click)="viewDocument(attachment.DocId, attachment)"
+            >
+              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
+            </ion-label>
+        </ion-item>
+        </ion-list>
+      </div>
+    </div>
+
+    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
+      <div class="buttons">
+        <button (click)="Assinar()" class="btn-cancel" shape="round" >Assinado</button>
+        <div class="solid"></div>
+      </div>
+    </div>
+
+    <div *ngIf="!task">
+      <ion-list>
+        <ion-list-header>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </ion-label>
+        </ion-list-header>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <button color="medium" shape="round" expand="block">
+          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </button>
+      </ion-list>
+    </div>
+  </div>
+</ion-content>
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..69e728cfa
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,256 @@
+@import '~src/function.scss';
+
+:host{
+  margin: 0;
+}
+
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+
+ion-content, .header-2, .main-content{
+  padding: 30px 20px 0 20px !important;
+}
+
+.main-content {
+  padding-top: 0px !important;
+}
+
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+    .header-top{
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+      .middle{
+        padding: 0!important;
+        float: left;
+        width: 280px;
+        margin: 2.5px 0 0 5px;
+        display: flex;
+        align-items: center;
+
+        }
+        .right{
+          padding: 0!important;
+          float: right;
+          font-size: 25px;
+          color: #0782c9;
+          margin: 5px 0 0 0;
+        }
+      }
+      .header-bottom{
+         width: 310px;
+        overflow: auto;
+        margin: 0 auto;
+
+        .header-bottom-icon{
+          width: 30px;
+          font-size: 25px;
+          float: left;
+          padding: 2px;
+        }
+        .header-bottom-contacts{
+          width: 275px;
+          font-size: 15px;
+          color: #797979;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          float: left;
+            padding: 5px;
+          margin: 1px;
+        }
+      }
+
+        .title{
+          font-size: 25px;
+          overflow: auto;
+          float: left;
+          padding-top: 4px;
+          padding-left: 5px;
+        }
+        .div-icon{
+          width: 40px;
+          float: right;
+          font-size: 35px;
+          overflow: auto;
+          padding: 1px;
+        }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #ffb703;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    font-size: 18px;
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: 16px !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..167362b83
--- /dev/null
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,197 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, PopoverController } from '@ionic/angular';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { momentG }  from 'src/plugin/momentG';
+
+import { ActivatedRoute } from '@angular/router';
+import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
+import { ToastService } from 'src/app/services/toast.service';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
+
+
+@Component({
+  selector: 'app-diplomas-gerar',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+
+  serialnumber: string;
+  profile: string;
+  task: any
+  fulltask: any
+  intervenientes: any;
+  cc: any = [];
+  attachments:any;
+  customDate: any;
+  caller:string;
+
+  constructor(
+    private processes: ProcessesService,
+    public popoverController: PopoverController,
+    private modalController: ModalController,
+    private activatedRoute: ActivatedRoute,
+    private toastService: ToastService,
+    private RouteService: RouteService,
+    public ThemeService: ThemeService
+  ) {
+    this.activatedRoute.paramMap.subscribe(params => {
+      if(params["params"].SerialNumber) {
+        this.serialnumber = params["params"].SerialNumber;
+      }
+      if(params["params"].caller) {
+        this.caller = params["params"].caller;
+      }
+    });
+
+  }
+
+  ngOnInit() {
+    this.profile = "mdgpr";
+    this.LoadTaskDetail(this.serialnumber);
+  }
+
+  goBack() {
+    this.RouteService.goBack();
+  }
+
+  async openOptions(taskAction?: any) {
+    const popover = await this.popoverController.create({
+      component: DeplomaOptionsPage,
+      cssClass: 'exp-options',
+      componentProps: {
+        serialNumber: this.task.SerialNumber,
+        task: this.task,
+        showEnviarPendentes: false
+      },
+      translucent: true
+    });
+    return await popover.present();
+  }
+
+  async LoadTaskDetail(serial: string) {
+
+    this.processes.GetTask(serial).subscribe(res => {
+      this.task = {
+        "SerialNumber": res.serialNumber,
+        "Folio": res.workflowInstanceDataFields.Subject,
+        "Senders": res.originator.email,
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
+        "Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note,
+        "FolderId": res.workflowInstanceDataFields.FolderID,
+        "FsId": '361',
+        "DocId": res.workflowInstanceDataFields.DispatchDocId,
+        "WorkflowName": res.workflowDisplayName,
+        "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
+        "activityInstanceName": res.activityInstanceName,
+      }
+
+      this.fulltask = res;
+
+      let thedate = new Date(this.task.CreateDate);
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+
+      this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
+        this.intervenientes = users.filter(user=>{
+          return user.Type == 'I';
+        });
+        this.cc = users.filter(user=>{
+          return user.Type == 'CC';
+        });
+        
+
+      });
+      this.getDocumentDetails(this.task.FolderId, '361');
+
+    }, (error)=>{
+      try {
+        this.toastService._badRequest('Processo não encontrado')
+        this.goBack()
+      } catch (e) {
+        window.history.back();
+      }   finally {
+        if(error.status ==  0) {
+          this.toastService._badRequest('Não é possível  visualizar este processo no modo offline')
+        } else {
+          this.toastService._badRequest('Processo não encontrado')
+        }
+      }
+    });
+
+  }
+
+  async viewDocument(DocId:string, Document) {
+
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        trustedUrl: '',
+        file: {
+          title: Document.Assunto,
+          url: '',
+          title_link: '',
+        },
+        Document,
+        applicationId: Document.ApplicationId,
+        docId: Document.DocId || Document.SourceId,
+        folderId: this.task.FolderId,
+        task: this.fulltask
+      },
+      cssClass: 'modal modal-desktop'
+    });
+    await modal.present();
+
+  }
+
+  getDocumentDetails(forlderId:string, applicationId:string) {
+    this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
+      this.attachments = res.Documents;
+      
+      
+    })
+  }
+
+  async Assinar(){
+    let body = {
+      "serialNumber": this.serialnumber,
+      "action": "Assinado",
+      "ActionTypeId": 99999842,
+      "dataFields": {
+        "ReviewUserComment": '',
+      },
+      "AttachmentList": {},
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+
+      this.toastService._successMessage(false, ()=>{
+        this.goBack();
+      })
+    } catch (error) {
+      this.toastService._badRequest()
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
+  toDateString(e) {
+    return new Date(e).toDateString()
+  }
+  close() {
+    this.modalController.dismiss();
+  }
+
+
+}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 64b9e95bc..2cdd2458f 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then( async (res) => {
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { 
           "serialNumber": serialNumber, 
           "action": "Emendar",
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index e6852b302..f5acecbc1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -78,8 +78,6 @@ export class ApproveEventPage implements OnInit {
 
   ngOnInit() {
     
-    
-
     this.getTask();
     this.backgroundservice.registerBackService('Online', () => {
       this.getTask();
@@ -123,7 +121,6 @@ export class ApproveEventPage implements OnInit {
   
           this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
   
-          let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
           this.loadedAttachments = this.loadedEvent.Documents;
           
       })
@@ -227,16 +224,6 @@ export class ApproveEventPage implements OnInit {
       loader.remove()
     }
 
-
-    /* this.approveEventDismiss.emit({
-      "serialNumber": serialNumber,
-      "action": "Aprovar",
-      "saveData": {
-        loadedEvent: this.loadedEvent,
-        today: this.today,
-        customDate: this.customDate
-      }
-    }); */
   }
 
   async emendTask(serialNumber: string) {
@@ -284,12 +271,9 @@ export class ApproveEventPage implements OnInit {
 
         }
         else {
-          //this.alertService.presentAlert('Operação cancelada!');
         }
       });
 
-    //this.openEmendMessageModal(serialNumber);
-    //this.goBack();
   }
 
   async rejeitar(serialNumber: string) {
@@ -349,6 +333,7 @@ export class ApproveEventPage implements OnInit {
   openMenu() {
     this.menu.open();
   }
+
   async openEmendMessageModal(serialNumber: string) {
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
@@ -363,7 +348,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss().then(async (res) => {
       
 
-      if (res.data !== '') {
+      if (res.data.note !== '') {
         let body = {
           "serialNumber": serialNumber,
           "action": "Emendar",
@@ -409,8 +394,7 @@ export class ApproveEventPage implements OnInit {
         serialNumber: serialNumber,
         InstanceId: this.InstanceId
       },
-      cssClass: 'modal modal-desktop',
-      // backdropDismiss: false
+      cssClass: 'modal modal-desktop'
     });
 
     await modal.present();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
index 87eedcb46..c7a77a59c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
@@ -1,59 +1,63 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { GabineteDigitalPage } from './gabinete-digital.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GabineteDigitalPage
-  },
-  {
-    path: 'expediente',
-    loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
-  },
-  {
-    path: 'discart-expedient-modal',
-    loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
-  },
-  {
-    path: 'despachos',
-    loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
-  },
-  {
-    path: 'pedidos',
-    loadChildren: () => import('./pedidos/pedidos.module').then( m => m.PedidosPageModule)
-  },
-  {
-    path: 'pendentes',
-    loadChildren: () => import('./pendentes/pendentes.module').then( m => m.PendentesPageModule)
-  },
-  {
-    path: 'despachos-pr',
-    loadChildren: () => import('./despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
-  },
-  {
-    path: 'diplomas',
-    loadChildren: () => import('./diplomas/diplomas.module').then( m => m.DiplomasPageModule)
-  },
-  {
-    path: 'expedientes-pr',
-    loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
-  },
-  {
-    path: 'diplomas-assinar',
-    loadChildren: () => import('./diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GabineteDigitalPage } from './gabinete-digital.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: GabineteDigitalPage
+  },
+  {
+    path: 'expediente',
+    loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
+    path: 'discart-expedient-modal',
+    loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
+  },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
+  {
+    path: 'pedidos',
+    loadChildren: () => import('./pedidos/pedidos.module').then( m => m.PedidosPageModule)
+  },
+  {
+    path: 'pendentes',
+    loadChildren: () => import('./pendentes/pendentes.module').then( m => m.PendentesPageModule)
+  },
+  {
+    path: 'despachos-pr',
+    loadChildren: () => import('./despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
+  },
+  {
+    path: 'diplomas',
+    loadChildren: () => import('./diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+  },
+  {
+    path: 'expedientes-pr',
+    loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+  },
+  {
+    path: 'diplomas-assinar',
+    loadChildren: () => import('./diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+  },
  {
+    path: 'diplomas-gerar',
+    loadChildren: () => import('./diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule)
   },
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class GabineteDigitalPageRoutingModule {}
+
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class GabineteDigitalPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 8249a4664..51ed4ca86 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -28,6 +28,7 @@ import { PedidosPageModule } from 'src/app/shared/gabinete-digital/pedidos/pedid
 import { DespachosPageModule } from 'src/app/shared/gabinete-digital/despachos/despachos.module';
 import { PendentesPageModule } from 'src/app/shared/gabinete-digital/pendentes/pendentes.module';
 import { DespachosPrPageModule } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module';
+import { DiplomasGerarPageModule } from 'src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module';
 import { DiplomasPageModule } from 'src/app/shared/gabinete-digital/diplomas/diplomas.module';
 import { ExpedientesPrPageModule } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module';
 import { DiplomasAssinarPageModule } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module';
@@ -58,6 +59,7 @@ import { AllProcessesPageModule } from 'src/app/shared/gabinete-digital/all-proc
     DiplomasAssinarPageModule,
     EmptyContainerPageModule,
     BtnModalDismissPageModule,
+    DiplomasGerarPageModule
 
   ],
   declarations: [
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index b8566f650..d1914912d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -253,8 +253,23 @@
                 </div>
                 <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas assinados PR</p>
                 <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas</p>
+                
                 <p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
               </div>
+
+
+              <div *ngIf="SessionStore.user.Profile == 'Consultant'"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                </div>
+
+                <p class="text-center exp-card-title" >Diplomas por elaborar</p>
+                <p class="text-center exp-card-content">{{  despachoprstore.count }} <span class="title1">Documentos</span></p>
+
+              </div>
   
               <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasAssinar'" [class.active]="selectedElement == 'DiplomasAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
@@ -371,6 +386,8 @@
         <app-diplomas-assinar class=" height-100 flex-column" [style.display]="showDiplomasAssinar ? 'flex' : 'none'"></app-diplomas-assinar>
         <app-expedientes-pr [profile]="profile" class=" height-100 flex-column" [style.display]="showExpedientesPr ? 'flex' : 'none'" ></app-expedientes-pr>
         <app-signed-diploma  [profile]="profile" class=" height-100 flex-column"  [style.display]="showSignedDiploma ? 'flex' : 'none'" ></app-signed-diploma>
+
+        <app-diplomas-gerars [profile]="profile" class="height-100 flex-column"  [style.display]="showDiplomasGerar ? 'flex' : 'none'"></app-diplomas-gerars>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 1094eb55f..458d4dfcc 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -114,9 +114,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   despachoprstore = DespachosprStore;
   totalDocumentStore = TotalDocumentStore
   deplomasStore = DeplomasStore
+
+  showDiplomasGerar = false
   //
   // pipe
 
+  SessionStore = SessionStore
   expedienteTaskPipe = new ExpedienteTaskPipe();
   
   loadCount = false
@@ -532,6 +535,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     this.showExpedientesPr = false;
     this.showExpedientDetail = false;
     this.showSignedDiploma = false
+    this.showDiplomasGerar = false
   }
 
 
@@ -849,6 +853,24 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     }
   }
 
+  openDiplomaPorElaborar(segment: string) {
+
+    let navigationExtras: NavigationExtras = { queryParams: { "gerarDiplomas": true }}
+
+    this.segment = segment;
+
+    if (window.innerWidth < 701) {
+      // this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
+    }
+    else {
+      this.closeAllDesktopComponents();
+      this.segment = segment;
+      let navigationExtras: NavigationExtras = { queryParams: { "gerarDiplomas": true, } };
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      this.showDiplomasGerar = true
+    }
+  }
+
   openDiplomasAssinarPage() {
     this.closeAllDesktopComponents();
     if (window.innerWidth < 701) {
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 6c36d15cc..b2930b28c 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -171,8 +171,7 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
     .then( async (res) => {
       
-
-      if(res.data !== '') {
+      if(res.data.note !== '') {
         let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
@@ -192,8 +191,10 @@ export class ApproveEventPage implements OnInit {
           loader.remove()
         }
       }
-      else{
-        this.toastService._badRequest('É necessário adicionar uma nota');
+      else {
+        if(res.data.option == 'save') {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
       } 
     });
 
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index b145d349d..d570c4f78 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -2,7 +2,6 @@
   <!-- Edit event for Inicio -->
   <div class="main-content height-100 d-flex">
   
-
     <div class="content d-flex flex-column width-md-100 height-100">
 
       <div class="main-header pt-30 px-20 background-white pb-15">
@@ -372,6 +371,6 @@
 <ion-footer class="background-whit">
   <div class="buttons">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="reenviar()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
   </div>
 </ion-footer>
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 90226899d..cdea91994 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
 
   async getTask() {
 
-    this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
+    this.processes.GetTask(this.serialNumber).subscribe( (result) => {
       this.eventProcess = result
 
       this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
@@ -345,6 +345,16 @@ export class EditEventToApprovePage implements OnInit {
 
   }
 
+  async gravasAction() {
+    
+    await this.save();
+
+    if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
+      this.reenviar();
+    }
+
+  }
+
   async reenviar() {
     let body = {
       serialNumber: this.eventProcess.serialNumber,
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 1eaa3e04d..42857aabc 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -88,7 +88,7 @@ export class AllProcessesPage implements OnInit {
     if(SessionStore.user.Profile != 'Consultant') {
       allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
     } else {
-      console.log('!!//!!',allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma'))
+      console.log('!!//!!', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma'))
     }
     
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
@@ -152,9 +152,6 @@ export class AllProcessesPage implements OnInit {
 
   setFormatDate(start: any, end: any, allday: boolean) {
     let customDate;
-    /* start = new Date();
-    end= new Date("2021-08-04T18:01:04.753Z"); */
-    //end = new Date("2021-09-04T18:01:04.753Z");
 
     const totalSeconds = Math.floor((end - (start)) / 1000);;
     const totalMinutes = Math.floor(totalSeconds / 60);
@@ -213,7 +210,7 @@ export class AllProcessesPage implements OnInit {
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
-        alert('Bug!')
+        alert('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -228,9 +225,6 @@ export class AllProcessesPage implements OnInit {
     else if (workflowName == "Pedido de Parecer do Presidente") {
       this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
     }
-    /* else if (workflowName == "Expediente") {
-      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
-    } */
     else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
new file mode 100644
index 000000000..63a34f256
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DiplomasGerarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DiplomasGerarPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
new file mode 100644
index 000000000..79d03bbc0
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DiplomasGerarPageRoutingModule
+  ],
+  declarations: [DiplomasGerarPage],
+  exports: [DiplomasGerarPage]
+})
+export class DiplomasGerarPageModule {}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
new file mode 100644
index 000000000..22a441c67
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -0,0 +1,102 @@
+<ion-header class="ion-no-border">
+  <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+  <div class="title">
+    <div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div>
+    <div class="theicon">
+      <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
+        <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+</ion-header>
+<ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+  </ion-refresher>
+
+
+  <div class="main-container width-100 overflow-y-auto height-100">
+
+    <div  *ngIf="diplomasList.length >= 1">
+
+
+      <ion-list >
+        <div
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          *ngFor = "let task of diplomasList"
+          (click)="goToDiploma(task.SerialNumber)"
+        >
+          <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
+          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+          <div class="item width-100">
+            <div class="exp-top-detail">
+              <div class="subject">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+              <div class="exp-icon">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+              </div>
+            </div>
+            <div class="exp-bottom-detail">
+              <div class="exp-remetente">
+                <ion-label>{{task.Senders}}</ion-label>
+              </div>
+            </div>
+            <div class="exp-middle-detail">
+              <div class="exp-workflow">
+                <span class="label">{{task.activityInstanceName}}</span>
+              </div>
+              <div class="exp-date">
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </ion-list>
+    </div>
+
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center"
+    >
+      <span>Lista vazia</span>
+    </div>
+
+    <div *ngIf="skeletonLoader && diplomasList.length == 0">
+
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
+  </div>
+
+
+</ion-content>
+
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
new file mode 100644
index 000000000..8d76ee6cd
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
@@ -0,0 +1,240 @@
+@import '~src/function.scss';
+/* CONTENT */
+/* :host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+    border: 1px solid red;
+} */
+
+.title{
+  padding: 30px 20px 0 20px !important;
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+  .bottom-title{
+    width: calc(100% - 40px);
+    margin-left: 20px !important;
+    margin-right: 20px !important;
+    margin: 0 auto;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 5px solid #42b9fe;
+
+    .bottom-text{
+      font-size: 15px !important;
+      font-family: Roboto !important;
+      color: #0d89d1 !important;
+    }
+  }
+  .main-container{
+    padding: 0px 20px 0 20px !important;
+    margin: 0;
+    color:#000;
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .ion-item-class{
+    padding: 0;
+
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //background-color: var(--white);
+    margin: 0 auto;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+
+/* New CSS */
+.expediente{
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border:1px solid #e9e9e9 !important;
+  background-color: var(--white);
+  margin-bottom: 10px !important;
+  padding: 15px;
+}
+.exp-list-item{
+  //width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+
+.exp-top-detail{
+  width: 100%;
+  float: left;
+  font-family: Roboto;
+  font-size: 12pt;
+  font-weight: 700;
+  color: var(--title-text-color);
+  padding-left: 3px;
+
+  .subject{
+    width: 84%;
+    float: left;
+  }
+
+  .exp-icon{
+    width: fit-content;
+    float: right;
+   /* font-size: 13px; */
+    margin: 0 !important;
+    padding: 0 !important;
+
+    ion-icon{
+      font-size: 12pt;
+      color: #42b9fe;
+      float: left;
+    }
+    label{
+      font-size: 10pt;
+    }
+  }
+}
+.exp-middle-detail, .exp-bottom-detail{
+  margin-bottom: 5px;
+
+}
+.exp-middle-detail{
+  font-size: 12pt;
+  width: 100%;
+  overflow: auto;
+
+  .exp-workflow{
+    float: left;
+    margin: 0 !important;
+
+    .label{
+      border-radius: 15px;
+      background: #ffb703;
+      /* font-size: 12px; */
+      float: right;
+      padding: 2.5px 13.5px 2.5px 13.5px;
+      color: #fff;
+  }
+  }
+  .exp-date{
+    width: auto;
+    font-family: Roboto;
+    font-size: 10pt;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #797979;
+    float: right;
+  }
+}
+.exp-bottom-detail{
+  font-size: 8pt;
+  width: 100%;
+  overflow: auto;
+  padding-left: 3px;
+
+  .exp-remetente{
+    //width: 200px;
+    font-family: Roboto;
+   /*  font-size: 13px; */
+    font-weight: normal;
+    color: #000000;
+    float: left;
+    /* border: 1px solid red; */
+  }
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
new file mode 100644
index 000000000..6f5b1078a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DiplomasGerarPage } from './diplomas-gerar.page';
+
+describe('DiplomasGerarPage', () => {
+  let component: DiplomasGerarPage;
+  let fixture: ComponentFixture<DiplomasGerarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DiplomasGerarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiplomasGerarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
new file mode 100644
index 000000000..5c69bcb9c
--- /dev/null
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -0,0 +1,70 @@
+import { Component, OnInit } from '@angular/core';
+import { NavigationStart, Router } from '@angular/router';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { DeplomasStore } from 'src/app/store/deplomas.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+@Component({
+  selector: 'app-diplomas-gerars',
+  templateUrl: './diplomas-gerar.page.html',
+  styleUrls: ['./diplomas-gerar.page.scss'],
+})
+export class DiplomasGerarPage implements OnInit {
+
+  diplomasList:DailyWorkTask[] = [];
+  serialNumber:string;
+  skeletonLoader = true
+
+  deplomasStore = DeplomasStore
+  customTaskPipe = new CustomTaskPipe()
+
+  constructor(
+    private processes:ProcessesService,
+    private router: Router,
+    private sortService: SortService,
+    public ThemeService: ThemeService
+    ) {}
+
+  ngOnInit() {
+
+    this.LoadList()
+
+  }
+
+  goToDiploma(serialNumber:any){
+    this.router.navigate(['/home/gabinete-digital/diplomas-gerar', serialNumber, 'gabinete-digital']);
+  }
+
+  doRefresh() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1000);
+  }
+
+  async LoadList() {
+
+
+
+    this.skeletonLoader = true
+
+    let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    this.diplomasList = new Array();
+
+    this.skeletonLoader = false;
+
+    diplomas.forEach(element => {
+      let task: customTask = this.customTaskPipe.transform(element);
+      this.diplomasList.push(task);
+    });
+
+    this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
+
+
+    this.deplomasStore.resetDiplomasList(this.diplomasList);
+  }
+
+
+}
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 316960fae..9c9970bf7 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -155,17 +155,7 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class width-100">
-                <!-- <ion-datetime
-                  class="d-block d-md-none"
-                  placeholder="Fim"
-                  [(ngModel)]="endDate"
-                  displayFormat="D MMM YYYY H:mm"
-                  minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="{{minDate}}"
-                  max="2025"
-                >
-                </ion-datetime> -->
+
 
                 <mat-form-field appearance="none"
                 class="width-100 date-hour-picker">
diff --git a/src/global.scss b/src/global.scss
index 13612d07a..56e89de31 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -685,6 +685,12 @@ app-despacho-pr ion-content .main-content{
     margin: 0px auto !important;
 }
 
+app-diplomas-gerar ion-content .main-content{
+    max-width: 1366px !important;
+    margin: 0px auto !important;
+}
+
+
 app-pedido ion-content .main-content{
     max-width: 1366px !important;
     margin: 0px auto !important;