- + - +
-
@@ -75,12 +75,12 @@
- +
@@ -115,10 +115,10 @@
- +
-
Lista vazia @@ -126,16 +126,17 @@
-
Lista vazia
- +
+
- + diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 3dc4ecd16..2f1e9aa43 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -26,7 +26,7 @@ export class PedidosPage implements OnInit { serialNumber:string; skeletonLoader = true - @Input() segment:string; + segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( @@ -54,10 +54,10 @@ export class PedidosPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { - if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) || + if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) || event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url) ) { - + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing() } else { @@ -71,7 +71,7 @@ export class PedidosPage implements OnInit { this.router.navigate(['/home/gabinete-digital']); } - segmentChanged(ev: any) { + /* segmentChanged(ev: any) { let navigationExtras: NavigationExtras; @@ -84,7 +84,7 @@ export class PedidosPage implements OnInit { this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras); // this.LoadList(); - } + } */ goToPedido(serialNumber:any){ this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']); @@ -111,7 +111,7 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active") - + this.parecerList =[]; allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => { @@ -139,7 +139,7 @@ export class PedidosPage implements OnInit { else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { - + this.skeletonLoader = false console.log(result); @@ -170,8 +170,8 @@ export class PedidosPage implements OnInit { if(element.workflowInstanceDataFields.Status == "Active") { this.deferimentoList.push(task); } - - + + }); }); @@ -179,6 +179,10 @@ export class PedidosPage implements OnInit { } + segmentChanged(ev: any) { + this.LoadList(); + } + refreshing() { setTimeout(() => { this.LoadList();