From 99f491453a1b8deec5909f59e8ef906f38da3d5e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 16 Jul 2021 20:53:21 +0100
Subject: [PATCH] Fix counting

---
 src/app/pages/gabinete-digital/despachos/despachos.page.ts | 2 +-
 src/app/pages/gabinete-digital/gabinete-digital.page.ts    | 7 ++++---
 src/app/pages/gabinete-digital/pedidos/pedidos.page.ts     | 2 +-
 .../shared/gabinete-digital/despachos/despachos.page.ts    | 2 +-
 src/app/shared/gabinete-digital/pedidos/pedidos.page.ts    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index b9061e243..492cc6c1c 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -96,7 +96,7 @@ export class DespachosPage implements OnInit {
 
     this.skeletonLoader = false
 
-    await result.forEach( (element, index) => {
+    await result.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach( (element, index) => {
 
       let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 6978af06b..dbf26654a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -224,15 +224,16 @@ export class GabineteDigitalPage implements OnInit {
     this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
 
     let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise();
-    this.count_desp_dailywork = Object.keys(despachos).length;
+    this.count_desp_dailywork = Object.keys(despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
 
     let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
     let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+
     let allParecer = pareceres.concat(pareceresPr);
-    this.count_par_dailywork = Object.keys(allParecer).length;
+    this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
 
     let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
-    this.count_def_dailywork = Object.keys(deferimentos).length;
+    this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
 
     let pendentes =await this.processesbackend.GetPendingTasks(false).toPromise();
     this.count_total_pending = Object.keys(pendentes).length;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 9696ee78c..4f0a60f4e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -104,7 +104,7 @@ export class PedidosPage implements OnInit {
       let allParecer = parecer.concat(parecerPr).reverse();
       this.parecerList =[];
 
-       allParecer.forEach(element => {
+       allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
 
         let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index a6c816282..f872ec0e3 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -101,7 +101,7 @@ export class DespachosPage implements OnInit {
     
     this.despachoList = new Array();
 
-    await result.forEach( (element, index) => {
+    await result.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach( (element, index) => {
 
       let date = new Date(element.taskStartDate);
       date.setMonth(date.getMonth() + 1);
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 74a2eadb2..5e607cc8f 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -95,7 +95,7 @@ export class PedidosPage implements OnInit {
 
       this.parecerList = new Array();
 
-       allParecer.forEach(element => {
+       allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
 
         let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);