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

rename intersecting_events to intersecting_event_schedules

Browse source
This commit is contained in:
shlok007 2017-02-12 19:10:03 +05:30
parent 0296a1e70d
commit a2b3396897
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/event_schedule.rb
View file

@ -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