From 9f72b25360b99c79786d1826267b45f2582202a3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Jul 2015 16:22:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/student_work_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/student_work_test.rb b/app/models/student_work_test.rb
index d9ac5e935..2e6efdf0a 100644
--- a/app/models/student_work_test.rb
+++ b/app/models/student_work_test.rb
@@ -1,12 +1,12 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :homework_test_id
+  attr_accessible :student_work_id, :homework_test_id, :result
 
   belongs_to :homework_test
   belongs_to :student_work
 
   def status_to_s
-    case self.result
+    case self.result.to_i
       when -1
         '编译出错'
       when -2
@@ -33,7 +33,7 @@ class StudentWorkTest < ActiveRecord::Base
   end
 
   def test_score
-    if self.result == 0
+    if self.result.to_i == 0
       format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
     else
       0

From 62e2f38c957321ace950b6d9dadf459d2db3d6c5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Jul 2015 16:34:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=BB=93=E6=9E=9C=E7=9A=84=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 79c578525..1a9765fb4 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -49,6 +49,7 @@
               </td>
               <td class="td_50 c_red"><%= test.student_work_test.nil? ? "正在编译" : test.student_work_test.status_to_s%></td>
               <td class="td_50 "><%= test.student_work_test.nil? ? "0" : test.student_work_test.test_score%></td>
+              <input type="hidden" value="<%= test.student_work_test.result%>">
             </tr>
         <% end%>
 

From 3a59303de97127c6032a9607af2082d3b745d2d5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Jul 2015 16:37:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91=E6=95=99=E8=BE=85=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 73eb97eae..a7b71c6ab 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -95,7 +95,7 @@ class HomeworkCommonController < ApplicationController
         homework_detail_programing = HomeworkDetailPrograming.new
         homework_detail_programing.language = "C++"
         homework_detail_programing.standard_code = params[:standard_code]
-
+        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
         question = {title:homework.name,content:homework.description}
         question[:input] = []
         question[:output] = []
@@ -211,6 +211,7 @@ class HomeworkCommonController < ApplicationController
     if @homework.homework_type == 2 && @homework_detail_programing #编程作业
       @homework_detail_programing.language = "C++"
       @homework_detail_programing.standard_code = params[:standard_code]
+      @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
       homework_tests = @homework.homework_tests
       #需要删除的测试
       ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)

From 835a7d24c380f0bab1c73dad65c47b3f15c48083 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Jul 2015 17:39:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=98=9F=E5=88=97=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 1a9765fb4..b929e0f27 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -49,7 +49,7 @@
               </td>
               <td class="td_50 c_red"><%= test.student_work_test.nil? ? "正在编译" : test.student_work_test.status_to_s%></td>
               <td class="td_50 "><%= test.student_work_test.nil? ? "0" : test.student_work_test.test_score%></td>
-              <input type="hidden" value="<%= test.student_work_test.result%>">
+              <input type="hidden" value="<%= test.student_work_test.result if test.student_work_test%>">
             </tr>
         <% end%>