From 95af2ab20b62de40ca9e3cd0769368e050f48400 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 10:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=87=BA=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=20=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=EF=BC=9A?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8C=BF=E8=AF=84=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=20=E5=8C=BF=E8=AF=84=E4=BD=9C=E4=B8=9A=EF=BC=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8C=BF=E8=AF=84=E8=AF=84=E5=88=86=20=E7=BC=96?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=EF=BC=9A=E6=98=BE=E7=A4=BA=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 70 +++++++++++++++++-----
 config/locales/zh.yml                      |  1 +
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index da2575456..3e1e0ba29 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -468,22 +468,60 @@ class StudentWorkController < ApplicationController
     sheet1 = book.create_worksheet :name => "homework"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    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_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
-    count_row = 1
-    items.each do |homework|
-      sheet1[count_row,0]=homework.user.id
-      sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
-      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.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-      sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-      sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-      sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-      sheet1[count_row,10] = format_time(homework.created_at)
-      count_row += 1
+    if @homework.homework_type == 0 #普通作业
+      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_t_score),l(:excel_ta_score),l(:excel_f_score),l(:excel_commit_time)])
+      count_row = 1
+      items.each do |homework|
+        sheet1[count_row,0]=homework.user.id
+        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        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.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
+        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
+        # sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+        sheet1[count_row,8] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,9] = format_time(homework.created_at)
+        count_row += 1
+      end
+    elsif @homework.homework_type == 1 #匿评作业
+      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_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+      count_row = 1
+      items.each do |homework|
+        sheet1[count_row,0]=homework.user.id
+        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        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.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
+        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
+        sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+        sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,10] = format_time(homework.created_at)
+        count_row += 1
+      end
+    elsif @homework.homework_type == 2 #编程作业
+      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_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_f_score),l(:excel_commit_time)])
+      count_row = 1
+      items.each do |homework|
+        sheet1[count_row,0]=homework.user.id
+        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        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.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
+        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
+        sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+        sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,10] = format_time(homework.created_at)
+        count_row += 1
+      end
     end
     book.write xls_report
     xls_report.string
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b2faa6319..d89ecb4f5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1835,6 +1835,7 @@ zh:
   excel_t_score: 教师评分
   excel_ta_score: 教辅评分
   excel_n_score: 匿名评分
+  excel_s_score: 系统评分
   excel_f_score: 成绩
   excel_commit_time: 提交时间
   excel_homework_score: 作业积分