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 b4471631b..c08f6d023 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -175,7 +175,7 @@ export class EditEventPage implements OnInit { } else { this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency) } - + this.postEvent.Category = this.setEventType(this.postEvent.Category) console.log(this.postEvent?.Attachments) console.log(this.loadedEventAttachments) window.onresize = (event) => { @@ -800,4 +800,14 @@ export class EditEventPage implements OnInit { return date } + + setEventType(eventType) { + var selectedEventType = { + 1: 'Meeting', + 2: 'Travel', + 3: 'Conference', + 4: 'Encontro' + } + return selectedEventType[eventType]; + } } diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/services/Repositorys/Agenda/utils.ts index edf6bd631..8c566e36e 100644 --- a/src/app/services/Repositorys/Agenda/utils.ts +++ b/src/app/services/Repositorys/Agenda/utils.ts @@ -157,11 +157,11 @@ export class Utils { eventRecurence(type) { var selectedType = { - 'never': 1, - 'daily': 2, - 'weekly': 3, - "monthly": 4, - "yearly": 5 + 'never': 0, + 'daily': 1, + 'weekly': 2, + "monthly": 3, + "yearly": 4 } return selectedType[type]; } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 0a98e4367..7b683cafd 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -104,16 +104,16 @@ - + Reunião - + Viagem - + Conferência - + Encontro diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 2b8389d9f..b2f024d90 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -116,9 +116,9 @@ export class EditEventPage implements OnInit { ngOnInit() { this.loadedEventAttachments = this.postEvent.Attachments - console.log(this.postEvent) + console.log(this.postEvent.Category) this._postEvent = this.postEvent - this.setCalendarNameValue(this._postEvent.CalendarName); + this._postEvent.Category = this.setEventType(this._postEvent.Category) if (!this._postEvent.IsRecurring) { this._postEvent.EventRecurrence.frequency = 'never'; } else { @@ -774,12 +774,14 @@ export class EditEventPage implements OnInit { return date } - setCalendarNameValue(calendarName) { - var selectedCalendar = { - 1: 'Oficial', - 2: 'Pessoal' + setEventType(eventType) { + var selectedEventType = { + 1: 'Meeting', + 2: 'Travel', + 3: 'Conference', + 4: 'Encontro' } - return selectedCalendar[calendarName]; + return selectedEventType[eventType]; } }