From 3f51368bb270b100f0e7d266d98c71e6898dcb02 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 4 Aug 2015 15:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=B8=83=E7=BD=AE=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  1 +
 app/helpers/homework_common_helper.rb         | 28 +++++++++++++++++++
 .../_homework_detail_programing_form.html.erb | 12 ++++++++
 .../homework_common/programing_test.js.erb    |  8 +++++-
 public/stylesheets/courses.css                |  4 +++
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 9b66ac00d..25e12e93d 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -367,6 +367,7 @@ class HomeworkCommonController < ApplicationController
       client.request(request)
     end
     result = JSON.parse(res.body)
+    @err_msg = result["compile_error_msg"]
     result["results"].each do |re|
       @result = re["status"]
     end
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 49384cca4..67cc391b6 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -66,4 +66,32 @@ module HomeworkCommonHelper
     link
   end
 
+  #将状态转换为错误信息
+  def status_to_err_msg status
+    case status.to_i
+      when -1
+        '编译出错'
+      when -2
+        '输出错误'
+      when -3
+        '输出错误'
+      when 1
+        '运行出错'
+      when 2
+        '超时'
+      when 3
+        '内存超出'
+      when 4
+        '输出超出'
+      when 5
+        '禁用函数'
+      when 6
+        '其他错误'
+      when 0
+        '成功'
+      else
+        '未知错误'
+    end
+  end
+
 end
\ No newline at end of file
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 0952630da..32e351c93 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -129,6 +129,18 @@
           <div class="cl"></div>
         </div>
     <% end %>
+    <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>
+        <td  class="td_end wl" id="homework_work_test_desc">
+          <%= 123123123%>
+        </td>
+      </tr>
+      </tbody>
+    </table>
   </ul>
 </div>
 
diff --git a/app/views/homework_common/programing_test.js.erb b/app/views/homework_common/programing_test.js.erb
index 8f76642f1..74b935c2d 100644
--- a/app/views/homework_common/programing_test.js.erb
+++ b/app/views/homework_common/programing_test.js.erb
@@ -1,2 +1,8 @@
 $("#test_send_<%= @index%>").replaceWith("<a class='<%= @result == 0 ? 'green_btn' : 'red_btn'%> fl ml5 mt1 programing_test' onclick='programing_test(<%= @index%>)' id='test_send_<%= @index%>'><%= @result == 0 ? '正确' : '错误'%></a>");
-$("#test_result_<%= @index%>").val("<%= @result%>");
\ No newline at end of file
+$("#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))%>");
+<% else%>
+    $("#homework_work_test_show").hide();
+<% end%>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5c6fd9867..bdd01f804 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -694,6 +694,9 @@ a.work_list_tit{width:580px;  display:block; overflow:hidden; font-size:14px;  f
 .border_l{border-left:1px solid #e4e4e4;}
 .border_t{ border-top:1px solid #e4e4e4;}
 .td_end{border-top:1px solid #e4e4e4; height:auto; padding:5px; }
+.wl{text-align: left;}
+.vt{vertical-align: top;}
+.td_board_left{border-right: 1px solid #e4e4e4;}
 .c_w{ color:#fff;}
 
 .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
@@ -709,6 +712,7 @@ a:hover.about_me{ color:#0781b4;}
 .mb5 li{width:200px;word-wrap: break-word;
     word-break: normal;
 }
+#homework_work_test_show{margin-left: 35px;width: 94%;}