From a2b3396897dd6d1af60abe3fa388ff0893deb049 Mon Sep 17 00:00:00 2001 From: shlok007 Date: Sun, 12 Feb 2017 19:10:03 +0530 Subject: [PATCH] rename intersecting_events to intersecting_event_schedules --- app/helpers/application_helper.rb | 2 +- app/models/event_schedule.rb | 6 +++--- app/views/schedules/_carousel.html.haml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6535f4bb..2ccbe7cf 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -529,7 +529,7 @@ module ApplicationHelper def replacement_event_notice(event_schedule) 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 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) diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index b83e7c8c..045070d6 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -25,14 +25,14 @@ class EventSchedule < ActiveRecord::Base 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) end 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 private diff --git a/app/views/schedules/_carousel.html.haml b/app/views/schedules/_carousel.html.haml index 2a8e4c74..5c5acc29 100644 --- a/app/views/schedules/_carousel.html.haml +++ b/app/views/schedules/_carousel.html.haml @@ -35,8 +35,8 @@ - span -= 1 - else - 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? - - replacement_event = event_schedule.intersecting_events.confirmed.first + - 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_event_schedules.confirmed.first - event_schedule = (replacement_event.start_time <= start_room_time && replacement_event.end_time > start_room_time) ? replacement_event : nil - if event_schedule