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

[feat]Move happening_now to ConferenceHelper

Browse source
This commit is contained in:
Jimmy 2021-04-06 13:16:59 +08:00 • committed by CactusPuppy
parent 322a5b40bc
commit 2ea27b21da
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/schedules_controller.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: true
class SchedulesController < ApplicationController
include ConferenceHelper
load_and_authorize_resource
before_action :respond_to_options
load_resource :conference, find_by: :short_title
@ -67,10 +69,7 @@ class SchedulesController < ApplicationController
end
def happening_now
@events_schedules = @program.selected_event_schedules(
includes: [:room, { event: %i[track event_type speakers submitter] }]
).select(&:happening_now?)
@events_schedules = [] unless @events_schedules
@events_schedules = get_happening_now_events_schedules_schedules(@conference)
@current_time = Time.now.in_time_zone(@conference.timezone)
respond_to do |format|

8
app/helpers/conference_helper.rb
View file

@ -77,4 +77,12 @@ module ConferenceHelper
end
calendar
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