From 5bc34971d124b8de953bc4cf0ba56bc5e647876a Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 25 Apr 2023 15:11:46 +0200 Subject: [PATCH] (bug) unable to show calendar --- CHANGELOG.md | 1 + app/frontend/src/javascript/controllers/admin/calendar.js | 4 ++-- app/frontend/src/javascript/controllers/admin/settings.js | 4 ++-- app/frontend/src/javascript/controllers/calendar.js | 4 ++-- app/frontend/src/javascript/controllers/machines.js.erb | 4 ++-- app/frontend/src/javascript/controllers/spaces.js.erb | 4 ++-- app/frontend/src/javascript/controllers/trainings.js.erb | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd5626219..c0075074b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix a bug: notification is broken when delete a project - Fix a bug: broken notifications email +- Fix a bug: unable to show calendar - [TODO DEPLOY] `rails fablab:maintenance:clean_abuse_notifications` ## v6.0.3 2023 April 12 diff --git a/app/frontend/src/javascript/controllers/admin/calendar.js b/app/frontend/src/javascript/controllers/admin/calendar.js index cb290a790..bf3363d68 100644 --- a/app/frontend/src/javascript/controllers/admin/calendar.js +++ b/app/frontend/src/javascript/controllers/admin/calendar.js @@ -69,8 +69,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state snapDuration: BOOKING_SNAP, selectable: true, selectHelper: true, - minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), - maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value).format('HH:mm:ss')), select (start, end, jsEvent, view) { return calendarSelectCb(start, end, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/admin/settings.js b/app/frontend/src/javascript/controllers/admin/settings.js index e43bca1dc..91ffa6818 100644 --- a/app/frontend/src/javascript/controllers/admin/settings.js +++ b/app/frontend/src/javascript/controllers/admin/settings.js @@ -71,8 +71,8 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope' $scope.subscriptionExplicationsAlert = { name: 'subscription_explications_alert', value: settingsPromise.subscription_explications_alert }; $scope.eventExplicationsAlert = { name: 'event_explications_alert', value: settingsPromise.event_explications_alert }; $scope.spaceExplicationsAlert = { name: 'space_explications_alert', value: settingsPromise.space_explications_alert }; - $scope.windowStart = { name: 'booking_window_start', value: settingsPromise.booking_window_start }; - $scope.windowEnd = { name: 'booking_window_end', value: settingsPromise.booking_window_end }; + $scope.windowStart = { name: 'booking_window_start', value: moment.utc(settingsPromise.booking_window_start).format('YYYY-MM-DD HH:mm:ss') }; + $scope.windowEnd = { name: 'booking_window_end', value: moment.utc(settingsPromise.booking_window_end).format('YYYY-MM-DD HH:mm:ss') }; $scope.mainColorSetting = { name: 'main_color', value: settingsPromise.main_color }; $scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color }; $scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre }; diff --git a/app/frontend/src/javascript/controllers/calendar.js b/app/frontend/src/javascript/controllers/calendar.js index a4f4ac162..e862a670d 100644 --- a/app/frontend/src/javascript/controllers/calendar.js +++ b/app/frontend/src/javascript/controllers/calendar.js @@ -204,8 +204,8 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ center: 'title', right: '' }, - minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), - maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value).format('HH:mm:ss')), defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek', eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); diff --git a/app/frontend/src/javascript/controllers/machines.js.erb b/app/frontend/src/javascript/controllers/machines.js.erb index c6fa655c9..b62e273f3 100644 --- a/app/frontend/src/javascript/controllers/machines.js.erb +++ b/app/frontend/src/javascript/controllers/machines.js.erb @@ -447,8 +447,8 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$tran // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/spaces.js.erb b/app/frontend/src/javascript/controllers/spaces.js.erb index 13899c7c2..fc9586d69 100644 --- a/app/frontend/src/javascript/controllers/spaces.js.erb +++ b/app/frontend/src/javascript/controllers/spaces.js.erb @@ -385,8 +385,8 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$transi // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/trainings.js.erb b/app/frontend/src/javascript/controllers/trainings.js.erb index 929e56148..f051845f5 100644 --- a/app/frontend/src/javascript/controllers/trainings.js.erb +++ b/app/frontend/src/javascript/controllers/trainings.js.erb @@ -155,8 +155,8 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra // fullCalendar (v2) configuration $scope.calendarConfig = CalendarConfig({ - minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), - maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); },