diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 85244b415..04e91a389 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -184,11 +184,14 @@ export class DiplomasGerarPage implements OnInit { async sendExpedienteToPending() { + const loader = this.toastService.loading() this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => { this.goBack(); this.toastService.successMessage() + loader.remove() }, error => { + loader.remove() this.toastService.badRequest("Processo não enviado para despacho") }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 1538e4712..00ad27dc3 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -324,12 +324,15 @@ export class ExpedienteDetailPage implements OnInit { } sendExpedienteToPending() { + const loader = this.toastService.loading() this.processes.SetTaskToPending(this.serialNumber).subscribe(res => { this.toastService._successMessage('Processo enviado para pendentes') this.goBack(); + loader.remove() }, (error) => { + loader.remove() this.toastService._badRequest('Processo não enviado para pendentes') }); } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index ec0bd3d52..e8307c131 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -133,12 +133,15 @@ export class ExpedientePrPage implements OnInit { } sendExpedienteToPending() { + const loader = this.toastService.loading() this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.toastService._successMessage('Processo enviado para pendentes') this.goBack(); + loader.remove() }, (error)=>{ + loader.remove() this.toastService._badRequest('Processo não enviado para pendentes') }); } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 41db8b1e4..86cf760b1 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -2,7 +2,7 @@
Expediente
-
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index a1a615484..16b8b7159 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -84,6 +84,7 @@ export class ExpedientesPrPage implements OnInit { } refreshing() { + setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index db561036f..fff5fee73 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -95,6 +95,7 @@ export class ExpedientsPage implements OnInit { } doRefresh() { + setTimeout(() => { this.LoadList(); }, 1000) diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 7778a3276..338ce1ec3 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -72,14 +72,16 @@ export class DespachosOptionsPage implements OnInit { }); } - sendExpedienteToPending(){ + sendExpedienteToPending() { + const loader = this.toastService.loading() this.popoverController.dismiss(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.toastService._successMessage() + loader.remove() this.close(); },()=>{ - + loader.remove() this.toastService._badRequest('Processo não encontrado') }); } diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index cfd057251..17f217a5c 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -98,11 +98,14 @@ export class DespachosPrOptionsPage implements OnInit { } sendExpedienteToPending() { + const loader = this.toastService.loading() this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ this.toastService._successMessage() this.popoverController.dismiss('close') + loader.remove() },()=>{ + loader.remove() this.toastService._badRequest('Processo não encontrado') }); diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts index 639e43881..ed58b09f3 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts @@ -107,12 +107,14 @@ export class DiplomasGerarOptionsPage implements OnInit { } async sendExpedienteToPending() { - + const loader = this.toastService.loading() this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => { this.goBack(); this.toastService.successMessage() + loader.remove() }, error => { + loader.remove() this.toastService.badRequest("Processo não enviado para despacho") }); diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 9e9eaad65..39797fed3 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -252,12 +252,14 @@ export class OptsExpedientePrPage implements OnInit { sendExpedienteToPending(){ this.popoverController.dismiss(); + const loader = this.toastService.loading() this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ - + loader.remove() this.close(); },()=>{ this.toastService._badRequest('Processo não encontrado') + loader.remove() }); } 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 f79faa471..2d51a1a8d 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -81,11 +81,14 @@ export class RequestOptionsPage implements OnInit { } sendExpedienteToPending() { + const loader = this.toastService.loading() this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.toastService._successMessage() this.close(); + loader.remove() },()=>{ + loader.remove() this.toastService._badRequest('Processo não encontrado') });