diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index f58e01c2b..88a575bd2 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -60,8 +60,8 @@ export class EditEventPage implements OnInit { this.postEvent = new Event(); this.isEventEdited = false; - this.postEvent = this.navParams.get('event'); this.postEvent.EventRecurrence = {Type:'-1'}; + this.postEvent = this.navParams.get('event'); this.caller = this.navParams.get('caller'); this.initCalendarName = this.postEvent.CalendarName; @@ -179,14 +179,17 @@ export class EditEventPage implements OnInit { this.injectValidation() this.runValidation() - if(this.Form.invalid) return false + if(this.Form.invalid) return false; + if(this.selectedRecurringType != '-1'){ + this.postEvent.EventRecurrence.Type = this.selectedRecurringType; + } this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) try{ console.log(this.postEvent); this.postEvent.EventRecurrence.Type = this.selectedRecurringType; - this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + /* this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { if(this.initCalendarName != this.postEvent.CalendarName){ let body = { "EventId": this.postEvent.EventId, @@ -199,7 +202,7 @@ export class EditEventPage implements OnInit { }, error => { this.toastService.badRequest() - }); + }); */ this.isEventEdited = true; this.goBack(); 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 58a8a76e5..ee9821b98 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -180,11 +180,10 @@ 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 a6584dde7..5fc5a3443 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -114,7 +114,7 @@ export class ViewEventPage implements OnInit { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; - /* console.log(res); */ + console.log(res); this.today = new Date(res.StartDate); /* console.log(new Date(this.today)); */ @@ -181,6 +181,7 @@ export class ViewEventPage implements OnInit { } async editEvent() { + console.log(this.loadedEvent); let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 3e3e06a8c..7a10e3e65 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -114,7 +114,6 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.checkRoutes(); this.LoadCounts(); } }); @@ -149,7 +148,7 @@ export class GabineteDigitalPage implements OnInit { checkRoutes(){ if(this.router.url == '/home/gabinete-digital?eventos=true'){ - this.openEventsToApprovePage("MDGPR"); + this.openEventsToApprovePage(); this.selectedElement='approval'; } else if(this.router.url == '/home/gabinete-digital?expedientes=true'){ @@ -189,6 +188,9 @@ export class GabineteDigitalPage implements OnInit { this. openDiplomasAssinarPage(); this.selectedElement='DiplomasAssinar'; } + else{ + this.checkRoutes(); + } } refreshExpedientes(){ @@ -312,9 +314,7 @@ export class GabineteDigitalPage implements OnInit { return false; } - openEventsToApprovePage(profile:any) { - console.log(profile); - + openEventsToApprovePage() { this.closeAllDesktopComponents(); let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}}; if( window.innerWidth <= 801) {