From 574275cbc7944a7aa4b645a57cdfc7b93bdc416c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 26 Oct 2019 11:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/competitions/competitions_controller.rb         | 2 +-
 app/views/competitions/competitions/common_header.json.jbuilder | 1 +
 app/views/competitions/competitions/index.json.jbuilder         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb
index c3c5c8524..4adfc4cc0 100644
--- a/app/controllers/competitions/competitions_controller.rb
+++ b/app/controllers/competitions/competitions_controller.rb
@@ -21,7 +21,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
     @count = competitions.count
 
     competitions = competitions.order(published_at: :desc, online_time: :desc)
-    @competitions = paginate(competitions.includes(current_stage_section: :competition_stage))
+    @competitions = paginate(competitions.includes(:sponsor_schools, current_stage_section: :competition_stage))
 
     ids = @competitions.map(&:id)
     @member_count_map = TeamMember.where(competition_id: ids).group(:competition_id).count
diff --git a/app/views/competitions/competitions/common_header.json.jbuilder b/app/views/competitions/competitions/common_header.json.jbuilder
index 2a1e0a92d..c2af41a6c 100644
--- a/app/views/competitions/competitions/common_header.json.jbuilder
+++ b/app/views/competitions/competitions/common_header.json.jbuilder
@@ -6,6 +6,7 @@ json.member_count member_count.zero? ? 268 : member_count
 json.start_time @competition.start_time&.strftime("%Y-%m-%d")
 json.end_time @competition.end_time&.strftime("%Y-%m-%d")
 json.enroll_end_time @competition.enroll_end_time&.strftime("%Y-%m-%d %H:%M:%S")
+json.enroll_end @competition.enroll_end_time && @competition.enroll_end_time < Time.now
 
 json.published @competition.published?
 json.nearly_published @competition.published_at.present?
diff --git a/app/views/competitions/competitions/index.json.jbuilder b/app/views/competitions/competitions/index.json.jbuilder
index 810cbfd18..40eba2d42 100644
--- a/app/views/competitions/competitions/index.json.jbuilder
+++ b/app/views/competitions/competitions/index.json.jbuilder
@@ -17,6 +17,7 @@ json.competitions do
     json.end_time competition.end_time&.strftime("%Y-%m-%d")
     json.enroll_end_time competition.enroll_end_time&.strftime("%Y-%m-%d %H:%M:%S")
 
+    json.sponsor_schools competition.sponsor_schools.pluck(:name)
     # section = competition.current_stage_section
     # if section
     #   json.current_stage do