rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

(bug) unable to show calendar

Browse Source
This commit is contained in:
Du Peng 2023-04-25 15:11:46 +02:00
parent b588f1c780
commit 5bc34971d1
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Fix a bug: notification is broken when delete a project - Fix a bug: notification is broken when delete a project
- Fix a bug: broken notifications email - Fix a bug: broken notifications email
- Fix a bug: unable to show calendar
- [TODO DEPLOY] `rails fablab:maintenance:clean_abuse_notifications` - [TODO DEPLOY] `rails fablab:maintenance:clean_abuse_notifications`
## v6.0.3 2023 April 12 ## v6.0.3 2023 April 12

4
app/frontend/src/javascript/controllers/admin/calendar.js
View File

@ -69,8 +69,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
snapDuration: BOOKING_SNAP, snapDuration: BOOKING_SNAP,
selectable: true, selectable: true,
selectHelper: true, selectHelper: true,
minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), minTime: moment.duration(moment.utc(bookingWindowStart.setting.value).format('HH:mm:ss')),
maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value).format('HH:mm:ss')),
select (start, end, jsEvent, view) { select (start, end, jsEvent, view) {
return calendarSelectCb(start, end, jsEvent, view); return calendarSelectCb(start, end, jsEvent, view);
}, },

4
app/frontend/src/javascript/controllers/admin/settings.js
View File

@ -71,8 +71,8 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
$scope.subscriptionExplicationsAlert = { name: 'subscription_explications_alert', value: settingsPromise.subscription_explications_alert }; $scope.subscriptionExplicationsAlert = { name: 'subscription_explications_alert', value: settingsPromise.subscription_explications_alert };
$scope.eventExplicationsAlert = { name: 'event_explications_alert', value: settingsPromise.event_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.spaceExplicationsAlert = { name: 'space_explications_alert', value: settingsPromise.space_explications_alert };
$scope.windowStart = { name: 'booking_window_start', value: settingsPromise.booking_window_start }; $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: settingsPromise.booking_window_end }; $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.mainColorSetting = { name: 'main_color', value: settingsPromise.main_color };
$scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color }; $scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color };
$scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre }; $scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre };

4
app/frontend/src/javascript/controllers/calendar.js
View File

@ -204,8 +204,8 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$
center: 'title', center: 'title',
right: '' right: ''
}, },
minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), minTime: moment.duration(moment.utc(bookingWindowStart.setting.value).format('HH:mm:ss')),
maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value).format('HH:mm:ss')),
defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek', defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek',
eventClick (event, jsEvent, view) { eventClick (event, jsEvent, view) {
return calendarEventClickCb(event, jsEvent, view); return calendarEventClickCb(event, jsEvent, view);

4
app/frontend/src/javascript/controllers/machines.js.erb
View File

@ -447,8 +447,8 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$tran
// fullCalendar (v2) configuration // fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({ $scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) { eventClick (event, jsEvent, view) {
return calendarEventClickCb(event, jsEvent, view); return calendarEventClickCb(event, jsEvent, view);
}, },

4
app/frontend/src/javascript/controllers/spaces.js.erb
View File

@ -385,8 +385,8 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$transi
// fullCalendar (v2) configuration // fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({ $scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) { eventClick (event, jsEvent, view) {
return calendarEventClickCb(event, jsEvent, view); return calendarEventClickCb(event, jsEvent, view);
}, },

4
app/frontend/src/javascript/controllers/trainings.js.erb
View File

@ -155,8 +155,8 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$tra
// fullCalendar (v2) configuration // fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({ $scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')), minTime: moment.duration(moment.utc(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')), maxTime: moment.duration(moment.utc(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) { eventClick (event, jsEvent, view) {
return calendarEventClickCb(event, jsEvent, view); return calendarEventClickCb(event, jsEvent, view);
}, },