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

public schedule turned

Browse source
This commit is contained in:
Ana 2016-05-30 20:04:08 +02:00
parent 301ad1c722
commit 6ba3512d2b
3 changed files with 34 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/conference_controller.rb
View file

@ -15,7 +15,6 @@ class ConferenceController < ApplicationController
@rooms = @conference.venue.rooms if @conference.venue @rooms = @conference.venue.rooms if @conference.venue
@events = @conference.program.events @events = @conference.program.events
@dates = @conference.start_date..@conference.end_date @dates = @conference.start_date..@conference.end_date
if @dates == Date.current if @dates == Date.current
@today = Date.current.strftime('%Y-%m-%d') @today = Date.current.strftime('%Y-%m-%d')
else else

62
app/views/conference/_schedule.html.erb
View file

@ -13,51 +13,39 @@
<div class="tab-pane <%= 'active' if @dates.first == date %>" id ="<%= date %>" > <div class="tab-pane <%= 'active' if @dates.first == date %>" id ="<%= date %>" >
<table class="table table-bordered" id="schedule" width="100%"> <table class="table table-bordered" id="schedule" width="100%">
<tr> <tr>
<th>Time</th> <th>Rooms</th>
<% @rooms.each do |room| %> <%# The conference starts at 9 and ends at 18:45 %>
<th><%= room.name %></th> <% intervals = (19 - 9) * 4 %>
<% (9..18).each do |i| %>
<th colspan="4"><%= "#{i}:00" %></th>
<% end %> <% end %>
</tr> </tr>
<% @rooms.each do |room| %>
<% span = {} %> <% span = 1 %>
<% @rooms.each do |room| %>
<% span[room.id] = 1 %>
<% end %>
<% conf_start = DateTime.parse("#{date} 09:00") %>
<% conf_end = DateTime.parse("#{date} 19:00") %>
<% while conf_start < conf_end %>
<%-
start_hour = conf_start.hour
start_min = conf_start.min %>
<tr> <tr>
<td style="width:5%"> <td><%= room.name %></td>
<%= conf_start.strftime("%H:%M") %> <% events_for_date = room.events.find_all{ |e| e.start_time.to_date == date } %>
</td> <% start_time = DateTime.parse("#{date} 09:00") %>
<% (1..intervals).each do |i| %>
<% @rooms.each do |room| %> <% events_for_time = events_for_date.find_all{|e| e.start_time == start_time} %>
<% events_for_date = @events.find_all {|e| e.room_id == room.id && e.start_time && e.start_time.to_date == date } %> <% if !events_for_time.empty? %>
<% event = events_for_date.find_all{|e| e.start_time.hour == start_hour && e.start_time.min == start_min } %> <% event = events_for_time[0] %>
<% if !event.empty? %> <!-- There is an event, calculate the span and show it -->
<!-- There is an event, calculate the span and show it --> <% span = event.event_type.length / 15 %>
<% span[room.id] = event[0].event_type.length / 15 %> <%= render partial: 'schedule_item', locals: {event: event, span: span, intervals: intervals} %>
<%= render partial: 'schedule_item', locals: {event: event, room: room, span: span} %> <% span += 1 %>
<% span[room.id] = span[room.id] + 1 %> <% elsif span > 1 %>
<% elsif span[room.id] > 1 %> <% span -= 1 %>
<!-- span is <%= span[room.id] %> and bigger than 1, substract 1 from span -->
<% span[room.id] = ( span[room.id] - 1 ) if span[room.id] > 1 %>
<% end %> <% end %>
<% if span[room.id] == 1 %> <% if span == 1 %>
<!-- span equals 1 show an empty td --> <!-- span equals 1 show an empty td -->
<td style="width: <%= 95 / @rooms.length %>%"> <td style="width: <%= 95 / intervals%>%">
</td> </td>
<% end %> <% end %>
<%end %> <% start_time += 15.minutes %>
<% end %>
</tr> </tr>
<% conf_start += 15.minutes %> <% end %>
<%end %>
</table> </table>
</div> </div>
<% end %> <% end %>

19
app/views/conference/_schedule_item.html.haml
View file

@ -1,24 +1,23 @@
%td.event{ style: "width: #{95 / @rooms.length}%; cursor:pointer", | %td.event{ style: "width: #{95 * span / intervals}%; cursor:pointer", |
rowspan: span[room.id], | colspan: span, |
role: "button" } | role: "button" } |
%a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event[0].id))} %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))}
- if speaker = event[0].speakers.first - if speaker = event.speakers.first
= image_tag speaker.gravatar_url, :class => "img-circle pull-right", | = image_tag speaker.gravatar_url, :class => "img-circle pull-right", |
:alt => speaker.name, | :alt => speaker.name, |
:title => speaker.name, | :title => speaker.name, |
:style => "padding:8px;" | :style => "padding:8px;" |
%h5 %h5
%span.fa.fa-comment %span.fa.fa-comment
= event[0].title = event.title
- unless event[0].subtitle.blank? - unless event.subtitle.blank?
%span.schedule-subtitle %span.schedule-subtitle
= event[0].subtitle = event.subtitle
%span.schedule-speaker %span.schedule-speaker
%span.fa.fa-user %span.fa.fa-user
= speaker.name = speaker.name
- if event[0].track - if event.track
%span.schedule-track %span.schedule-track
%span.fa.fa-road %span.fa.fa-road
%span.label{ style: "background-color: #{event[0].track.color}" } %span.label{ style: "background-color: #{event.track.color}" }
= event[0].track.name = event[0].track.name