Merge pull request #1030 from Ana06/public-schedule

New schedule
2016-06-30 12:13:51 +02:00 · 2016-06-30 12:13:51 +02:00 · 92e9043a57
commit 92e9043a57
parent c39a4541cf 028d430885
11 changed files with 320 additions and 93 deletions
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@ -16,6 +16,10 @@ class ConferenceController < ApplicationController
    @events = @conference.program.events
    @events_xml = @events.scheduled.order(start_time: :asc).group_by{ |event| event.start_time.to_date }
    @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

    if @dates == Date.current
      @today = Date.current.strftime('%Y-%m-%d')