diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 404b3ca37..335b05a2a 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -90,16 +90,6 @@ export class EventsPage implements OnInit {
 
       this.prEventList = null;
 
-      // list
-      this.LoadList();
-
-      /* this.screenOrientation.onChange().subscribe(
-        () => {
-          alert("Orientation updated" + this.screenOrientation.type);
-          this.existingScreenOrientation = this.screenOrientation.type;
-        }
-      ); */
-
       this.platform.resize.subscribe(async () => {
         //alert('Resize event detected');
         console.log('Resize event detected');
@@ -109,18 +99,14 @@ export class EventsPage implements OnInit {
     }
 
   ngOnInit() {
-    //Inicializar segment
+
     this.segment = "Combinada";
-    //Initialize profile as mdgpr
     this.profile = "mdgpr";
-   /*  console.log(this.profile); */
 
     this.showGreeting();
 
-    const pathname = window.location.pathname
-
     this.router.events.forEach((event) => {
-      if(event instanceof NavigationEnd && event.url == pathname) {
+      if(event instanceof NavigationEnd && event.url == '/home/events') {
         this.RefreshEvents();
         this.LoadList();
       }
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index e184bc4b8..c613e0d65 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -65,7 +65,7 @@
           <ion-list>
             <h5>Documentos Anexados</h5>
             <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
-              <ion-label class="d-block" (click)="viewDocument()">
+              <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
                 <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
                 <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
               </ion-label>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index d963d6f04..a38fa2a97 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -48,7 +48,6 @@ export class ExpedientePrPage implements OnInit {
     private iab: InAppBrowser,
     private events: EventsService,
     private menu: MenuController,
-    private router: Router,
     private modalController: ModalController,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
@@ -86,7 +85,7 @@ export class ExpedientePrPage implements OnInit {
     return new Date(e).toDateString()
   }
 
-  close(){
+  close() {
     this.modalController.dismiss();
   }
 
@@ -129,7 +128,7 @@ export class ExpedientePrPage implements OnInit {
     } */
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.toastService.successMessage('Processo enviado para pendentes')
@@ -155,9 +154,9 @@ export class ExpedientePrPage implements OnInit {
         "CreateDate":taskDate,
         "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
         "Remetente": res.workflowInstanceDataFields.Sender,
-        "Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note,
+        "Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note, //
         "FolderId": res.workflowInstanceDataFields.FolderID,
-        "FsId": res.workflowInstanceDataFields.FsId,
+        "FsId": res.workflowInstanceDataFields.FsId, //
         "DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID,
         "WorkflowName": res.workflowDisplayName,
         "activityInstanceName": res.activityInstanceName,
@@ -196,32 +195,6 @@ export class ExpedientePrPage implements OnInit {
     });
   }
 
-  getAttachments(serialNumber){
-    console.log(serialNumber);
-
-    this.attachmentsService.getAttachmentsBySerial(serialNumber).subscribe(res=>{
-      this.attachments = res;
-      console.log('res', res);
-    });
-  }
-
-  async LoadRelatedEvents(serial: string) {
-    if (this.eventsList == null) {
-      this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => {
-        console.log(res);
-        res.forEach(att => {
-          if (this.eventsList == null) {
-            this.eventsList = new Array();
-          }
-          this.events.getEvent(att.ParentId).subscribe(event => {
-            this.eventsList.push(event);
-            console.log(this.eventsList);
-          });
-        });
-      });
-    }
-  }
-
   viewDocument(DocId:string) {
     this.processes.GetDocumentUrl(DocId, this.task.FsId).subscribe(res=>{
       console.log(res);
@@ -562,7 +535,6 @@ export class ExpedientePrPage implements OnInit {
     });
   }
 
-
   async openOptions(taskAction?: any) {
     const popover = await this.popoverController.create({
       component: OptsExpedientePrPage,
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 1226d0f4a..48113c09a 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -11,6 +11,7 @@
 <ion-content>
   
   <div class="width-100 overflow-y-auto height-100" >
+
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     <ion-list *ngIf="expedienteprstore.list.length >= 1">
       <div
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 0b5ab9771..c6ffe1005 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -1,15 +1,13 @@
-import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
-import { CalendarComponent } from 'ionic2-calendar';
-
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { customTaskList, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
+import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -17,12 +15,12 @@ import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
   styleUrls: ['./expedientes-pr.page.scss'],
 })
 export class ExpedientesPrPage implements OnInit {
-  @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[] = [];
   serialNumber:string;
   skeletonLoader = true;
   expedienteprstore = ExpedienteprStore;
+  customTaskPipe = new CustomTaskPipe()
 
   loggeduser: User;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -38,7 +36,7 @@ export class ExpedientesPrPage implements OnInit {
     }
 
   ngOnInit() {
-    
+
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&
         event.url.startsWith('/home/gabinete-digital?expedientespr=true') ||
@@ -60,32 +58,19 @@ export class ExpedientesPrPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
 
-  LoadList(){
+  LoadList() {
     this.skeletonLoader = true;
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
 
       this.taskslist = [];
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
-        let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": taskDate,
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente,
-          "DocumentsQty": 0,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-          "Status": element.workflowInstanceDataFields.Status,
-          }
-          this.taskslist.push(task);
+        let task: customTaskList = this.customTaskPipe.transform(element);
+        this.taskslist.push(task);
       });
       this.expedienteprstore.reset(this.taskslist);
       this.skeletonLoader = false;
+
     });
   }
 
@@ -106,21 +91,4 @@ export class ExpedientesPrPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.loggeduser.Profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
 }
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 4c648efb4..25d924d5e 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -12,6 +12,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-opts-expediente-pr',
@@ -48,7 +49,8 @@ export class OptsExpedientePrPage implements OnInit {
     private navParams: NavParams,
     private animationController: AnimationController,
     private router: Router,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private location: Location,
 
   ) {
 
@@ -276,7 +278,7 @@ export class OptsExpedientePrPage implements OnInit {
       console.log(res['data']);
       let body = res['data'];
       // alert('close '+ res['data'])
-      if(res['data']){
+      if(res['data']) {
         console.log('open discart');
 
         const loader = this.toastService.loading()
@@ -290,7 +292,6 @@ export class OptsExpedientePrPage implements OnInit {
         }  finally {
           loader.remove()
         }
-        this.goBack();
 
       }
       else{
@@ -321,16 +322,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "expedientes-pr": true,
-        }
-      };
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    this.location.back()
   }
 
   getAttachments(serialNumber){