gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce an association for the selected_schedule

Browse source 
Association in Program fot the selected_schedule
This commit is contained in:
Ana 2016-07-28 12:50:32 +02:00
parent 3f114629f9
commit beb17165a2
10 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conference/_carousel.html.haml
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) && (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.start_time >= start_time) && (e.start_time < (start_time + number_columns.hour)) }
- (1..intervals).each do |i|
- if span > 1
- span -= 1