From 28ee609eedb07df4166ce11500eeffa691754c30 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 16 Jun 2016 16:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B=E6=B5=8B?=
 =?UTF-8?q?=E9=AA=8C=E7=9A=84=E7=BB=9F=E8=AE=A1=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb                | 7 +++++++
 app/views/exercise/_exercise_student_result.html.erb | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 19bc520d4..c3f356a5d 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -63,4 +63,11 @@
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
+    <% if exercise.show_result == 1 %>
+        <% if exercise.end_time <= Time.now %>
+            <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
+        <% else %>
+            <li class="pollsbtn fr mr10 pollsbtn_grey" title="截止时间未到，暂不能查看统计结果">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index d8b4f55bf..59a58901c 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -22,7 +22,9 @@
     </div>
     <div>
         <div class="fl mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
-        <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+        <% if User.current.admin? || User.current.allowed_to?(:as_teacher,exercise.course) || (exercise.exercise_status == 3 && exercise.show_result == 1) %>
+            <%= link_to '返回统计列表>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %>
+        <% end %>
     </div>
     <div class="cl"></div>
     <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>