diff --git a/src/app/models/agenda/eventrecurrence.model.ts b/src/app/models/agenda/eventrecurrence.model.ts new file mode 100644 index 000000000..a62224831 --- /dev/null +++ b/src/app/models/agenda/eventrecurrence.model.ts @@ -0,0 +1,11 @@ +export class EventRecurrence{ + Type: string; + Day?: number; + DayOfWeek?:number; + Month?: number; + LastOcurrence?: Date; + + /* public EventRecurrence(){ + this.Type = "-1"; + } */ +} \ No newline at end of file diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 831bbf1e7..2931cf256 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -1,6 +1,6 @@ +import { EventRecurrence } from './agenda/eventrecurrence.model'; import { EventBody } from './eventbody.model'; import { EventPerson } from './eventperson.model'; -import { SearchDocument } from './search-document'; export class Event{ ParentId?: string; @@ -20,8 +20,12 @@ export class Event{ TimeZone: string; Organizer: string; Categories: string[]; - HasAttachments: boolean; - // documents?: SearchDocument[] + HasAttachments: boolean; + EventRecurrence?: EventRecurrence; + + /* public Event(){ + this.EventRecurrence.Type = '-1'; + } */ } export class EventToApproveEdit { 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 a6cee6e16..2a0aa5920 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -151,6 +151,27 @@ + +
+
+
+ +
+
+ + Nunca + Diário + Semanal + Mensal + Anual + +
+
+
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 a958c4bd8..352ce5437 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -56,8 +56,9 @@ export class EditEventPage implements OnInit { private router: Router, ) { - - + this.postEvent = new Event(); + console.log(this.postEvent); + this.postEvent.EventRecurrence = {Type:'-1'} this.isEventEdited = false; this.postEvent = this.navParams.get('event'); this.caller = this.navParams.get('caller'); @@ -108,6 +109,8 @@ export class EditEventPage implements OnInit { if(window.innerWidth > 800){ this.showAttendees=true; } + + this.getRecurrenceTypes(); } @@ -120,6 +123,12 @@ export class EditEventPage implements OnInit { this.router.navigate(['/home',this.caller]); } + getRecurrenceTypes() { + this.eventsService.getRecurrenceTypes().subscribe(res=>{ + console.log(res); + }); + } + runValidation() { this.validateFrom = true @@ -161,7 +170,9 @@ export class EditEventPage implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) try{ - this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + console.log(this.postEvent); + + /* this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { if(this.initCalendarName != this.postEvent.CalendarName){ let body = { "EventId": this.postEvent.EventId, @@ -174,7 +185,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.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 81d99c9e5..62f55a11f 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -104,6 +104,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, + EventRecurrence: null, }; } else{ @@ -125,6 +126,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, + EventRecurrence: null, }; } 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 b8df83005..b596a1f4f 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 @@ -240,6 +240,7 @@ export class BookMeetingModalPage implements OnInit { Organizer: null, Categories: null, HasAttachments: true, + EventRecurrence: null, } console.log(this.postData); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 52381241d..2f872319b 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -228,6 +228,14 @@ export class EventsService { }); } + getRecurrenceTypes(): any{ + const geturl = environment.apiURL + 'Calendar/ListEventRepeatTypes'; + let options = { + headers: this.headers, + }; + return this.http.get(`${geturl}`, options); + } + 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 b1ae586e9..c3c86c8f7 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -173,6 +173,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, + EventRecurrence: null, }; } else{ @@ -194,6 +195,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, + EventRecurrence: null, }; }