diff --git a/aleksis/core/frontend/components/calendar/Calendar.vue b/aleksis/core/frontend/components/calendar/Calendar.vue index 3eacb598c350a43a68fe1b247664c78fb96e68cd..3a62a89cecfe3dc9cc2450e47f65d8f0d1e9d992 100644 --- a/aleksis/core/frontend/components/calendar/Calendar.vue +++ b/aleksis/core/frontend/components/calendar/Calendar.vue @@ -15,7 +15,7 @@ :events="events" :type="internalCalendarType" :event_color="getColorForEvent" - :first-time="firstTime" + :first-time="startWithFirstTime ? firstTime : undefined" interval-height="60" @click:date="viewDay" @click:day="viewDay" @@ -69,6 +69,12 @@ export default { required: false, default: null, }, + // Start the calendar with the time of the first starting calendar event + startWithFirstTime: { + type: Object, + required: false, + default: () => false, + }, }, data() { return { @@ -106,8 +112,10 @@ export default { computed: { rangeDateTime() { return { - start: this.range.start ? this.$parseISODate(this.range.start) : null, - end: this.range.end ? this.$parseISODate(this.range.end) : null, + start: this.range.start + ? this.$parseISODate(this.range.start.date) + : null, + end: this.range.end ? this.$parseISODate(this.range.end.date) : null, }; }, events() { diff --git a/aleksis/core/frontend/components/calendar/CalendarWithControls.vue b/aleksis/core/frontend/components/calendar/CalendarWithControls.vue index 68d631591b471a8f67deab08a05a7ae0f083f7c0..4ace267ae9e6c657a85f1213db73626b60d982a1 100644 --- a/aleksis/core/frontend/components/calendar/CalendarWithControls.vue +++ b/aleksis/core/frontend/components/calendar/CalendarWithControls.vue @@ -30,6 +30,7 @@ @changeCalendarType="setCalendarType" v-bind="$attrs" ref="calendar" + :startWithFirstTime="startWithFirstTime" /> </div> </template> @@ -52,6 +53,11 @@ export default { type: Array, required: true, }, + startWithFirstTime: { + type: Object, + required: false, + default: () => true, + }, }, }; </script>