diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 9d34891d7..9d3afdd9d 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -158,7 +158,7 @@
- { // if not mobile remove all component if( window.innerWidth >= 1024) { @@ -111,6 +108,9 @@ export class EditEventPage implements OnInit { } this.getRecurrenceTypes(); + setTimeout(() => { + this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); + }, 500); } @@ -130,7 +130,7 @@ export class EditEventPage implements OnInit { }); } - onSelectedRecurringChanged(ev:any){ + onSelectedRecurringChanged(ev?:any){ console.log(ev); if(ev.length > 1){ console.log(ev.filter(data => data != '-1')); diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 5fc5a3443..23487a5bf 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -62,13 +62,11 @@ export class ViewEventPage implements OnInit { this.loadedEvent = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.loadedEvent.Body = this.eventBody; - this.activatedRoute.paramMap.subscribe(params =>{ this.eventId = params['params'].eventId; if(params["params"].caller){ this.caller = (params["params"].caller); } - }); /* this.activatedRoute.queryParams.subscribe(params => { @@ -81,6 +79,7 @@ export class ViewEventPage implements OnInit { } ngOnInit() { + this.loadEvent(); this.getAttachments(); @@ -116,9 +115,8 @@ export class ViewEventPage implements OnInit { console.log(res); - this.today = new Date(res.StartDate); - /* console.log(new Date(this.today)); */ - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); + /* this.today = new Date(res.StartDate); + this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ }); } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 3179d1616..53fa0cfb8 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -385,13 +385,14 @@ export class EventsService { return this.http.post(`${puturl}`, event, options) } - deleteEvent(eventid:string, deletemode:number) + deleteEvent(eventid:string, eventDeleteType:number) { const puturl = environment.apiURL + 'calendar/DeleteEvent'; let params = new HttpParams(); params = params.set("EventId", eventid); - params = params.set("deleteMode", deletemode.toString()); + // 0 for occurence and 1 for serie (delete all events) + params = params.set("eventDeleteType", eventDeleteType.toString()); let options = { headers: this.headers,