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 4b944ef60..65ccc0551 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,6 +161,7 @@ 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.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -173,6 +174,7 @@ 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.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1a37f0ae4..93151543f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -544,9 +544,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let allProcessesList = allPreocesses_; this.loadCount = true; - + console.log(allProcessesList) allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director') if (!this.p.userRole(['PR'])) { allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') 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 ad5ffd20c..ef5c816f5 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 @@ -63,6 +63,16 @@ export class AllProcessesPage implements OnInit { // allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director') this.skeletonLoader = true; 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 1f3ce3fe4..a673f6ee1 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 @@ -67,11 +67,13 @@ export class EventsToApprovePage implements OnInit { this.showLoader = true; this.getFromDB(); - if(this.segment == 'MDGPR'){ + 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(); this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) + console.log(this.eventsMDGPRList) + this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -85,6 +87,7 @@ export class EventsToApprovePage implements OnInit { let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) + this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {