Merge branch 'dev_aliyun' into educoder

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)

app/views/competitions/_chartList.html.erb

@@ -44,7 +44,7 @@
       <% @records.each_with_index do |record, index| %>
         <% record_user = record.user %>
         <div class="rankingList-line clearfix">
-          <% if @competition.identifier == "gcc-annotation-2018" %>
+          <% if @competition.identifier == "gcc-annotation-2018" || @competition.identifier == "gcc-course-2019" %>
             <li class="with40">
               <% if index == 0 %>
                 <img src="/images/educoder/competition/1.png" class="fl ranking-img">