Merge pull request #1319 from JewelSam/master

#1220 adding the cell size attribute to the database
This commit is contained in:
Ana María Martínez Gómez 2017-04-03 10:23:49 +02:00 committed by GitHub
commit f3e712a1bc
19 changed files with 104 additions and 35 deletions

View file

@ -14,7 +14,7 @@ class SchedulesController < ApplicationController
@events_xml = schedules.map(&:event).group_by{ |event| event.time.to_date } if schedules
@dates = @conference.start_date..@conference.end_date
@step_minutes = EventType::LENGTH_STEP.minutes
@step_minutes = @program.schedule_interval.minutes
@conf_start = @conference.start_hour
@conf_period = @conference.end_hour - @conf_start