change agenda

This commit is contained in:
Peter Maquiran
2023-03-30 14:31:58 +01:00
parent 8deed4cf94
commit b7d878851e
13 changed files with 350 additions and 723 deletions
+5 -2
View File
@@ -277,6 +277,7 @@ export class EventsService {
this.calendarNamesType[e.FullName][sharedCalendar.CalendarName] = true
this.calendarNamesType[e.FullName][sharedCalendar.CalendarName+'Id'] = sharedCalendar.CalendarId
this.calendarNamesType[e.FullName]['RoleId'] = sharedCalendar.CalendarRoleId
this.calendarNamesType[e.FullName]['OwnerId'] = sharedCalendar.OwnerUserId
})
}
@@ -295,6 +296,7 @@ export class EventsService {
this.calendarNamesType['Meu calendario'][OwnerCalendar.CalendarName] = true
this.calendarNamesType['Meu calendario'][OwnerCalendar.CalendarName+'Id'] = OwnerCalendar.CalendarId
this.calendarNamesType['Meu calendario']['RoleId'] = OwnerCalendar.CalendarRoleId
this.calendarNamesType['Meu calendario']['OwnerId'] = OwnerCalendar.OwnerUserId || SessionStore.user.UserId
}
@@ -525,9 +527,10 @@ export class EventsService {
return this.http.get<any>(`${geturl}`, options)
}
async getEventsByCalendarId( startdate: string, enddate: string, calendarIds: any[]) {
async getEventsByCalendarId( startdate: string, enddate: string, calendarId: string) {
const calendars = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars)
const agendasCalendars = calendars.filter( e => calendarIds.includes(e.CalendarId))
const agendasCalendars = calendars.filter( e => e.CalendarId == calendarId)
let result = []