From 85a6d175dc5759d41b601d2c081130793933178c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 9 Jul 2021 19:27:08 +0100 Subject: [PATCH] Add loader --- .../modals/create-process/create-process.page.ts | 14 ++++++++++++++ src/app/pages/agenda/new-event/new-event.page.ts | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 9995d0bf5..e8c0e21b6 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -235,6 +235,8 @@ export class CreateProcessPage implements OnInit { }); this.dispatchFolder.SubjectTypes = this.selectedTypes; + const loader = this.toastService.loading() + switch (this.loggeduser.Profile) { case 'MDGPR': @@ -253,8 +255,10 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise(); this.FinalizarDespacho('Despacho criado'); + loader.remove() } catch (error) { this.toastService.badRequest('Processo não efectuado'); + loader.remove() } break; @@ -272,9 +276,11 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise(); this.FinalizarParecer('Pedido de Parecer enviado'); + loader.remove() } catch (error) { this.toastService.badRequest('Processo não efectuado'); + loader.remove() } break; @@ -292,9 +298,11 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise(); this.FinalizarDeferimento('Pedido de deferimento enviado'); + loader.remove() } catch (error) { this.toastService.badRequest('Processo não efectuado'); + loader.remove() } break; } @@ -317,8 +325,10 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise(); + loader.remove() this.executado('Despacho criado'); } catch (error) { + loader.remove() this.toastService.badRequest('Processo não efectuado'); } @@ -337,9 +347,11 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise(); this.executado(); + loader.remove() this.toastService.successMessage('Pedido de Parecer criado'); } catch (error) { + loader.remove() this.toastService.badRequest('Processo não efectuado'); } @@ -358,9 +370,11 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise(); this.executado(); + loader.remove() this.toastService.successMessage('Pedido de Deferimento criado'); } catch (error) { + loader.remove() this.toastService.badRequest('Processo não efectuado'); } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 4ec826d8c..ca3866bcb 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -232,6 +232,8 @@ export class NewEventPage implements OnInit { try { + const loader = this.toastService.loading() + if(this.loggeduser.Profile == 'MDGPR') { console.log(this.loggeduser.Profile); @@ -239,12 +241,14 @@ export class NewEventPage implements OnInit { eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise(); console.log(eventId); + loader.remove() } else if(this.loggeduser.Profile == 'PR'){ console.log(this.loggeduser.Profile); eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise(); + loader.remove() } const DocumentToSave: EventAttachment[] = this.documents.map((e) => {