diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php index 85b77a4e9..15b77a297 100644 --- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php @@ -164,7 +164,7 @@ class RemoteEventConverter public function convertAvailabilityToRemoteEvent(array $event): RemoteEvent { $startDate = - DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime']) + DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone) ->setTimezone($this->defaultDateTimeZone); $endDate = DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone) @@ -210,7 +210,7 @@ class RemoteEventConverter public function convertToRemote(array $event): RemoteEvent { $startDate = - DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime']) + DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone) ->setTimezone($this->defaultDateTimeZone); $endDate = DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone) diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue index bae963435..b06d51518 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue @@ -103,9 +103,9 @@ @@ -121,6 +121,7 @@ import FullCalendar from '@fullcalendar/vue3'; import dayGridPlugin from '@fullcalendar/daygrid'; import interactionPlugin from '@fullcalendar/interaction'; import timeGridPlugin from '@fullcalendar/timegrid'; +import listPlugin from '@fullcalendar/list'; import CalendarActive from './Components/CalendarActive'; import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue'; import {mapGetters, mapState} from "vuex"; @@ -153,7 +154,7 @@ export default { calendarOptions() { return { locale: frLocale, - plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, dayGridPlugin], + plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, dayGridPlugin, listPlugin], initialView: 'timeGridWeek', initialDate: this.$store.getters.getInitialDate, eventSources: this.events, @@ -171,18 +172,12 @@ export default { headerToolbar: { left: 'prev,next today', center: 'title', - right: 'timeGridWeek,dayGridThreeDays,timeGridDay', + right: 'timeGridWeek,timeGridDay,listWeek', }, views: { timeGrid: { slotEventOverlap: false, slotDuration: this.slotDuration, - //scrollTime: '10:00:00', - }, - dayGridThreeDays: { - type: 'dayGridWeek', - duration: { days: 3}, - buttonText: this.$t('list_three_days'), }, }, };