From b602e1c85d82af3774e6c4a6adf45d4d56976cae Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 26 Nov 2015 14:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E9=A2=98=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=AF=95=E5=8D=B7=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 5 ++++- app/views/exercise/_exercise_student_result.html.erb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 45d6ccf70..20b8a3d8c 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -42,7 +42,10 @@
开始时间：<%=format_time(exercise_user.start_at.to_s)%> - 测验时长：<%=exercise.time %>分钟 + 截止时间：<%=format_time(exercise.end_time.to_s)%> + <% unless exercise.time == -1 %> + 测验时长：<%=exercise.time %>分钟 + <% end %> diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index b9306b0d2..8f6ac0e54 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -11,7 +11,10 @@

<%= exercise.exercise_name%>

开始时间：<%=format_time(exercise_user.start_at.to_s) %> - 测验时长：<%=exercise.time %>分钟 + 截止时间：<%=format_time(exercise.end_time.to_s)%> + <% unless exercise.time == -1 %> + 测验时长：<%=exercise.time %>分钟 + <% end %> <%# time = exercise_user.end_at - exercise_user.start_at %>
<%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>