diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index f5229f23a..03cada2e4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -601,24 +601,22 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.pendentesstore.reset(pendentes); - let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - let despachosPr; + let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); + if(this.loggeduser.Profile != 'PR') { - if(SessionStore.user.Profile != 'Consultant') { - despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - } else { - despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho" || - data.activityInstanceName == "Gerar Diploma"); - } + let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); - despachosPr = despachospr.filter(data => data.workflowInstanceDataFields.Status == "Active"); + depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) - this.despachoprstore.reset(despachosPr) + this.despachoprstore.reset(depacho) } else if(this.loggeduser.Profile == 'PR') { - despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") - this.despachoprstore.reset(despachosPr) + + let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") + depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) + this.despachoprstore.reset(depacho) } let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); @@ -638,16 +636,16 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.resetpr(eventsPRList); - let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); + let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; this.deplomasStore.resetDiplomasReview(diplomasValidar) - let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma"); + let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) - let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado"); + let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => { diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 771ea774b..ee212a27b 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -57,10 +57,9 @@ constructor ( let despachosPr; - if(this.loggeduser.Profile != 'PR') { despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - } else if(this.loggeduser.Profile != 'PR') { + } else if(this.loggeduser.Profile == 'PR') { despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); }