[feat]Move happening_now to ConferenceHelper
This commit is contained in:
parent
322a5b40bc
commit
2ea27b21da
2 changed files with 11 additions and 4 deletions
|
|
@ -1,6 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class SchedulesController < ApplicationController
|
class SchedulesController < ApplicationController
|
||||||
|
include ConferenceHelper
|
||||||
|
|
||||||
load_and_authorize_resource
|
load_and_authorize_resource
|
||||||
before_action :respond_to_options
|
before_action :respond_to_options
|
||||||
load_resource :conference, find_by: :short_title
|
load_resource :conference, find_by: :short_title
|
||||||
|
|
@ -67,10 +69,7 @@ class SchedulesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def happening_now
|
def happening_now
|
||||||
@events_schedules = @program.selected_event_schedules(
|
@events_schedules = get_happening_now_events_schedules_schedules(@conference)
|
||||||
includes: [:room, { event: %i[track event_type speakers submitter] }]
|
|
||||||
).select(&:happening_now?)
|
|
||||||
@events_schedules = [] unless @events_schedules
|
|
||||||
@current_time = Time.now.in_time_zone(@conference.timezone)
|
@current_time = Time.now.in_time_zone(@conference.timezone)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|
|
||||||
|
|
@ -77,4 +77,12 @@ module ConferenceHelper
|
||||||
end
|
end
|
||||||
calendar
|
calendar
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_happening_now_events_schedules_schedules(conference)
|
||||||
|
events_schedules = conference.program.selected_event_schedules(
|
||||||
|
includes: [:room, { event: %i[track event_type speakers submitter] }]
|
||||||
|
).select(&:happening_now?)
|
||||||
|
events_schedules = [] unless events_schedules
|
||||||
|
events_schedules
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue