From 357e76bb164985fd8001f94210d5071ca24a3b1b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 18 Jul 2024 10:30:29 +0100 Subject: [PATCH] load calendars on open edit-event modal and new event modal. --- src/app/pages/agenda/edit-event/edit-event.page.ts | 2 ++ src/app/pages/agenda/new-event/new-event.page.ts | 2 ++ version/git-version.ts | 10 +++++----- 3 files changed, 9 insertions(+), 5 deletions(-) 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 991a79ea3..9ea627bf5 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -189,6 +189,8 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments = this.postEvent?.Attachments + this.agendaDataRepository.getSharedCalendar() + this.CalendarNameOwnerName = this.eventsService.detectCalendarNameByCalendarId(this.postEvent.CalendarId) this.changeAgenda() this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLiveWithOrder() 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 ae05cd995..de25940f4 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -153,6 +153,8 @@ export class NewEventPage implements OnInit { // Add other roles with their priorities here }; + this.agendaDataRepository.getSharedCalendar() + this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLive().pipe( map(data => data.sort((a, b) => { console.log('Raw data:', data); // Debug line diff --git a/version/git-version.ts b/version/git-version.ts index 0f32b8a2f..00682953e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "03a150403", - "SHA": "03a150403aad448a9b1a9485f9e808397b1a8839", + "shortSHA": "678a9ba61", + "SHA": "678a9ba61438951199c8cfdbfdff4ff7535617de", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jul 17 16:58:03 2024 +0100'", + "lastCommitTime": "'Wed Jul 17 17:03:32 2024 +0100'", "lastCommitMessage": "fix agenda", - "lastCommitNumber": "5872", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: version/git-version.ts", + "lastCommitNumber": "5873", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file