diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index cf65032c3..f37748364 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -21,6 +21,7 @@ import { Event } from '../../models/event.model'; import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { RouteService } from 'src/app/services/route.service'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ @@ -54,6 +55,8 @@ export class ViewEventPage implements OnInit { header = true task: ExpedientTaskModalPageNavParamsTask; LoadedDocument: any = null; + CalendarId + sesseionStora = SessionStore constructor( private modalController: ModalController, @@ -74,6 +77,7 @@ export class ViewEventPage implements OnInit { public ThemeService: ThemeService ) { this.eventId = this.navParams.get('eventId'); + this.CalendarId = this.navParams.get('CalendarId'); this.isEventEdited = false; this.loadedEvent = new Event(); this.eventBody = { BodyType: "1", Text: "" }; @@ -127,24 +131,51 @@ export class ViewEventPage implements OnInit { loadEvent() { const loader = this.toastService.loading(); - this.eventsService.getEvent(this.eventId).subscribe(res => { - this.loadedEvent = res; - this.addEventToDb(res); - /* this.today = new Date(res.StartDate); - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ - loader.remove() - }, (error) => { - - if (error.status === 0) { - this.getFromDb(); - } else { - this.toastService.badRequest('Este evento já não existe na sua agenda') + + if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { + this.eventsService.getEvent(this.eventId).subscribe(res => { + this.loadedEvent = res; + this.addEventToDb(res); + loader.remove() - this.modalController.dismiss('Eevent not Foud'); - this.RouteService.goBack(); + }, (error) => { + + + if (error.status === 0) { + this.getFromDb(); + } else { + this.toastService.badRequest('Este evento já não existe na sua agenda') + loader.remove() + this.modalController.dismiss('Eevent not Foud'); + this.RouteService.goBack(); + } + loader.remove() + }); + } else { + + + if(this.CalendarId) { + this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { + this.loadedEvent = res; + this.addEventToDb(res); + + loader.remove() + }, (error) => { + + if (error.status === 0) { + this.getFromDb(); + } else { + this.toastService.badRequest('Este evento já não existe na sua agenda') + loader.remove() + this.modalController.dismiss('Eevent not Foud'); + this.RouteService.goBack(); + } + loader.remove() + }); } - loader.remove() - }); + + } + } deleteEvent() { 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 468922cf8..f47750df2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -90,8 +90,12 @@ {{"Imagem"}} - - + + + + + + image @@ -131,8 +135,12 @@ {{"Mensagem de voz"}} - - + + + + + +
@@ -160,7 +168,7 @@
{{msg.u.name ?? ""}} criou esta reunião
-
+
De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
{{msg.file.venue}}
@@ -200,7 +208,7 @@
{{msg.msg}} {{msg.msg}} @@ -67,7 +66,6 @@
- {{last ? scrollToBottom() : ''}} @@ -87,8 +85,12 @@ {{"Imagem"}} - - + + + + + + image @@ -136,8 +138,12 @@ {{"Mensagem de voz"}} - - + + + + + +
@@ -168,7 +174,7 @@
{{msg.u.name}} criou esta reunião
-
@@ -186,7 +192,7 @@
{{msg.u.name}} criou esta reunião
-
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 0a55bfca5..268e41527 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -338,7 +338,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } catch (err) { } } - async goToEvent(eventId: any) { + async goToEvent(event: any) { + let classs; if (window.innerWidth < 701) { classs = 'modal modal-desktop' @@ -348,7 +349,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const modal = await this.modalController.create({ component: ViewEventPage, componentProps: { - eventId: eventId, + eventId: event.id, + CalendarId: event.calendarId }, cssClass: classs, }); diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index c0ee74133..9ac1017ca 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -56,7 +56,9 @@ export class MessageService { messageSend = false delate = false delateRequest = false - downloadLoader: boolean; + downloadLoader: boolean = false + downloadAttachments = false; + downloadAttachmentsTemp = 0; constructor(private storage: Storage, private NfService: NfService, @@ -254,7 +256,14 @@ export class MessageService { // save the changes to the storage this.save() this.downloadLoader = false; + this.downloadAttachments = true + this.downloadAttachmentsTemp++; } + }, ()=>{ + // error + this.downloadLoader = false; + this.downloadAttachments = false + this.downloadAttachmentsTemp++; }); } 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 0a52d766e..92494a5e2 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -459,6 +459,7 @@ export class NewEventPage implements OnInit { "end": this.postEvent.EndDate, "venue": this.postEvent.Location, "id": id, + "calendarId": CalendarId } this.chatMethodService.sendMessage(this.roomId,data); }, @@ -512,6 +513,7 @@ export class NewEventPage implements OnInit { "end": this.postEvent.EndDate, "venue": this.postEvent.Location, "id": id, + "calendarId": CalendarId } this.chatMethodService.sendMessage(this.roomId,data); @@ -567,6 +569,7 @@ export class NewEventPage implements OnInit { "end": this.postEvent.EndDate, "venue": this.postEvent.Location, "id": id, + "calendarId": CalendarId } this.chatMethodService.sendMessage(this.roomId,data); this.toastService._successMessage('Evento criado') 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 f64d7faed..bccd01e04 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -89,8 +89,12 @@ {{"Imagem"}} - - + + + + + +
@@ -135,8 +139,12 @@ {{"Mensagem de voz"}} - - + + + + + +
@@ -165,7 +173,7 @@
{{msg.u.name}} criou esta reunião
-
+
De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
{{msg.file.venue}}
@@ -203,7 +211,7 @@