From 56f1b9b056410f7ebc2cc7f642c63930627877b3 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 21 Oct 2019 09:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E6=95=99=E5=AD=A6=E7=BB=84?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/competitions_controller.rb | 4 ++-- app/views/competitions/_chartList.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/competitions_controller.rb b/app/controllers/competitions_controller.rb index 4cbb8d14..08de34b8 100644 --- a/app/controllers/competitions_controller.rb +++ b/app/controllers/competitions_controller.rb @@ -305,7 +305,7 @@ class CompetitionsController < ApplicationController end records_length = 97 @records = @records[0..records_length] - elsif @competition.identifier == "gcc-annotation-2018" + elsif @competition.identifier == "gcc-annotation-2018" || @competition.identifier == "gcc-course-2019" @records = @competition.competition_teams.includes(:user => [:user_extensions => [:school]]) @records.each do |team| team[:s_score] = team.competition_scores.where(:competition_id => @competition.id).first.try(:score).to_f.try(:round, 3) @@ -494,7 +494,7 @@ class CompetitionsController < ApplicationController sheet1[count_row,10] = com_spend_time team[:s_spend_time].to_i count_row += 1 end - elsif @competition.identifier == "gcc-annotation-2018" + elsif @competition.identifier == "gcc-annotation-2018" || @competition.identifier == "gcc-course-2019" records = @competition.competition_teams records.each do |team| team[:s_score] = team.competition_scores.where(:competition_id => @competition.id).first.try(:score).to_f.try(:round, 3) diff --git a/app/views/competitions/_chartList.html.erb b/app/views/competitions/_chartList.html.erb index dcf66550..ee7587e6 100644 --- a/app/views/competitions/_chartList.html.erb +++ b/app/views/competitions/_chartList.html.erb @@ -44,7 +44,7 @@ <% @records.each_with_index do |record, index| %> <% record_user = record.user %>
- <% if @competition.identifier == "gcc-annotation-2018" %> + <% if @competition.identifier == "gcc-annotation-2018" || @competition.identifier == "gcc-course-2019" %>
  • <% if index == 0 %>