gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[feat]Properly add timezone to events starttime and endtime; set now to be the time in conference timezone instead of the user s time zone in fullcalendar

Browse source
This commit is contained in:
Jimmy 2021-05-01 01:37:52 +08:00
parent 66767c33a2
commit bc115d6f90
No known key found for this signature in database
GPG key ID: FAE75C760A4A5CC6
6 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/fullcalendar.js
View file

@ -6,6 +6,7 @@ $( document ).ready(function() {
var calendar = new FullCalendar.Calendar(calendarEl, {
schedulerLicenseKey: fullcalData.data('schedulerLicenseKey'),
nowIndicator: true,
now: fullcalData.data('now'),
expandRows: true,
allDaySlot: false,
slotMinTime: fullcalData.data('startHour') + ':00:00',
@ -14,7 +15,7 @@ $( document ).ready(function() {
start: fullcalData.data('startDate'),
end: fullcalData.data('endDate')
},
timeZone: 'UTC', // TODO: Events are stored in conference's timezone implicitly (UTC+0) in the database
timeZone: fullcalData.data('timezone'),
initialDate: fullcalData.data('day'),
initialView: 'resourceTimeGridDay',
resources: fullcalData.data('rooms'),