diff --git a/src/app/models/event.ts b/src/app/models/event.ts index 9cf304f..46fce51 100644 --- a/src/app/models/event.ts +++ b/src/app/models/event.ts @@ -13,5 +13,6 @@ export interface Event { lastModifiedBy: string; url: string; wholeDay: boolean; + repeatFrequency: string; status: string; } diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index fc746b1..f411626 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -32,6 +32,7 @@ +   |   Filter: diff --git a/src/app/pages/admin/admin.component.ts b/src/app/pages/admin/admin.component.ts index 8baa585..bb6704d 100644 --- a/src/app/pages/admin/admin.component.ts +++ b/src/app/pages/admin/admin.component.ts @@ -81,6 +81,8 @@ export class AdminComponent implements OnInit { return 4; case 'management': return 3; + case 'birthdays': + return 5; default: return -1; } @@ -93,6 +95,11 @@ export class AdminComponent implements OnInit { } checkEventMeetsFilterCriteria(event: Event): boolean { + // Always return birthdays regardless of date + if(event.calendarId === 5) { + return true; + } + switch (this.eventFilter) { case '': return true; diff --git a/src/app/services/api.service.ts b/src/app/services/api.service.ts index 14b9749..2649cf6 100644 --- a/src/app/services/api.service.ts +++ b/src/app/services/api.service.ts @@ -96,6 +96,11 @@ export class ApiService { params = params.append('sessionId', session.sessionId); params = params.append('sessionKey', session.sessionKey); + // Automatically set birthdays to recurring + if(event.calendarId === 5) { + event.repeatFrequency = 'YEARLY'; + } + let createEvent: any = event; return this.http.post(this.apiUrl, createEvent, {params});