From e90f4e3e004d120fdee2dea03e8e9160fa0c439c Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 2 May 2023 18:05:42 +0200 Subject: [PATCH] (bug) unable to show calendar --- app/frontend/src/javascript/controllers/admin/calendar.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 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/frontend/src/javascript/controllers/admin/calendar.js b/app/frontend/src/javascript/controllers/admin/calendar.js index 67af6ec61..3e59d6b76 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.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), - maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), select (start, end, jsEvent, view) { return calendarSelectCb(start, end, jsEvent, view); }, diff --git a/app/frontend/src/javascript/controllers/calendar.js b/app/frontend/src/javascript/controllers/calendar.js index 2581496a4..e0977c9dd 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.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), - maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(bookingWindowStart.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).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 3c5851e6b..9d8556865 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.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), - maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).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 a6e4c3b85..d4bded6da 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.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), - maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).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 e08b69ff8..0fa0a18a8 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.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), - maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + minTime: moment.duration(moment.utc(settingsPromise.booking_window_start.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), + maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end.match(/\d{4}-\d{2}-\d{2}(?: |T)\d{2}:\d{2}:\d{2}/)[0]).format('HH:mm:ss')), eventClick (event, jsEvent, view) { return calendarEventClickCb(event, jsEvent, view); },