From 6ba3512d2bdd58a4f23c3d349c80a5783edbd9f2 Mon Sep 17 00:00:00 2001 From: Ana Date: Mon, 30 May 2016 20:04:08 +0200 Subject: [PATCH 1/2] public schedule turned --- app/controllers/conference_controller.rb | 1 - app/views/conference/_schedule.html.erb | 62 ++++++++----------- app/views/conference/_schedule_item.html.haml | 19 +++--- 3 files changed, 34 insertions(+), 48 deletions(-) diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb index eecaf71d..96f62aed 100644 --- a/app/controllers/conference_controller.rb +++ b/app/controllers/conference_controller.rb @@ -15,7 +15,6 @@ class ConferenceController < ApplicationController @rooms = @conference.venue.rooms if @conference.venue @events = @conference.program.events @dates = @conference.start_date..@conference.end_date - if @dates == Date.current @today = Date.current.strftime('%Y-%m-%d') else diff --git a/app/views/conference/_schedule.html.erb b/app/views/conference/_schedule.html.erb index 1d036378..2f73efab 100644 --- a/app/views/conference/_schedule.html.erb +++ b/app/views/conference/_schedule.html.erb @@ -13,51 +13,39 @@
- - <% @rooms.each do |room| %> - + + <%# The conference starts at 9 and ends at 18:45 %> + <% intervals = (19 - 9) * 4 %> + <% (9..18).each do |i| %> + <% end %> - - <% span = {} %> - <% @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 %> - + <% @rooms.each do |room| %> + <% span = 1 %> - - - <% @rooms.each do |room| %> - <% events_for_date = @events.find_all {|e| e.room_id == room.id && e.start_time && e.start_time.to_date == date } %> - <% event = events_for_date.find_all{|e| e.start_time.hour == start_hour && e.start_time.min == start_min } %> - <% if !event.empty? %> - - <% span[room.id] = event[0].event_type.length / 15 %> - <%= render partial: 'schedule_item', locals: {event: event, room: room, span: span} %> - <% span[room.id] = span[room.id] + 1 %> - <% elsif span[room.id] > 1 %> - - <% span[room.id] = ( span[room.id] - 1 ) if span[room.id] > 1 %> + + <% 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| %> + <% 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 += 1 %> + <% elsif span > 1 %> + <% span -= 1 %> <% end %> - <% if span[room.id] == 1 %> + <% if span == 1 %> - <% end %> - <%end %> + <% start_time += 15.minutes %> + <% end %> - <% conf_start += 15.minutes %> - <%end %> + <% end %>
Time<%= room.name %>Rooms<%= "#{i}:00" %>
- <%= conf_start.strftime("%H:%M") %> - <%= room.name %> +
<% end %> diff --git a/app/views/conference/_schedule_item.html.haml b/app/views/conference/_schedule_item.html.haml index 743095ca..167fbbb5 100644 --- a/app/views/conference/_schedule_item.html.haml +++ b/app/views/conference/_schedule_item.html.haml @@ -1,24 +1,23 @@ -%td.event{ style: "width: #{95 / @rooms.length}%; cursor:pointer", | - rowspan: span[room.id], | +%td.event{ style: "width: #{95 * span / intervals}%; cursor:pointer", | + colspan: span, | role: "button" } | - %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event[0].id))} - - if speaker = event[0].speakers.first + %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))} + - if speaker = event.speakers.first = image_tag speaker.gravatar_url, :class => "img-circle pull-right", | :alt => speaker.name, | :title => speaker.name, | :style => "padding:8px;" | %h5 %span.fa.fa-comment - = event[0].title - - unless event[0].subtitle.blank? + = event.title + - unless event.subtitle.blank? %span.schedule-subtitle - = event[0].subtitle + = event.subtitle %span.schedule-speaker %span.fa.fa-user = speaker.name - - if event[0].track + - if event.track %span.schedule-track %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 - From 2905c8858cf89702c9c5ea66b22f6891384ca35b Mon Sep 17 00:00:00 2001 From: Ana Date: Wed, 1 Jun 2016 11:22:22 +0200 Subject: [PATCH 2/2] Talk boxes with less information and schedule view simplified --- app/controllers/conference_controller.rb | 6 ++++++ app/models/conference.rb | 10 ++++++++++ app/models/event.rb | 7 +++++++ app/models/event_type.rb | 3 +++ app/models/program.rb | 4 ---- app/views/conference/_schedule.html.erb | 17 +++++++--------- app/views/conference/_schedule_item.html.haml | 20 ++++--------------- app/views/conference/schedule.html.erb | 2 +- 8 files changed, 38 insertions(+), 31 deletions(-) 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 @@ - <%# 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| %> <% end %> @@ -25,24 +23,23 @@ <% 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 %> <% end %> diff --git a/app/views/conference/_schedule_item.html.haml b/app/views/conference/_schedule_item.html.haml index 167fbbb5..53262cf7 100644 --- a/app/views/conference/_schedule_item.html.haml +++ b/app/views/conference/_schedule_item.html.haml @@ -1,23 +1,11 @@ -%td.event{ style: "width: #{95 * span / intervals}%; cursor:pointer", | +%td.event{ style: "width: #{width * span}%; cursor:pointer", | colspan: span, | role: "button" } | %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))} + %h5 + = event.title - if speaker = event.speakers.first = image_tag speaker.gravatar_url, :class => "img-circle pull-right", | :alt => speaker.name, | :title => speaker.name, | - :style => "padding:8px;" | - %h5 - %span.fa.fa-comment - = event.title - - unless event.subtitle.blank? - %span.schedule-subtitle - = event.subtitle - %span.schedule-speaker - %span.fa.fa-user - = speaker.name - - if event.track - %span.schedule-track - %span.fa.fa-road - %span.label{ style: "background-color: #{event.track.color}" } - = event[0].track.name + :style => "padding:2px 0px;" | diff --git a/app/views/conference/schedule.html.erb b/app/views/conference/schedule.html.erb index 9390cf5d..ceaf506d 100644 --- a/app/views/conference/schedule.html.erb +++ b/app/views/conference/schedule.html.erb @@ -1,5 +1,5 @@
- <% if @conference.program.events.scheduled.any? %> + <% if @conference.scheduled? %>
Rooms<%= "#{i}:00" %>
<%= room.name %> -