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 %> 直接挑战 <% else %>