diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fb1a2732b..73b9d5098 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -634,6 +634,9 @@ export class AgendaPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then((data) => { + if(data){ + + } this.openAddEventDismiss(data['data']) }); } else { @@ -642,26 +645,23 @@ export class AgendaPage implements OnInit { } openAddEventDismiss(data){ - this.cloneAllmobileComponent(); - if(data.type == 'save'){ - let postEvent: Event = 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); - } - this.mobileComponent.showAddNewEvent = false; + let postEvent: Event = 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); } + this.cloneAllmobileComponent(); } async viewEventDetail(eventId:any) { diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts index ee8bd1f5d..27c4dc584 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -90,10 +90,7 @@ export class NewEventPage implements OnInit { } } close(){ - this.onAddEvent.emit({ - type:'close', - data: this.postEvent - }); + this.onAddEvent.emit(false); } save(){ @@ -104,10 +101,7 @@ export class NewEventPage implements OnInit { this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(); } - this.onAddEvent.emit({ - type:'save', - data: this.postEvent - }); + this.onAddEvent.emit(this.postEvent); } async openAttendees()