From 63ae921c4099d4a1e5e081bbb33beaf572dd7fe6 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 25 Mar 2016 17:07:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?return=20=E6=94=BE=E9=94=99=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/homework.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index b03ddf1bf..3bca1606c 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -97,8 +97,8 @@ $(function(){
                         alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
                     } else {
                         alert("测试失败,服务器出错.");
-                        return;
                     }
+                    return;
                 });
         };
 

From a58ba8080c7a132d151f0c4ffad7c9814a7c2a09 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 25 Mar 2016 21:06:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/new_user_commit_homework.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index e5e2a385c..0c2a32865 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -30,7 +30,7 @@
                 <! if(results["status"]==2){!>
                     <span class="w60 c_red">超时！</span>
                 <!}else{!>
-                <span class="w60 c_red">测试错误！</span>
+                    <span class="w60 c_red">测试错误！</span>
                 <!}!>
                 <span class="w60">您的输出：</span>
                 <span class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><!=results["result"]!> </pre></span>
@@ -133,7 +133,8 @@
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
-                <% test.results.reverse.each_with_index do |x, i| %>
+                <%puts test.results %>
+              <% test.results.reverse.each_with_index do |x, i| %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>
                   <% if x["status"].to_i != 0 %>
                     <% if x["status"].to_i == 2 %>

From ef49715b085b6c5d44d1868a4eae3bae34f95ef5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 25 Mar 2016 21:11:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AAresults=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 3 ++-
 app/views/users/new_user_commit_homework.html.erb     | 4 +++-
 app/views/users/user_commit_homework.html.erb         | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index ae2237bdc..6009dfbb5 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -55,8 +55,8 @@
                   <ul class="ProResultUl " >
 
                     <% test.results.reverse.each_with_index do |x, i| %>
+                      <% unless x.nil? %>
                         <li >
-
                           <span class="w60 T_C">测试<%=test.results.size-i%></span>
                           <% if x["status"].to_i != 0 %>
                               <% if x["status"].to_i == 2 %>
@@ -82,6 +82,7 @@
                               <div class="cl"></div>
                           <% end %>
                         </li>
+                      <% end %>
                     <% end %>
                   </ul>
                 </div>
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 0c2a32865..e33362a0a 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -133,8 +133,9 @@
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
-                <%puts test.results %>
+              <% logger.error("################################################{test.results}") %>
               <% test.results.reverse.each_with_index do |x, i| %>
+                <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>
                   <% if x["status"].to_i != 0 %>
                     <% if x["status"].to_i == 2 %>
@@ -160,6 +161,7 @@
                   </li>
                   <% end %>
                 <% end %>
+              <% end %>
              </ul>
             </div>
           <% end %>
diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb
index 40fd9d241..cab3c55ab 100644
--- a/app/views/users/user_commit_homework.html.erb
+++ b/app/views/users/user_commit_homework.html.erb
@@ -101,6 +101,7 @@
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
                 <% test.results.reverse.each_with_index do |x, i| %>
+                <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>
                   <% if x["status"].to_i != 0 %>
                     <% if x["status"].to_i == 2 %>
@@ -125,6 +126,7 @@
                     <div class="cl"></div>
                   </li>
                   <% end %>
+                 <% end %>
                 <% end %>
              </ul>
             </div>