Merge pull request #1251 from Ana06/schedule-bug

Fix bug in the schedule
This commit is contained in:
Stella Rouzi 2017-01-19 12:21:21 +02:00 committed by GitHub
commit 2a0e1b5dea

View file

@ -27,7 +27,7 @@
%td.room{ style: "height: #{ td_height(@rooms) }px;" }
.room.elipsis.break-words{ style: "-webkit-line-clamp: #{ room_lines(@rooms) }; height: #{ room_height(@rooms) }px;" }
= room.name
- event_schedules = room.event_schedules.select{ |e| (e.schedule_id == @conference.program.selected_schedule.id) && (e.start_time >= start_time) && (e.start_time <= (start_time + number_columns.hour)) }
- event_schedules = room.event_schedules.select{ |e| (e.schedule_id == @conference.program.selected_schedule.id) && (e.end_time > start_time) && (e.start_time <= (start_time + number_columns.hour)) }
- (1..intervals).each do |i|
- if span > 1
- span -= 1