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

EventSchedule validations

Browse source 
event, schedule, room and start_time are mandatory in EventSchedule.
This commit is contained in:
Ana 2016-07-26 16:20:31 +02:00
parent 354e15a76d
commit 0b26ed5c35
10 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/conference_controller.rb
View file

@ -18,7 +18,7 @@ class ConferenceController < ApplicationController
end
@events = @conference.program.events
@events_xml = @program.schedules.find(program.selected_schedule).event_schedules.where('start_time IS NOT NULL AND room_id IS NOT NULL').order(start_time: :asc)
@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?
@dates = @conference.start_date..@conference.end_date
@step_minutes = EventType::LENGTH_STEP.minutes
@ -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.where('start_time IS NOT NULL AND room_id IS NOT NULL').order(start_time: :asc)
@events_schedules = @program.schedules.find(@program.selected_schedule).event_schedules.order(start_time: :asc)
else
@events_schedules = []
end