From 1acadd1edf4c1314ad91c4ad155637822db91803 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 30 Sep 2015 09:50:14 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B5=8B=E8=AF=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=202=E3=80=81?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=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/_evaluation_un_work.html.erb | 8 +++++---
 app/views/users/new_user_commit_homework.html.erb   | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index da2723636..94fcfcee2 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -26,9 +26,11 @@
     </ul>
   </li>
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
-        <span class="c_red">[迟交]</span>
+    <% if student_work.created_at && @homework.end_time%>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
     <% end %>
   </li>
   <li class="hworkList50 <%= score_color student_work.teacher_score%>">
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index c8998fd55..c3a736058 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -105,7 +105,10 @@
 
         <% @student_work.student_work_tests.each_with_index do |test, index| %>
           <div class="ProResultTop">
-             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+             <p class="c_blue fl">
+               第<%= @student_work.student_work_tests.count - index%>次测试
+             </p>
+            <span class="fr c_grey"><%= format_time(test.created_at).to_s%></span>
                <div class="cl"></div>
           </div>
           <% if test.status.to_i == -2 %>