diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 3bdc7cedb..94505b7d0 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -453,9 +453,10 @@ export class CreateProcessPage implements OnInit { } } else if(this.task.activityInstanceName =='Concluir Despacho' || - this.task.activityInstanceName == 'Concluir Parecer' || - this.task.activityInstanceName =='Concluir Deferimento' || - this.task.activityInstanceName =='Reapreciar Deferimento' + this.task.activityInstanceName == 'Concluir Parecer' || + this.task.activityInstanceName =='Concluir Deferimento' || + this.task.activityInstanceName =='Reapreciar Deferimento' || + this.task.activityInstanceName == 'Tarefa de Deferimento' ) { body = { @@ -470,6 +471,7 @@ export class CreateProcessPage implements OnInit { } else { alert('!!!') + console.log('this.task', this.task) } console.log(body); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index aaa8bb324..8e4e43aeb 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -210,7 +210,15 @@ export class PedidoPage implements OnInit { }, translucent: true }); - return await popover.present(); + await popover.present(); + + popover.onDidDismiss().then(( res =>{ + + if( res['data'] == 'close') { + this.goBack() + } + + })) } async repreciar(note:string, documents:any) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index d22060ed1..ce73fd988 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -98,7 +98,7 @@
- {{task.Senders}} sender + {{task.Senders}}
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 8b925bc4c..5c9513bc2 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -108,7 +108,7 @@ export class RequestOptionsPage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { - this.popoverController.dismiss(); + //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800) { @@ -129,14 +129,15 @@ export class RequestOptionsPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=> { console.log(res['data']); - if(res['data']=='openDiscart'){ + if(res['data']=='openDiscart') { console.log('open discart'); this.distartExpedientModal(); - this.modalController.dismiss() - } + this.modalController.dismiss('close') + this.popoverController.dismiss('close') + }); }