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

Merge pull request #1292 from shlok007/rename

Browse source 
rename intersecting_events to intersecting_event_schedules
This commit is contained in:
Stella Rouzi 2017-02-12 16:21:03 +02:00 • committed by GitHub
commit 26a83d4a2e
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -529,7 +529,7 @@ module ApplicationHelper
def replacement_event_notice(event_schedule) def replacement_event_notice(event_schedule)
if event_schedule.present? && event_schedule.replacement? if event_schedule.present? && event_schedule.replacement?
replaced_event = (event_schedule.intersecting_events.withdrawn.first || event_schedule.intersecting_events.canceled.first).event replaced_event = (event_schedule.intersecting_event_schedules.withdrawn.first || event_schedule.intersecting_event_schedules.canceled.first).event
content_tag :span do content_tag :span do
concat content_tag :span, 'Please note that this talk replaces ' concat content_tag :span, 'Please note that this talk replaces '
concat link_to replaced_event.title, conference_program_proposal_path(@conference.short_title, replaced_event.id) concat link_to replaced_event.title, conference_program_proposal_path(@conference.short_title, replaced_event.id)

6
app/models/event_schedule.rb
View file

@ -25,14 +25,14 @@ class EventSchedule < ActiveRecord::Base
end end
## ##
# Returns events that are scheduled in the same room and start_time as event # Returns event schedules that are scheduled in the same room and start_time as event
# #
def intersecting_events def intersecting_event_schedules
room.event_schedules.where(start_time: start_time, schedule: schedule).where.not(id: id) room.event_schedules.where(start_time: start_time, schedule: schedule).where.not(id: id)
end end
def replacement? def replacement?
event.state == 'confirmed' && (!intersecting_events.canceled.empty? || !intersecting_events.withdrawn.empty?) event.state == 'confirmed' && (!intersecting_event_schedules.canceled.empty? || !intersecting_event_schedules.withdrawn.empty?)
end end
private private

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

@ -35,8 +35,8 @@
- span -= 1 - span -= 1
- else - else
- event_schedule = event_schedules.find{ |e| e.start_time <= start_room_time and e.end_time > start_room_time } - event_schedule = event_schedules.find{ |e| e.start_time <= start_room_time and e.end_time > start_room_time }
- if event_schedule && (event_schedule.event.state == 'canceled' || event_schedule.event.state == 'withdrawn') && !event_schedule.intersecting_events.confirmed.empty? - if event_schedule && (event_schedule.event.state == 'canceled' || event_schedule.event.state == 'withdrawn') && !event_schedule.intersecting_event_schedules.confirmed.empty?
- replacement_event = event_schedule.intersecting_events.confirmed.first - replacement_event = event_schedule.intersecting_event_schedules.confirmed.first
- 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