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

Repeated sentence moved to a function

Browse source 
program.selected_schedule.event_schedules.order(start_time: :asc) was repeated several times and it has been moved to conference#selected_event_schedules
This commit is contained in:
Ana 2016-07-28 17:37:11 +02:00
parent beb17165a2
commit 3897ec79ca
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/conference_controller.rb
View file

@ -18,8 +18,8 @@ class ConferenceController < ApplicationController
end end
@events = @conference.program.events @events = @conference.program.events
@events_xml = @program.selected_schedule.event_schedules.order(start_time: :asc).map(&:event) schedules = @program.selected_event_schedules
.group_by{ |event| event.scheduled_start_time.to_date } if @program.selected_schedule.present? @events_xml = schedules.map(&:event).group_by{ |event| event.scheduled_start_time.to_date } if schedules
@dates = @conference.start_date..@conference.end_date @dates = @conference.start_date..@conference.end_date
@step_minutes = EventType::LENGTH_STEP.minutes @step_minutes = EventType::LENGTH_STEP.minutes
@conf_start = 9 @conf_start = 9
@ -37,11 +37,9 @@ class ConferenceController < ApplicationController
def events def events
@dates = @conference.start_date..@conference.end_date @dates = @conference.start_date..@conference.end_date
if @program.selected_schedule.present? @events_schedules = @program.selected_event_schedules
@events_schedules = @program.selected_schedule.event_schedules.order(start_time: :asc) @events_schedules = [] unless @events_schedules
else
@events_schedules = []
end
@unscheduled_events = @program.events.unscheduled(@program.selected_schedule.id) @unscheduled_events = @program.events.unscheduled(@program.selected_schedule.id)
day = @conference.current_conference_day day = @conference.current_conference_day

5
app/models/program.rb
View file

@ -61,6 +61,11 @@ class Program < ActiveRecord::Base
before_create :create_difficulty_levels before_create :create_difficulty_levels
validate :check_languages_format validate :check_languages_format
# Returns all event_schedules for the selected schedule ordered by start_time
def selected_event_schedules
selected_schedule.event_schedules.order(start_time: :asc) if selected_schedule
end
## ##
# Checks if blind_voting is enabled and if voting period is over # Checks if blind_voting is enabled and if voting period is over
# ====Returns # ====Returns

4
spec/controllers/conference_controller_spec.rb
View file

@ -39,8 +39,8 @@ describe ConferenceController do
it 'assigns variables' do it 'assigns variables' do
expect(assigns(:conference)).to eq conference expect(assigns(:conference)).to eq conference
expect(assigns(:events_xml)).to eq conference.program.selected_schedule.event_schedules.order(start_time: :asc) expect(assigns(:events_xml)).to eq conference.selected_event_schedules.map(&:event)
.map(&:event).group_by{ |event| event.scheduled_start_time.to_date } .group_by{ |event| event.scheduled_start_time.to_date }
end end
it 'renders successfully' do it 'renders successfully' do