diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 2415eeb8f..d853cb321 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -19,7 +19,7 @@ export class Event{ AppointmentState: number; TimeZone: string; Organizer: string; - Categories: string; + Category: string; HasAttachments: boolean; EventRecurrence?: EventRecurrence; 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 1622a79a1..86e653e63 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -74,7 +74,7 @@
- {{ postEvent.Categories }} + {{ postEvent.Category }}
Campo obrigatório.
@@ -88,8 +88,8 @@
Reunião @@ -103,7 +103,7 @@
- {{ postEvent.Categories}} + {{ postEvent.Category}}
Campo obrigatório.
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 1ea220083..2a2344f09 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -162,7 +162,7 @@ export class EditEventPage implements OnInit { CalendarName: new FormControl(this.postEvent.CalendarName, [ Validators.required ]), - Categories: new FormControl(this.postEvent.Categories, [ + Categories: new FormControl(this.postEvent.Category, [ Validators.required ]), IsRecurring: new FormControl(this.postEvent.IsRecurring, [ 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 c7197f152..90e06c72a 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -90,7 +90,7 @@
Reunião @@ -104,7 +104,7 @@ - + Reunião diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 144da540f..a5dbaf60b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -146,7 +146,7 @@ export class BookMeetingModalPage implements OnInit { this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000))); - this.postData.Categories = 'Reunião' + this.postData.Category = 'Reunião' } ngOnInit() { @@ -208,7 +208,7 @@ export class BookMeetingModalPage implements OnInit { participantes: new FormControl(this.taskParticipants, [ Validators.required ]), - Categories: new FormControl(this.postData.Categories, [ + Categories: new FormControl(this.postData.Category, [ Validators.required ]), @@ -249,7 +249,7 @@ export class BookMeetingModalPage implements OnInit { AppointmentState: 0, TimeZone: 'UTC', Organizer: null, - Categories: 'Reunião', + Category: 'Reunião', HasAttachments: true, EventRecurrence: null, } 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 9829685c8..cc617dba5 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -87,7 +87,7 @@ - + Reunião 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 b4d7149c9..bf1774b8d 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -204,7 +204,7 @@ export class EditEventPage implements OnInit { Validators.required, ]), CalendarName: new FormControl(this.postEvent.CalendarName), - Categories: new FormControl(this.postEvent.Categories, [ + Categories: new FormControl(this.postEvent.Category, [ Validators.required ]), dateStart: new FormControl(this.dateStart, [ diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 0102cd331..cb8fc62f5 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -74,7 +74,7 @@ - + Reunião diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 866d0fb8a..0b96aaf7a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -167,7 +167,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: 'Reunião', + Category: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -189,7 +189,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: 'Reunião', + Category: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -236,7 +236,7 @@ export class NewEventPage implements OnInit { Validators.required, ]), CalendarName: new FormControl(this.postEvent.CalendarName), - Categories: new FormControl(this.postEvent.Categories, [ + Categories: new FormControl(this.postEvent.Category, [ Validators.required ]), dateStart: new FormControl(this.postEvent.StartDate, [ diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index f1f44a37c..9b3f241d7 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -120,7 +120,7 @@ export class ViewPublicationsPage implements OnInit { publicationType: publicationType, folderId: folderId, }, - cssClass: 'new-publication', + cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); await modal.present();