gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve template readability

Browse source
This commit is contained in:
Zach Kemp 2018-04-11 15:03:24 -07:00 • committed by James Mason
parent 7d5d935a65
commit 3f2f35283c
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/schedules_controller.rb
View file

@ -9,18 +9,18 @@ class SchedulesController < ApplicationController
before_action :load_withdrawn_event_schedules, only: [:show, :events] before_action :load_withdrawn_event_schedules, only: [:show, :events]
def show def show
@event_schedules = @program.selected_event_schedules( event_schedules = @program.selected_event_schedules(
includes: [{ event: %i[event_type speakers submitter] }] includes: [{ event: %i[event_type speakers submitter] }]
) )
unless @event_schedules unless event_schedules
redirect_to events_conference_schedule_path(@conference.short_title) redirect_to events_conference_schedule_path(@conference.short_title)
return return
end end
respond_to do |format| respond_to do |format|
format.xml do format.xml do
@events_xml = @event_schedules.map(&:event).group_by{ |event| event.time.to_date } if @event_schedules @events_xml = event_schedules.map(&:event).group_by{ |event| event.time.to_date } if event_schedules
end end
format.html do format.html do
@ -43,6 +43,7 @@ class SchedulesController < ApplicationController
@selected_schedules_ids << track.selected_schedule_id @selected_schedules_ids << track.selected_schedule_id
end end
@selected_schedules_ids.compact! @selected_schedules_ids.compact!
@event_schedules_by_room_id = event_schedules.select { |s| @selected_schedules_ids.include?(s.schedule_id) }.group_by(&:room_id)
end end
end end
end end

1
app/models/program.rb
View file

@ -172,6 +172,7 @@ class Program < ApplicationRecord
# * +True+ -> If there is any event for the given date # * +True+ -> If there is any event for the given date
# * +False+ -> If there is not any event for the given date # * +False+ -> If there is not any event for the given date
def any_event_for_this_date?(date) def any_event_for_this_date?(date)
return false unless selected_schedule.present?
parsed_date = DateTime.parse("#{date} 00:00").utc parsed_date = DateTime.parse("#{date} 00:00").utc
range = parsed_date..(parsed_date + 1.day) range = parsed_date..(parsed_date + 1.day)
selected_schedule.event_schedules.any? { |es| range.cover?(es.start_time) } selected_schedule.event_schedules.any? { |es| range.cover?(es.start_time) }

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

@ -1,5 +1,5 @@
- intervals = hrs_per_slide * 60 / @conference.program.schedule_interval + 1 - interval_count = hrs_per_slide * 60 / @conference.program.schedule_interval + 1
- width = 85 / intervals - width = 85 / interval_count
- carousel_number = (@conf_period / hrs_per_slide.to_f).ceil - carousel_number = (@conf_period / hrs_per_slide.to_f).ceil
.carousel.slide{ id: "carousel-#{ date }-#{ hrs_per_slide }", | .carousel.slide{ id: "carousel-#{ date }-#{ hrs_per_slide }", |
"data-ride" => "carousel", | "data-ride" => "carousel", |
@ -14,7 +14,7 @@
%tr %tr
%th %th
- td_start_time = start_time - td_start_time = start_time
- (1..intervals).each do |i| - interval_count.times do
%th.date %th.date
%span %span
= (td_start_time).strftime("%H:") = (td_start_time).strftime("%H:")
@ -29,8 +29,10 @@
%td.room{ style: "height: #{ td_height(@rooms) }px;" } %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.elipsis.break-words{ style: "-webkit-line-clamp: #{ room_lines(@rooms) }; height: #{ room_height(@rooms) }px;" }
= room.name = room.name
- event_schedules = @event_schedules.select{ |e| e.room_id == room.id && @selected_schedules_ids.include?(e.schedule_id) && (e.end_time > start_time) && (e.start_time <= (start_time + hrs_per_slide.hour)) }
- (1..intervals).each do |i| - event_schedules = (@event_schedules_by_room_id[room.id] || []).select{ |e| (e.end_time > start_time) && (e.start_time <= (start_time + hrs_per_slide.hour)) }
- interval_count.times do |offset|
- if span > 1 - if span > 1
- span -= 1 - span -= 1
- else - else
@ -40,12 +42,12 @@
- event_schedule = (replacement_event.start_time <= start_room_time && replacement_event.end_time > start_room_time) ? replacement_event : nil - event_schedule = (replacement_event.start_time <= start_room_time && replacement_event.end_time > start_room_time) ? replacement_event : nil
- if event_schedule - if event_schedule
/ There is an event, calculate the span and show it -# There is an event, calculate the span and show it
- event_span = (event_schedule.end_time.to_i - start_room_time.to_i) / 60 / @conference.program.schedule_interval - 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) - span = ((event_span + offset) > interval_count ? interval_count - offset : event_span)
= render partial: 'schedule_item', locals: {event: event_schedule.event, event_schedule: event_schedule, span: span, width: width} = render partial: 'schedule_item', locals: {event: event_schedule.event, event_schedule: event_schedule, span: span, width: width}
- else - else
/ if span equals 1 show an empty td -# if span equals 1 show an empty td
%td.no-padding{ width: "#{ width }%"} %td.no-padding{ width: "#{ width }%"}
- start_room_time += @step_minutes - start_room_time += @step_minutes
- start_time = start_room_time - @step_minutes - start_time = start_room_time - @step_minutes