rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-19 08:52:25 +01:00
Code Issues Releases Activity

(bug) unable to show calendar for Firefox and Safari

Browse Source
This commit is contained in:
Du Peng 2023-05-02 05:49:45 -04:00
parent f39691d4c4
commit a6574cc80e
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog Fab-manager
- Fix a bug: unable to show calendar for Firefox and Safari
## v6.0.4 2023 April 25
- Fix a bug: notification is broken when delete a project

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

@ -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).format('HH:mm:ss')),
maxTime: moment.duration(moment.utc(bookingWindowEnd.setting.value).format('HH:mm:ss')),
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')),
select (start, end, jsEvent, view) {
return calendarSelectCb(start, end, jsEvent, view);
},

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

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