From 23cbf723bab9863d350128b04770db0f1d665a77 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 24 Jun 2022 15:52:40 +0100
Subject: [PATCH] improve

---
 .../diplomas-gerar/diplomas-gerar.page.ts     |  1 -
 .../gabinete-digital/gabinete-digital.page.ts | 32 ++++++++++++++++---
 .../gabinete-digital/pedidos/pedidos.page.ts  |  2 --
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
index 597ef6938..dd0c66ff2 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -4,7 +4,6 @@ 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'
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index ffb2e9e75..bcc112247 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -579,13 +579,39 @@ export class GabineteDigitalPage implements OnInit {
     this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countparecer = this.count_par_dailywork;
     
-    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active"));    
+    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+      }
+    }));    
 
     let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
     this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
     this.pedidosstore.countdeferimento = this.count_def_dailywork;
 
-    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active"));
+    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+      }
+    }));
 
 
     let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
@@ -696,13 +722,11 @@ export class GabineteDigitalPage implements OnInit {
     this.closeAllDesktopComponents();
     let navigationExtras: NavigationExtras = { queryParams: { "eventos": true, } };
     if (window.innerWidth < 701) {
-      //this.openEventsToApproveList(profile);
       this.router.navigate(['/home/gabinete-digital/event-list']);
     }
     else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showEventsToApprove = true;
-      //this.eventsToApprove.doRefresh();
     }
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 02e0d60fd..0d37165cb 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -53,7 +53,6 @@ export class PedidosPage implements OnInit {
     private platform: Platform,
     public ThemeService: ThemeService
   ) {
-    //Inicializar segment
     this.segment = 'parecer';
 
     this.activatedRoute.queryParams.subscribe(params => {
@@ -64,7 +63,6 @@ export class PedidosPage implements OnInit {
       }
     });
 
-
     const modal = this.modalService.BookMeetingModalPage({ task: '' }, {})
 
   }