From 9bc657d2ca08af25c2bb82a3bac2b975ba134cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Wed, 1 Dec 2021 15:24:29 +0100
Subject: [PATCH] Bug fixed on Init presenting correspondencia and a filter
 presenting only the correspondencias that have enough data

---
 src/app/pages/events/events.page.ts | 36 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index e9a4177b0..c5e6e044c 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -197,10 +197,13 @@ export class EventsPage implements OnInit {
     this.showLoader = true;
 
     let date = new Date();
-    date.setMonth(date.getMonth() + 1);
-    let start = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-    let end = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " 23:59:59";
+    let month = date.getMonth() + 1;
+    //date.setMonth(date.getMonth() + 1);
+    let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+    let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
 
+    console.log('Data start yahaya', start)
+    console.log('Data end yahaya', end)
 
     if (this.loggeduser.Profile == 'MDGPR') {
 
@@ -368,8 +371,9 @@ export class EventsPage implements OnInit {
   getEventsFromLocalDb() {
 
     let date = new Date();
-    date.setMonth(date.getMonth() + 1);
-    let dateToday = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
+    let month = date.getMonth() + 1;
+    //date.setMonth(date.getMonth() + 1);
+    let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
     console.log('dateeeeee', dateToday)
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
 
@@ -420,16 +424,20 @@ export class EventsPage implements OnInit {
 
           var expedientlist: any = new Array();
           process.forEach((element) => {
-            let task = {
-              activityInstanceName: element.activityInstanceName,
-              deadline: null,
-              serialNumber: element.serialNumber,
-              taskStartDate: element.taskStartDate,
-              totalDocuments: element.totalDocuments,
-              workflowDisplayName: element.workflowDisplayName,
-              workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields)
+            if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) {
+
+              let task = {
+                activityInstanceName: element.activityInstanceName,
+                deadline: null,
+                serialNumber: element.serialNumber,
+                taskStartDate: element.taskStartDate,
+                totalDocuments: element.totalDocuments,
+                workflowDisplayName: element.workflowDisplayName,
+                workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields)
+              }
+              expedientlist.push(task);
+
             }
-            expedientlist.push(task);
           })
 
           console.log('OFOFOFOOF22222', expedientlist)