From f83394462da1a745092fdde2f1026d1cdfacf24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 13:47:21 +0100 Subject: [PATCH] Remove Edite Event process from event to aprove --- .../event-list/event-list.page.ts | 8 ++++++-- .../events-to-approve/events-to-approve.page.ts | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 65ccc0551..231170f7a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -161,7 +161,9 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -174,7 +176,9 @@ export class EventListPage implements OnInit { this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsPRList = this.eventsPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index a673f6ee1..2cd6de2a4 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -70,10 +70,15 @@ export class EventsToApprovePage implements OnInit { if(this.segment != 'PR'){ let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); + console.log(mdEventsOficial) + console.log(mdEventsPessoal) this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) + this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) console.log(this.eventsMDGPRList) - this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -85,9 +90,13 @@ export class EventsToApprovePage implements OnInit { else if(this.segment == 'PR'){ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); + console.log(prEventsOficial) + console.log(prEventsPessoal) this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsPRList = this.eventsPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { @@ -101,10 +110,12 @@ export class EventsToApprovePage implements OnInit { getFromDB() { this.storage.get('event-to-aproveMD').then((events) => { this.eventsMDGPRList = events + console.log('DB',this.eventsMDGPRList) }) this.storage.get('event-to-aprovePR').then((events) => { this.eventsPRList = events + console.log('DB',this.eventsPRList) }) }