Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/controllers/containers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ def show
@container.assignments.container_managers
).includes(:user, :role)
@assignment = @container.assignments.build
@container_contest_descriptions = @container.contest_descriptions.reorder('contest_descriptions.name ASC')
@active_contest_descriptions = @container.contest_descriptions.active.reorder('contest_descriptions.name ASC')
@container_contest_descriptions = @container.contest_descriptions
.includes(contest_instances: :entries)
.reorder('contest_descriptions.name ASC')
@active_contest_descriptions = @container_contest_descriptions.select(&:active?)
end

def new
Expand Down
9 changes: 4 additions & 5 deletions app/helpers/contest_descriptions_helper.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
module ContestDescriptionsHelper
def contest_description_entries_link(description)
active_instances = description.contest_instances.where(active: true)
return nil if active_instances.empty?
first_active = description.contest_instances.detect(&:active?)
return nil unless first_active

first_active = active_instances.first
entry_count = first_active.entries.where(deleted: false).count
entry_count = first_active.entries.reject(&:deleted).size
link_to("Active: #{pluralize(entry_count, 'entry')}",
container_contest_description_contest_instance_path(description.container, description, first_active),
class: 'btn btn-sm btn-primary small')
end

def contest_description_summary(description)
total_instances = description.contest_instances.count
active_instances = description.contest_instances.where(active: true)
active_instances = description.contest_instances.select(&:active?)
summary = ''
if active_instances.any?
summary += contest_description_entries_link(description).to_s
Expand Down
Loading