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

Merge pull request #1319 from JewelSam/master

Browse source 
#1220 adding the cell size attribute to the database
This commit is contained in:
Ana María Martínez Gómez 2017-04-03 10:23:49 +02:00 • committed by GitHub
commit f3e712a1bc
19 changed files with 104 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/schedules/_carousel.html.haml
View file

@ -1,4 +1,4 @@
- intervals = hrs_per_slide * 60 / EventType::LENGTH_STEP + 1
- intervals = hrs_per_slide * 60 / @conference.program.schedule_interval + 1
- width = 85 / intervals
- carousel_number = (@conf_period / hrs_per_slide.to_f).ceil
.carousel.slide{ id: "carousel-#{ date }-#{ hrs_per_slide }", |
@ -41,7 +41,7 @@
- if event_schedule
/ There is an event, calculate the span and show it
- event_span = (event_schedule.end_time.to_i - start_room_time.to_i) / 60 / EventType::LENGTH_STEP
- event_span = (event_schedule.end_time.to_i - start_room_time.to_i) / 60 / @conference.program.schedule_interval
- span = ((event_span + i - 1 ) > intervals ? intervals + 1 - i : event_span)
= render partial: 'schedule_item', locals: {event: event_schedule.event, event_schedule: event_schedule, span: span, width: width}
- else

2
app/views/schedules/show.xml.haml
View file

@ -6,7 +6,7 @@
%start= @conference.start_date
%end= @conference.end_date
%days= (@conference.end_date - @conference.start_date).to_i + 1
%timeslot_duration= length_timestamp(EventType::LENGTH_STEP)
%timeslot_duration= length_timestamp(@conference.program.schedule_interval)
- if @events_xml.any?
- @events_xml.keys.each.with_index(1) do |day, index|