diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 27c49e4f1..e669e2e7d 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -238,6 +238,7 @@ diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 74923ea81..464764d4d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -515,3 +515,5 @@ export class EventsPage implements OnInit { } + + diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 63b0667f0..94f84421d 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -488,10 +488,12 @@ export class NewEventPage implements OnInit { else if(this.loggeduser.Profile == 'PR') { const CalendarId = this.selectedCalendarId() + let loader = this.toastService.loading(); this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe( (id) => { + loader.remove() const eventId: any = id; @@ -520,6 +522,10 @@ export class NewEventPage implements OnInit { this.afterSave(); } this.toastService._successMessage('Evento criado') + },()=>{ + loader.remove() + this.showLoader = false + this.toastService._badRequest('Evento não criado') }); } else { @@ -527,10 +533,12 @@ export class NewEventPage implements OnInit { const CalendarId = this.selectedCalendarId() + let loader = this.toastService.loading(); this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe( (id) => { - + loader.remove(); + const eventId: any = id; const DocumentToSave: EventAttachment[] = this.documents.map((e) => { @@ -558,6 +566,10 @@ export class NewEventPage implements OnInit { this.afterSave(); } this.toastService._successMessage('Evento criado') + },()=>{ + loader.remove() + this.showLoader = false + this.toastService._badRequest('Evento não criado') }); } @@ -643,7 +655,7 @@ export class NewEventPage implements OnInit { return true; } else { - return false; + } }