diff --git a/app/controllers/admin/conferences_controller.rb b/app/controllers/admin/conferences_controller.rb index f25f2cfe..43a6c125 100644 --- a/app/controllers/admin/conferences_controller.rb +++ b/app/controllers/admin/conferences_controller.rb @@ -112,20 +112,20 @@ module Admin @all_events = @program.events @total_submissions = @all_events.count - @new_submissions = @all_events - .where('created_at > ?', current_user.last_sign_in_at).count + # @new_submissions = @all_events + # .where('created_at > ?', current_user.last_sign_in_at).count @program_length = @conference.current_program_hours - @new_program_length = @conference.new_program_hours(current_user.last_sign_in_at) + # @new_program_length = @conference.new_program_hours(current_user.last_sign_in_at) @total_withdrawn = @all_events.where(state: :withdrawn).count - @new_withdrawn = @all_events.where(state: :withdrawn).where( - 'events.created_at > ?', - current_user.last_sign_in_at - ).count + # @new_withdrawn = @all_events.where(state: :withdrawn).where( + # 'events.created_at > ?', + # current_user.last_sign_in_at + # ).count # Step by step list - @conference_progress = @conference.get_status + # @conference_progress = @conference.get_status # Line charts @registrations = @conference.get_registrations_per_week @@ -134,18 +134,18 @@ module Admin # Doughnut charts @event_type_distribution = @conference.event_type_distribution - @event_type_distribution_confirmed = @conference.event_type_distribution(:confirmed) - @event_type_distribution_withdrawn = @conference.event_type_distribution(:withdrawn) + # @event_type_distribution_confirmed = @conference.event_type_distribution(:confirmed) + # @event_type_distribution_withdrawn = @conference.event_type_distribution(:withdrawn) @difficulty_levels_distribution = @conference.difficulty_levels_distribution - @difficulty_levels_distribution_confirmed = @conference - .difficulty_levels_distribution(:confirmed) - @difficulty_levels_distribution_withdrawn = @conference - .difficulty_levels_distribution(:withdrawn) + # @difficulty_levels_distribution_confirmed = @conference + # .difficulty_levels_distribution(:confirmed) + # @difficulty_levels_distribution_withdrawn = @conference + # .difficulty_levels_distribution(:withdrawn) @tracks_distribution = @conference.tracks_distribution - @tracks_distribution_confirmed = @conference.tracks_distribution(:confirmed) - @tracks_distribution_withdrawn = @conference.tracks_distribution(:withdrawn) + # @tracks_distribution_confirmed = @conference.tracks_distribution(:confirmed) + # @tracks_distribution_withdrawn = @conference.tracks_distribution(:withdrawn) # Recent actions information @recent_events = @conference.program.events.limit(5).order(created_at: :desc) diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml index 89daeff5..76990b10 100644 --- a/app/views/admin/conferences/show.html.haml +++ b/app/views/admin/conferences/show.html.haml @@ -29,8 +29,8 @@ = render 'line_chart', title: 'Submissions per week', data: @submissions .col-md-4 - = render 'todo_list', - conference_progress: @conference_progress, conference: @conference + -# = render 'todo_list', + -# conference_progress: @conference_progress, conference: @conference .row#tickets .col-md-8 = render 'line_chart', @@ -58,22 +58,22 @@ = render 'donut_chart', title: 'Event types', combined_data: @event_type_distribution .col-md-4 - = render 'donut_chart', title: 'Difficulty levels', - combined_data: @difficulty_levels_distribution + -# = render 'donut_chart', title: 'Difficulty levels', + -# combined_data: @difficulty_levels_distribution .col-md-4 - = render 'donut_chart', title: 'Tracks', - combined_data: @tracks_distribution + -# = render 'donut_chart', title: 'Tracks', + -# combined_data: @tracks_distribution .tab-pane#distribution_confirmed .row .col-md-4 - = render 'donut_chart', title: 'Event types', - combined_data: @event_type_distribution_confirmed + -# = render 'donut_chart', title: 'Event types', + -# combined_data: @event_type_distribution_confirmed .col-md-4 - = render 'donut_chart', title: 'Difficulty levels', - combined_data: @difficulty_levels_distribution_confirmed + -# = render 'donut_chart', title: 'Difficulty levels', + -# combined_data: @difficulty_levels_distribution_confirmed .col-md-4 - = render 'donut_chart', title: 'Tracks', - combined_data: @tracks_distribution_confirmed + -# = render 'donut_chart', title: 'Tracks', + -# combined_data: @tracks_distribution_confirmed .tab-pane#distribution_withdrawn .row .col-md-4