From 9bb44421211bd67ff3c77b1b71b3e82374411a00 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 22 May 2019 09:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AF=BE=E5=A0=82=E3=80=91=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E6=88=90=E7=BB=A9=E5=AF=BC=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb       | 8 +++++---
 app/views/challenges/_content_list.html.erb | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 421e5da3..e87c7297 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -2394,9 +2394,10 @@ class CoursesController < ApplicationController
     sheet1[4,0] = "排名"
     sheet1[4,1] = "学生姓名"
     sheet1[4,2] = "昵称"
-    sheet1[4,3] = "学号"
-    sheet1[4,4] = "分班"
-    current_col = 4
+    sheet1[4,3] = "邮箱"
+    sheet1[4,4] = "学号"
+    sheet1[4,5] = "分班"
+    current_col = 5
     homeworks.where(:homework_type => 4).each do |homework|
       sheet1[4,current_col+=1] = "#{homework.name}"
     end
@@ -2428,6 +2429,7 @@ class CoursesController < ApplicationController
       sheet1[count_row,column]= i+1
       sheet1[count_row,column+=1] = member.user.show_real_name
       sheet1[count_row,column+=1] = member.user.login
+      sheet1[count_row,column+=1] = member.user.mail
       sheet1[count_row,column+=1] = member.user.user_extensions.student_id
       sheet1[count_row,column+=1] = member.course_group_id == 0 ? "暂无" : member.course_group.name
       # current_col = 5
diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb
index f9ac88b8..44f899e2 100644
--- a/app/views/challenges/_content_list.html.erb
+++ b/app/views/challenges/_content_list.html.erb
@@ -86,7 +86,7 @@
                 <% if @current_myshixun %>
                   <% current_game = challenge.games.where(:user_id => User.current).first %>
                   <% case current_game.try(:status) %>
-              <% when 0, 1 %>
+                    <% when 0, 1 %>
                     <% if @current_modify %>
                       <a href='javascript:void(0)' class="edu-default-btn edu-blueback-btn fr" onclick="begin_sXun('<%= @current_myshixun.try(:id) %>')">直接挑战</a>
                     <% else %>