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

Reduce data on conference dashboard b/c of timeouts

Browse source
This commit is contained in:
Michael Ball 2020-06-30 01:38:43 -07:00
parent 0877aadb2e
commit cff6e55c9c
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/controllers/admin/conferences_controller.rb
View file

@ -112,20 +112,20 @@ module Admin
@all_events = @program.events @all_events = @program.events
@total_submissions = @all_events.count @total_submissions = @all_events.count
@new_submissions = @all_events # @new_submissions = @all_events
.where('created_at > ?', current_user.last_sign_in_at).count # .where('created_at > ?', current_user.last_sign_in_at).count
@program_length = @conference.current_program_hours @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 @total_withdrawn = @all_events.where(state: :withdrawn).count
@new_withdrawn = @all_events.where(state: :withdrawn).where( # @new_withdrawn = @all_events.where(state: :withdrawn).where(
'events.created_at > ?', # 'events.created_at > ?',
current_user.last_sign_in_at # current_user.last_sign_in_at
).count # ).count
# Step by step list # Step by step list
@conference_progress = @conference.get_status # @conference_progress = @conference.get_status
# Line charts # Line charts
@registrations = @conference.get_registrations_per_week @registrations = @conference.get_registrations_per_week
@ -134,18 +134,18 @@ module Admin
# Doughnut charts # Doughnut charts
@event_type_distribution = @conference.event_type_distribution @event_type_distribution = @conference.event_type_distribution
@event_type_distribution_confirmed = @conference.event_type_distribution(:confirmed) # @event_type_distribution_confirmed = @conference.event_type_distribution(:confirmed)
@event_type_distribution_withdrawn = @conference.event_type_distribution(:withdrawn) # @event_type_distribution_withdrawn = @conference.event_type_distribution(:withdrawn)
@difficulty_levels_distribution = @conference.difficulty_levels_distribution @difficulty_levels_distribution = @conference.difficulty_levels_distribution
@difficulty_levels_distribution_confirmed = @conference # @difficulty_levels_distribution_confirmed = @conference
.difficulty_levels_distribution(:confirmed) # .difficulty_levels_distribution(:confirmed)
@difficulty_levels_distribution_withdrawn = @conference # @difficulty_levels_distribution_withdrawn = @conference
.difficulty_levels_distribution(:withdrawn) # .difficulty_levels_distribution(:withdrawn)
@tracks_distribution = @conference.tracks_distribution @tracks_distribution = @conference.tracks_distribution
@tracks_distribution_confirmed = @conference.tracks_distribution(:confirmed) # @tracks_distribution_confirmed = @conference.tracks_distribution(:confirmed)
@tracks_distribution_withdrawn = @conference.tracks_distribution(:withdrawn) # @tracks_distribution_withdrawn = @conference.tracks_distribution(:withdrawn)
# Recent actions information # Recent actions information
@recent_events = @conference.program.events.limit(5).order(created_at: :desc) @recent_events = @conference.program.events.limit(5).order(created_at: :desc)

24
app/views/admin/conferences/show.html.haml
View file

@ -29,8 +29,8 @@
= render 'line_chart', = render 'line_chart',
title: 'Submissions per week', data: @submissions title: 'Submissions per week', data: @submissions
.col-md-4 .col-md-4
= render 'todo_list', -# = render 'todo_list',
conference_progress: @conference_progress, conference: @conference -# conference_progress: @conference_progress, conference: @conference
.row#tickets .row#tickets
.col-md-8 .col-md-8
= render 'line_chart', = render 'line_chart',
@ -58,22 +58,22 @@
= render 'donut_chart', title: 'Event types', = render 'donut_chart', title: 'Event types',
combined_data: @event_type_distribution combined_data: @event_type_distribution
.col-md-4 .col-md-4
= render 'donut_chart', title: 'Difficulty levels', -# = render 'donut_chart', title: 'Difficulty levels',
combined_data: @difficulty_levels_distribution -# combined_data: @difficulty_levels_distribution
.col-md-4 .col-md-4
= render 'donut_chart', title: 'Tracks', -# = render 'donut_chart', title: 'Tracks',
combined_data: @tracks_distribution -# combined_data: @tracks_distribution
.tab-pane#distribution_confirmed .tab-pane#distribution_confirmed
.row .row
.col-md-4 .col-md-4
= render 'donut_chart', title: 'Event types', -# = render 'donut_chart', title: 'Event types',
combined_data: @event_type_distribution_confirmed -# combined_data: @event_type_distribution_confirmed
.col-md-4 .col-md-4
= render 'donut_chart', title: 'Difficulty levels', -# = render 'donut_chart', title: 'Difficulty levels',
combined_data: @difficulty_levels_distribution_confirmed -# combined_data: @difficulty_levels_distribution_confirmed
.col-md-4 .col-md-4
= render 'donut_chart', title: 'Tracks', -# = render 'donut_chart', title: 'Tracks',
combined_data: @tracks_distribution_confirmed -# combined_data: @tracks_distribution_confirmed
.tab-pane#distribution_withdrawn .tab-pane#distribution_withdrawn
.row .row
.col-md-4 .col-md-4