From 346d0507369fac721c6631676a9c039a2815c6bd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 11 Jan 2018 09:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=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      | 30 +++++++++--------
 app/controllers/student_work_controller.rb | 38 ++++++++++++----------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 89a5c84ca..7e38ca35d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1831,32 +1831,34 @@ class CoursesController < ApplicationController
         end
       elsif home.homework_type == 3 #分组作业
         if home.anonymous_comment ==0
-          sheet.row(7).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+          sheet.row(7).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
                                 l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
         else
-          sheet.row(7).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+          sheet.row(7).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
                                 l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
         end
         count_row = 8
         items = home.student_works.order("work_score desc")
         items.each_with_index do |stu, j|
           sheet[count_row,0] = j + 1
-          sheet[count_row,1] = get_group_member_names stu
-          sheet[count_row,2] = stu.name
-          sheet[count_row,3] = (stu.project_id == 0 || stu.project_id.nil?) ? l(:excel_no_project) : stu.project.name
-          sheet[count_row,4] = strip_html stu.description
-          sheet[count_row,5] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
-          sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          sheet[count_row,1] = stu.user.show_name
+          sheet[count_row,2] = stu.user.login
+          sheet[count_row,3] = stu.user.user_extensions.student_id
+          sheet[count_row,4] = stu.name
+          sheet[count_row,5] = (stu.project_id == 0 || stu.project_id.nil?) ? l(:excel_no_project) : stu.project.name
+          sheet[count_row,6] = strip_html stu.description
+          sheet[count_row,7] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,8] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
           if home.anonymous_comment ==0
-            sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
-            sheet[count_row,8] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,10] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,11] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,13] = format_time(stu.created_at)
+          else
             sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
             sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
             sheet[count_row,11] = format_time(stu.created_at)
-          else
-            sheet[count_row,7] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
-            sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
-            sheet[count_row,9] = format_time(stu.created_at)
           end
           count_row += 1
         end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index c77090476..066581025 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1683,30 +1683,34 @@ class StudentWorkController < ApplicationController
       end
     elsif @homework.homework_type == 3 #分组作业
         if @homework.anonymous_comment ==0
-          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+          sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
                                 l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
         else
-          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+          sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
                                 l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
         end
         count_row = 1
-        items.each do |homework|
-          sheet1[count_row,0] = get_group_member_names homework
-          sheet1[count_row,1] = homework.name
-          sheet1[count_row,2] = (homework.project_id == 0 || homework.project_id.nil?) ? l(:excel_no_project) : homework.project.name
-          sheet1[count_row,3] = strip_html homework.description
-          sheet1[count_row,4] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
-          sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+        @homework.student_works.where("work_status != 0").each do |homework|
+          sheet1[count_row,0]=homework.user.id
+          sheet1[count_row,1] = homework.user.show_name
+          sheet1[count_row,2] = homework.user.login
+          sheet1[count_row,3] = homework.user.user_extensions.student_id
+          sheet1[count_row,4] = homework.user.mail
+          sheet1[count_row,5] = homework.name
+          sheet1[count_row,6] = (homework.project_id == 0 || homework.project_id.nil?) ? l(:excel_no_project) : homework.project.name
+          sheet1[count_row,7] = strip_html homework.description
+          sheet1[count_row,8] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+          sheet1[count_row,9] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
           if @homework.anonymous_comment ==0
-            sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-            sheet1[count_row,7] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
-            sheet1[count_row,8] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
-            sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-            sheet1[count_row,10] = homework.commit_time ? format_time(homework.commit_time) : "未提交"
+            sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+            sheet1[count_row,11] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+            sheet1[count_row,12] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+            sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,14] = homework.commit_time ? format_time(homework.commit_time) : "未提交"
           else
-            sheet1[count_row,6] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
-            sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-            sheet1[count_row,8] = homework.commit_time ? format_time(homework.commit_time) : "未提交"
+            sheet1[count_row,10] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+            sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,12] = homework.commit_time ? format_time(homework.commit_time) : "未提交"
           end
           count_row += 1
         end