From 70e412ef8a9c8975de1b1eb9f5494bbc78ceec9a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 19 Oct 2021 09:18:02 +0100 Subject: [PATCH] save --- .../gabinete-digital/pendentes/pendentes.page.ts | 4 ++-- src/app/services/functions/sort.service.ts | 16 ++++++++++------ .../all-processes/all-processes.page.ts | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 54bae18a2..950ba61c6 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -85,7 +85,7 @@ export class PendentesPage implements OnInit { }); pendentesList = removeDuplicate(pendentesList) - pendentesList = this.sortService.sortArrayByDate(pendentesList); + pendentesList = this.sortService.sortArrayISODate(pendentesList); this.listToPresent = pendentesList; this.skeletonLoader = false; @@ -132,7 +132,7 @@ export class PendentesPage implements OnInit { } }); - pendingList = this.sortService.sortArrayISODate(pendingList); + pendingList = pendingList; this.listToPresent = pendingList; console.log('pendentes', pendingList) diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts index 58c866878..9d580897b 100644 --- a/src/app/services/functions/sort.service.ts +++ b/src/app/services/functions/sort.service.ts @@ -8,14 +8,18 @@ export class SortService { constructor() { } sortArrayISODate(myArray: any) { - return myArray.sort(function (a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); + if(myArray.length > 0){ + return myArray.sort(function (a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } } sortArrayByDate(myArray: any) { console.log(myArray[0].taskStartDate); - return myArray.sort(function (a, b) { - return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0); - }); + if(myArray.length > 0){ + return myArray.sort(function (a, b) { + return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0); + }); + } } } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 9c0b58953..791bda06e 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -64,7 +64,7 @@ export class AllProcessesPage implements OnInit { async loadAllProcesses() { let allProcessesList = await this.processesService.GetTasksList("", false).toPromise(); - console.log(allProcessesList); + //console.log(allProcessesList); this.skeletonLoader = true;