diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue index 7f0082a72..fb4429a1d 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue @@ -3,7 +3,9 @@ + v-bind:updateEventsSource="updateEventsSource" + v-bind:showMyCalendar="showMyCalendar" + v-bind:toggleMyCalendar="toggleMyCalendar" >

{{ $t('choose_your_date') }}

@@ -51,15 +53,16 @@ export default { calendarEvents: { loaded: [], selected: [], - user: [], //TODO load user calendar events + user: [], current: currentEvent }, + showMyCalendar: true, calendarOptions: { locale: frLocale, plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin, listPlugin ], initialView: 'timeGridWeek', initialDate: window.startDate !== undefined ? window.startDate : new Date(), - eventSources: window.startDate !== undefined ? [currentEvent] : [], + eventSource: [], selectable: true, select: this.onDateSelect, eventChange: this.onEventChange, @@ -79,19 +82,21 @@ export default { methods: { init() { console.log(window.startDate) - // let calendar = this.$refs.fullCalendar.getApi() - // console.log(calendar) - this.calendarEvents.selected.push(this.calendarEvents.user); - this.calendarOptions.eventSources = this.calendarEvents.selected; - console.log(this.calendarOptions.eventSources) - + this.updateEventsSource() + }, + toggleMyCalendar(value) { + this.showMyCalendar = value; }, updateEventsSource() { + this.calendarOptions.eventSources = []; + this.calendarOptions.eventSources.push(...this.calendarEvents.selected); + console.log(this.calendarOptions.eventSources) if (window.startDate !== undefined) { - this.calendarEvents.selected.push(currentEvent); + this.calendarOptions.eventSources.push(currentEvent); + } + if (this.showMyCalendar) { + this.calendarOptions.eventSources.push(this.calendarEvents.user); } - this.calendarEvents.selected.push(this.calendarEvents.user); - this.calendarOptions.eventSources = this.calendarEvents.selected; console.log(this.calendarOptions.eventSources) }, onDateSelect(payload) { diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue index 064e550a9..883e2a844 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue @@ -19,6 +19,10 @@ :options="options"> +
+ + +