diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 958d0f7c7..ecb366955 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -60,7 +60,9 @@ export class AgendaPage implements OnInit {
private eventService: EventsService,
private router: Router,
private alertCrontroller: AlertService
- ) {}
+ ) {
+ this.showLoader = false;
+ }
ngOnInit() {
this.profile = "mdgpr";
@@ -97,7 +99,7 @@ export class AgendaPage implements OnInit {
}
//Show information of the event
async onEventSelected(ev: { event: Event}){
- this.viewEventDetail();
+ this.viewEventDetail(ev.event.EventId);
/* this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */
}
@@ -307,18 +309,31 @@ export class AgendaPage implements OnInit {
backdropDismiss: false
});
await modal.present();
- modal.onDidDismiss();
+ modal.onDidDismiss().then((data) => {
+ let postEvent: Event = data['data'];
+ if (postEvent.Subject != null)
+ {
+ this.eventSource.push({
+ title: postEvent.Subject,
+ startTime: new Date(postEvent.StartDate),
+ endTime: new Date(postEvent.EndDate),
+ allDay: false,
+ event: postEvent
+ });
+ this.myCal.update();
+ this.myCal.loadEvents();
+ this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+ }
+ });
}
- async viewEventDetail() {
+ async viewEventDetail(eventId:any) {
console.log(this.profile);
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
- segment: this.segment,
- profile: this.profile,
- /* eventSelectedDate: this.eventSelectedDate, */
+ eventId: eventId,
},
cssClass: 'modal',
backdropDismiss: false
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index d77776339..9b1002e74 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -55,7 +55,10 @@
Receita por Natureza
-Texto
+{{attach.SourceName}}
+{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}