Show the individual User schedule
Show the current user favourites events for both schedule and all events. Unsed css removed.
This commit is contained in:
parent
9154f1883d
commit
f54df5922e
8 changed files with 32 additions and 31 deletions
|
|
@ -1,6 +1,7 @@
|
|||
class SchedulesController < ApplicationController
|
||||
protect_from_forgery with: :null_session
|
||||
before_action :respond_to_options
|
||||
before_action :favourites
|
||||
load_and_authorize_resource :conference, find_by: :short_title
|
||||
load_resource :program, through: :conference, singleton: true, except: :index
|
||||
|
||||
|
|
@ -29,13 +30,16 @@ class SchedulesController < ApplicationController
|
|||
@dates = @conference.start_date..@conference.end_date
|
||||
|
||||
@events_schedules = @program.selected_event_schedules
|
||||
@events_schedules = @events_schedules.select{ |e| e.event.favourite_users.exists?(current_user.id) } if @events_schedules && current_user && @favourites
|
||||
@events_schedules = [] unless @events_schedules
|
||||
@favourites = params[:favourites] == 'true'
|
||||
|
||||
@unscheduled_events = if @program.selected_schedule
|
||||
@program.events.confirmed - @program.selected_schedule.events
|
||||
else
|
||||
@program.events.confirmed
|
||||
end
|
||||
@unscheduled_events = @unscheduled_events.select{ |e| e.favourite_users.exists?(current_user.id) } if current_user && @favourites
|
||||
|
||||
day = @conference.current_conference_day
|
||||
@tag = day.strftime('%Y-%m-%d') if day
|
||||
|
|
@ -43,6 +47,10 @@ class SchedulesController < ApplicationController
|
|||
|
||||
private
|
||||
|
||||
def favourites
|
||||
@favourites = params[:favourites] == 'true'
|
||||
end
|
||||
|
||||
def respond_to_options
|
||||
respond_to do |format|
|
||||
format.html { head :ok }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue