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

Introduce an association for the selected_schedule

Browse source 
Association in Program fot the selected_schedule
This commit is contained in:
Ana 2016-07-28 12:50:32 +02:00
parent 3f114629f9
commit beb17165a2
10 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/schedules_controller.rb
View file

@ -25,10 +25,10 @@ module Admin
# if there is not selected schedule we create it
unless @program.selected_schedule.present?
schedule = @program.schedules.create
@program.selected_schedule = schedule.id
@program.selected_schedule = schedule
@program.save!
end
@schedule_id = @program.selected_schedule
@schedule_id = @program.selected_schedule.id
end
def update

8
app/controllers/conference_controller.rb
View file

@ -13,13 +13,13 @@ class ConferenceController < ApplicationController
def schedule
@rooms = @conference.venue.rooms if @conference.venue
unless @program.selected_schedule.present? && @program.events.scheduled(@program.selected_schedule).any?
unless @program.selected_schedule.present? && @program.events.scheduled(@program.selected_schedule.id).any?
redirect_to events_conference_path(@conference.short_title)
end
@events = @conference.program.events
@events_xml = @program.schedules.find(@program.selected_schedule).event_schedules.order(start_time: :asc)
.map(&:event).group_by{ |event| event.scheduled_start_time.to_date } if program.selected_schedule.present?
@events_xml = @program.selected_schedule.event_schedules.order(start_time: :asc).map(&:event)
.group_by{ |event| event.scheduled_start_time.to_date } if @program.selected_schedule.present?
@dates = @conference.start_date..@conference.end_date
@step_minutes = EventType::LENGTH_STEP.minutes
@conf_start = 9
@ -38,7 +38,7 @@ class ConferenceController < ApplicationController
@dates = @conference.start_date..@conference.end_date
if @program.selected_schedule.present?
@events_schedules = @program.schedules.find(@program.selected_schedule).event_schedules.order(start_time: :asc)
@events_schedules = @program.selected_schedule.event_schedules.order(start_time: :asc)
else
@events_schedules = []
end