diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb index 96f62aed..1537174f 100644 --- a/app/controllers/conference_controller.rb +++ b/app/controllers/conference_controller.rb @@ -15,6 +15,12 @@ class ConferenceController < ApplicationController @rooms = @conference.venue.rooms if @conference.venue @events = @conference.program.events @dates = @conference.start_date..@conference.end_date + @start_hour = 9 + @end_hour = 19 + @intervals = (@end_hour - @start_hour) * 60 / EventType::LENGTH_STEP + @width = 95 / @intervals + @step_minutes = EventType::LENGTH_STEP.minutes + if @dates == Date.current @today = Date.current.strftime('%Y-%m-%d') else diff --git a/app/models/conference.rb b/app/models/conference.rb index f0b73047..c90a8ea2 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -81,6 +81,16 @@ class Conference < ActiveRecord::Base result end + ## + # Check if there is any event in the program scheduled. + # + # ====Returns + # * +false+ -> If there aren't schedules events + # * +true+ -> If there are schedules events + def scheduled? + self.program.events.where.not(start_time: nil).any? + end + ## # Checks if the user is registered to the conference # diff --git a/app/models/event.rb b/app/models/event.rb index 1e118095..6bf7d88c 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -223,6 +223,13 @@ class Event < ActiveRecord::Base (100 * result.values.count(true) / result.values.compact.count).to_s end + ## + # Returns the number of columns this event should span in the schedule + # + def span + self.event_type.length / EventType::LENGTH_STEP + end + private ## diff --git a/app/models/event_type.rb b/app/models/event_type.rb index 69a54d10..d073abef 100644 --- a/app/models/event_type.rb +++ b/app/models/event_type.rb @@ -8,4 +8,7 @@ class EventType < ActiveRecord::Base validates :maximum_abstract_length, presence: true alias_attribute :name, :title + + # If LENGTH_STEP > 60 the public schedule must be changed + LENGTH_STEP = 15 end diff --git a/app/models/program.rb b/app/models/program.rb index 36df5829..c8a04118 100644 --- a/app/models/program.rb +++ b/app/models/program.rb @@ -26,10 +26,6 @@ class Program < ActiveRecord::Base where(state: :confirmed) end - def scheduled - where.not(start_time: nil) - end - def highlights where(state: :confirmed, is_highlight: true) end diff --git a/app/views/conference/_schedule.html.erb b/app/views/conference/_schedule.html.erb index 2f73efab..87da38b2 100644 --- a/app/views/conference/_schedule.html.erb +++ b/app/views/conference/_schedule.html.erb @@ -14,9 +14,7 @@
| Rooms | - <%# The conference starts at 9 and ends at 18:45 %> - <% intervals = (19 - 9) * 4 %> - <% (9..18).each do |i| %> + <% (@start_hour..@end_hour-1).each do |i| %><%= "#{i}:00" %> | <% end %>|||
|---|---|---|---|---|
| <%= room.name %> | <% events_for_date = room.events.find_all{ |e| e.start_time.to_date == date } %> - <% start_time = DateTime.parse("#{date} 09:00") %> - <% (1..intervals).each do |i| %> + <% start_time = DateTime.parse("#{date} #{@start_hour}:00") %> + <% (1..@intervals).each do |i| %> <% events_for_time = events_for_date.find_all{|e| e.start_time == start_time} %> <% if !events_for_time.empty? %> <% event = events_for_time[0] %> - <% span = event.event_type.length / 15 %> - <%= render partial: 'schedule_item', locals: {event: event, span: span, intervals: intervals} %> + <% span = event.span %> + <%= render partial: 'schedule_item', locals: {event: event, span: span, width: @width} %> <% span += 1 %> <% elsif span > 1 %> <% span -= 1 %> <% end %> <% if span == 1 %> -- | +<% end %> - <% start_time += 15.minutes %> + <% start_time += @step_minutes %> <% end %> | ||