diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 7084f47b1..84deae4ae 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -142,7 +142,7 @@ class Competitions::CompetitionsController < Competitions::BaseController } end else - @records = @records.includes(:team_members, user: :user_extension).limit(@competition.awards_count) + @records = @records.includes(:team_members, :competition_prize_users, user: :user_extension).limit(@competition.awards_count) end end diff --git a/app/models/competition_team.rb b/app/models/competition_team.rb index 485be61ef..0092f977c 100644 --- a/app/models/competition_team.rb +++ b/app/models/competition_team.rb @@ -18,6 +18,10 @@ class CompetitionTeam < ApplicationRecord team_type.zero? end + def competition_prize + competition_prize_users.take&.competition_prize&.name + end + def personal_team_type? team_type == 1 end diff --git a/app/views/competitions/competitions/charts.json.jbuilder b/app/views/competitions/competitions/charts.json.jbuilder index e1952b5f3..897b674e7 100644 --- a/app/views/competitions/competitions/charts.json.jbuilder +++ b/app/views/competitions/competitions/charts.json.jbuilder @@ -6,6 +6,7 @@ json.user_ranks @user_ranks.each do |user_rank| json.user_name user_rank.user.real_name json.cost_time rank == 0 && user_rank.cost_time ? "--" : com_spend_time(user_rank.cost_time) json.score rank == 0 ? "--" : user_rank.score.round(2) + json.competition_prize user_rank.competition_prize end json.teams @records.each do |record| @@ -18,4 +19,5 @@ json.teams @records.each do |record| json.school_name school_name json.score record&.score&.round(2) json.spend_time record.cost_time ? com_spend_time(record.cost_time) : "--" + json.competition_prize record.competition_prize end \ No newline at end of file