From b3bbaf87a419894e74df94639d7b0e83dac8983f Mon Sep 17 00:00:00 2001 From: Ana Date: Mon, 15 Aug 2016 13:11:33 +0200 Subject: [PATCH] Adapt public schedule to use the confence hours --- app/controllers/schedules_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 91559aa1..0b135328 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -14,16 +14,15 @@ 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 - @conf_start = 9 - conf_end = 20 - @conf_period = conf_end - @conf_start + @conf_start = @conference.start_hour + @conf_period = @conference.end_hour - @conf_start # the schedule takes you to today if it is a date of the schedule @current_day = @conference.current_conference_day @day = @current_day.present? ? @current_day : @dates.first return unless @current_day # the schedule takes you to the current time if it is beetween the start and the end time. - @hour_column = @conference.hours_from_start_time(@conf_start, conf_end) + @hour_column = @conference.hours_from_start_time(@conf_start, @conference.end_hour) end def events