diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 7374544bd..4bdf7a8e2 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -240,6 +240,7 @@ diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index aad78431d..468922cf8 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -108,10 +108,11 @@
- + + {{file.title}} - - + +
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 210ea05b7..3f06827b5 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -107,10 +107,11 @@
- + + {{file.title}} - - + +
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 b4bea48e0..0a52d766e 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -472,10 +472,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; @@ -503,7 +505,21 @@ export class NewEventPage implements OnInit { if(DocumentToSave.length == 0){ this.afterSave(); } + this.toastService._successMessage('Evento criado'); + let data = { + "subject": this.postEvent.Subject, + "start": this.postEvent.StartDate, + "end": this.postEvent.EndDate, + "venue": this.postEvent.Location, + "id": id, + } + this.chatMethodService.sendMessage(this.roomId,data); + this.toastService._successMessage('Evento criado') + },()=>{ + loader.remove() + this.showLoader = false + this.toastService._badRequest('Evento não criado') }); } else { @@ -511,10 +527,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) => { @@ -541,7 +559,21 @@ export class NewEventPage implements OnInit { if(DocumentToSave.length == 0){ this.afterSave(); } + + this.toastService._successMessage('Evento criado'); + let data = { + "subject": this.postEvent.Subject, + "start": this.postEvent.StartDate, + "end": this.postEvent.EndDate, + "venue": this.postEvent.Location, + "id": id, + } + this.chatMethodService.sendMessage(this.roomId,data); this.toastService._successMessage('Evento criado') + },()=>{ + loader.remove() + this.showLoader = false + this.toastService._badRequest('Evento não criado') }); } @@ -627,7 +659,7 @@ export class NewEventPage implements OnInit { return true; } else { - return false; + } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 86584f9c3..f64d7faed 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -112,10 +112,11 @@
- + + {{file.title}} - - + +
@@ -230,10 +231,8 @@ -
- {{ wsChatMethodsService.getGroupRoom(roomId).otherUserType }} {{durationDisplay}}
-
-
-
diff --git a/src/global.scss b/src/global.scss index d19add06b..f0c15b50d 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1196,6 +1196,7 @@ ngx-mat-datetime-content{ width: 100%; background: none; padding: 10px 5px 10px 5px; + color: black; } .menuButton:hover{ background: #e6f6ff75;