diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
index e1930b77d..8c96de04f 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
@@ -19,4 +19,5 @@ import { SharedModule } from 'src/app/shared/shared.module';
   ],
   declarations: [DiplomaAssinarPage]
 })
+
 export class DiplomaAssinarPageModule {}
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 198c9d22d..817187c58 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
@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <app-header></app-header>
+  <app-header > </app-header>
 </ion-header>
 
 <ion-content>
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 7587dfeaa..d9e363264 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
@@ -1,4 +1,23 @@
 @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;
+  background-color: white;
+}
+
+.main-content {
+  padding-top: 0px !important;
+}
+
 .main-content{
   background-color: #fff !important;
   border-top-left-radius: 25px;
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 42163e50a..d7a6d1c6c 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
@@ -52,16 +52,7 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   goBack(){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "diplomasassinar": true,
-      }
-    };
-    if( window.innerWidth < 801){
-      this.router.navigate(['/home/gabinete-digital/diplomas-assinar']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    window.history.back()
   }
 
   async openOptions(taskAction?: any) {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
index 4c13c29c3..2c6f7b92f 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
@@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular';
 import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module';
 
 import { DiplomasAssinarPage } from './diplomas-assinar.page';
+import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    DiplomasAssinarPageRoutingModule
+    DiplomasAssinarPageRoutingModule,
+    SharedModule
   ],
   declarations: [DiplomasAssinarPage]
 })
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 28d811737..e6f497c23 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -1,9 +1,94 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>diplomas-assinar</ion-title>
-  </ion-toolbar>
+<ion-header class="ion-no-border">
+  <app-header > </app-header>
 </ion-header>
 
+
+<ion-header class="ion-no-border header-2">
+  <div class="title">
+    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon" 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">
+          
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+    </ion-refresher>
+
+    <div class="width-100">
+      <div *ngIf="diplomasList">
+        <ion-list >
+          <!-- *ngFor = "let task of parecerList; let i = index"
+          (click)="viewExpedientDetail(task.SerialNumber)" -->
+          <ion-item 
+              class="expediente ion-no-padding 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="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Remetente}}</ion-label>
+                    </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.activityInstanceName}}</span>
+                    </div>
+                    <div class="exp-icon">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      <label></label>
+                    </div>
+                  </div>
+                  <div class="exp-bottom-detail">
+                    <ion-label>{{ task.Folio }}</ion-label>
+                  </div>
+                </div>
+              </ion-item>
+        </ion-list>
+      </div>
+    </div>
+    <div *ngIf="!diplomasList">
+
+      <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-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index e69de29bb..91ab91de5 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -0,0 +1,198 @@
+@import '~src/function.scss';
+/* CONTENT */
+:host{
+    margin: 0;
+  }
+  
+  .header-2 {
+    border-top-right-radius: 24px;
+    border-top-left-radius: 24px;
+  }
+  
+  ion-content, .header-2, .main-content{
+    padding: 30px 20px 0 20px !important;
+    background-color: white;
+  }
+  
+  .main-content {
+    padding-top: 0px !important;
+  }
+  
+
+.title{
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+  .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;
+    }
+  }
+.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;
+    margin-bottom: 10px;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+  
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+/* New CSS */
+.expediente{
+  padding-top: 10px;
+}
+.exp-list-item{
+  overflow: auto;
+  margin: 10px auto;
+}
+.exp-top-detail{
+  width: 100%;
+  overflow: auto;
+}
+.exp-date{
+  width: auto;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: #797979;
+  float: left;
+}
+.exp-remetente{
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  color: #000000;
+  float: left;
+  margin-left: 16px;
+
+}
+.exp-icon{
+  width: 45px;
+  float: right;
+  font-size: 13px;
+}
+.exp-icon ion-icon{
+  font-size: 25px;
+  color: #42b9fe;
+}
+.exp-bottom-detail{
+  float: left;
+  font-family: Roboto;
+  font-size: 16px;
+  font-weight: 700;
+  color: #0d89d1;
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index e8c657431..b6833120a 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -1,4 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { formatDate } from '@angular/common';
+import { ModalController, NavParams } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -6,10 +13,93 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./diplomas-assinar.page.scss'],
 })
 export class DiplomasAssinarPage implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
+ //profile:string;
+ diplomasList:DailyWorkTask[] = [];
+ showLoader: boolean;
+ totalDocs:any;
+ serialNumber:string;
+ 
+ @Input() profile:string;
+ @Input() segment:string;
+ 
+ constructor(
+   private processes:ProcessesService,
+   private modalController: ModalController,
+   private alertService: AlertService,
+   private router: Router,
+   ) {
+   }
+ 
+ ngOnInit() {
+   this.LoadList();
+ }
+ 
+ goToDiploma(serialNumber:any){
+   let navigationExtras: NavigationExtras = {
+     queryParams: {
+         "serialNumber": serialNumber,
+     }
+   };
+   this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
+ }
+ 
+ doRefresh() {
+   this.LoadList();
+   setTimeout(() => {
+     //event.target.complete();
+   }, 2000);
+ }
+ 
+ async LoadList(){
+   
+   let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+   this.diplomasList = new Array();
+ 
+   console.log(diplomas);
+       let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
+       console.log(diplomasAssinar);
+       diplomasAssinar.forEach(element => {
+         let DocId = element.workflowInstanceDataFields.FolderID;
+         let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+         this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+           this.totalDocs = res.DocumentsTotal;
+           console.log(res.DocumentsTotal);
+           let task = {
+             "SerialNumber": element.serialNumber,
+             "Folio": element.workflowInstanceDataFields.Subject,
+             "Senders": element.workflowInstanceDataFields.Sender,
+             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+             "Remetente": element.workflowInstanceDataFields.Remetente,
+             "DocumentsQty": this.totalDocs,
+             "DocId": element.workflowInstanceDataFields.DocId,
+             "WorkflowName": element.workflowDisplayName,
+             "activityInstanceName": element.activityInstanceName,
+           }
+           this.diplomasList.push(task);
+         },
+         (error)=>{
+           let task = {
+             "SerialNumber": element.serialNumber,
+             "Folio": element.workflowInstanceDataFields.Subject,
+             "Senders": element.workflowInstanceDataFields.Sender,
+             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+             "Remetente": element.workflowInstanceDataFields.Remetente,
+             "DocumentsQty": 0,
+             "DocId": element.workflowInstanceDataFields.DocId,
+             "WorkflowName": element.workflowDisplayName,
+             "activityInstanceName": element.activityInstanceName,
+           }
+           this.diplomasList.push(task);
+         });
+     });
+   this.showLoader = false;
+ }
+ 
+  goBack() {
+    this.router.navigate(['/home/gabinete-digital']);
+    // window.history.back()
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 17dd88cf6..353c39cbb 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -166,6 +166,4 @@ constructor(
     // window.history.back()
   }
 
-
-
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 7dfede971..ec491303e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -429,7 +429,9 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   openDiplomasPage(segment:string) {
+  
     this.closeAllDesktopComponents();
+    
     if( window.innerWidth <= 800){
       //this.openDeploma();
       let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
@@ -445,16 +447,32 @@ export class GabineteDigitalPage implements OnInit {
 
   openDiplomasAssinarPage() {
     this.closeAllDesktopComponents();
-    if( window.innerWidth <= 800){
-      //this.openDeploma();
-      let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
-      this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
-    }
-    else{
-      let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      this.showDiplomasAssinar = true;
+
+    if (this.loggeduser.Profile == 'MDGPR') {
+      if( window.innerWidth <= 800){
+        //this.openDeploma();
+        let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
+        this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
+      }
+      else{
+        let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        this.showDiplomasAssinar = true;
+      }
+    } else {
+      if( window.innerWidth <= 800){
+        //this.openDeploma();
+        let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
+        this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras);
+      }
+      else{
+        let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        this.showDiplomasAssinar = true;
+      }
     }
+
+
   }
 
   openSignedDiploma(segment:string) {