From 0099c9982966894cf13fb0edec584052aca275ed Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 4 Aug 2015 16:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb              | 3 +++
 .../_homework_detail_programing_form.html.erb              | 7 +++++--
 app/views/homework_common/programing_test.js.erb           | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 25e12e93d..21f781a1a 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -107,6 +107,7 @@ class HomeworkCommonController < ApplicationController
               homework_test.input = v
               homework_test.output = params[:output][k]
               homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
               homework.homework_tests << homework_test
               question[:input] << homework_test.input
               question[:output] << homework_test.output
@@ -231,11 +232,13 @@ class HomeworkCommonController < ApplicationController
               homework_test.input = v
               homework_test.output = params[:output][k]
               homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
             else #不存在的测试，增加
               homework_test = HomeworkTest.new
               homework_test.input = v
               homework_test.output = params[:output][k]
               homework_test.result = params[:result][k]
+              homework_test.error_msg = params[:error_msg]
               homework_test.homework_common = @homework
             end
             homework_test.save
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index d9faeb5b8..e5cdbb46a 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -129,14 +129,17 @@
           <div class="cl"></div>
         </div>
     <% end %>
+    <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
     <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg ? "block" : "none"%>">
       <tbody>
       <tr class="border_t" >
-        <td  class="td_end fb c_red w60 td_board_left">
+        <td  class="td_end fb c_red w60 td_board_left">if
           错误信息:
         </td>
         <td  class="td_end wl" id="homework_work_test_desc">
-          <%= 123123123%>
+          <% if  homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg %>
+            <%= homework.homework_tests.first.error_msg%>
+          <% end%>
         </td>
       </tr>
       </tbody>
diff --git a/app/views/homework_common/programing_test.js.erb b/app/views/homework_common/programing_test.js.erb
index 74b935c2d..a42c8c998 100644
--- a/app/views/homework_common/programing_test.js.erb
+++ b/app/views/homework_common/programing_test.js.erb
@@ -3,6 +3,8 @@ $("#test_result_<%= @index%>").val("<%= @result%>");
 <% if @err_msg || @result != 0%>
     $("#homework_work_test_show").show();
     $("#homework_work_test_desc").text("<%= escape_javascript(@err_msg || status_to_err_msg(@result))%>");
+    $("#homework_test_error_msg").val("<%= escape_javascript(@err_msg)%>");
 <% else%>
     $("#homework_work_test_show").hide();
+    $("#homework_test_error_msg").val("");
 <% end%>
\ No newline at end of file