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

merge

Browse source
This commit is contained in:
Jimmy 2021-05-01 01:42:03 +08:00
commit 4a0da37a96
No known key found for this signature in database
GPG key ID: FAE75C760A4A5CC6
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/fullcalendar.js → app/assets/javascripts/fullcalendar.js.erb
View file

@ -3,8 +3,10 @@ $( document ).ready(function() {
if (!calendarEl) return; //check that we need a vertical schedule if (!calendarEl) return; //check that we need a vertical schedule
let fullcalData = $('#fullcalendar'); let fullcalData = $('#fullcalendar');
let license_key = "<%= Rails.configuration.fullcalendar[:license_key] %>";
var calendar = new FullCalendar.Calendar(calendarEl, { var calendar = new FullCalendar.Calendar(calendarEl, {
schedulerLicenseKey: fullcalData.data('schedulerLicenseKey'), schedulerLicenseKey: license_key,
nowIndicator: true, nowIndicator: true,
now: fullcalData.data('now'), now: fullcalData.data('now'),
expandRows: true, expandRows: true,
@ -24,3 +26,5 @@ $( document ).ready(function() {
calendar.render(); calendar.render();
}); });

3
app/views/schedules/vertical_schedule.haml
View file

@ -9,5 +9,4 @@
#fullcalendar{ data: { rooms: @rooms, events: @event_schedules, day: @day, #fullcalendar{ data: { rooms: @rooms, events: @event_schedules, day: @day,
'start-hour': @conference.start_hour, 'end-hour': @conference.end_hour, 'start-hour': @conference.start_hour, 'end-hour': @conference.end_hour,
'start-date': @conference.start_date, 'end-date': @conference.end_date + 1.day, 'start-date': @conference.start_date, 'end-date': @conference.end_date + 1.day,
'timezone': @conference.timezone, 'now': @now, 'timezone': @conference.timezone, 'now': @now } }
'scheduler-license-key': @scheduler_license_key } }