diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 6d13eb463..d00e0b5a7 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -65,17 +65,20 @@ export class PedidosPage implements OnInit { this.openPedido.emit(data); } - LoadList(){ + async LoadList(){ if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; - this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { - this.taskslist = result; - console.log(result); - - this.parecerList = new Array(); - let res = result.reverse(); - res.forEach(element => { - let task = { + + let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); + let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); + + let allParecer = parecer.concat(parecerPr).reverse(); + console.log(allParecer); + + this.parecerList = new Array(); + + allParecer.forEach(element => { + let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.originator.email, @@ -86,12 +89,11 @@ export class PedidosPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, - } - this.parecerList.push(task); - }); - console.log(this.parecerList); - + } + this.parecerList.push(task); }); + console.log(this.parecerList); + } else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento";