From b3724f01da23f19165818f9969cf9aec32b2506e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 25 Nov 2016 14:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E2=80=9C=E6=9C=AA=E5=8F=82=E4=B8=8E=E2=80=9D?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_evaluation_un_group_member_work.html.erb             | 8 +++++++-
 app/views/student_work/_evaluation_un_work.html.erb       | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb
index 347bea20e..c9718f439 100644
--- a/app/views/student_work/_evaluation_un_group_member_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb
@@ -27,7 +27,13 @@
             <div class="flex-cell student_work_<%= st.id%>">
               <div class="<%= score_color st.student_score%> student_score_info pr">
                 <% if st.student_score.nil? %>
-                    <span title="该作品未被匿评">未参与</span>
+                    <% if @homework.homework_detail_manual.comment_status == 2 && st.student_works_evaluation_distributions.count != 0 %>
+                        <span title="该作品未被匿评">待匿评</span>
+                    <% elsif @homework.homework_detail_manual.comment_status == 3 && st.student_works_evaluation_distributions.count != 0 %>
+                        <span title="该作品未被匿评">缺评</span>
+                    <% else %>
+                        <span title="该作品未被匿评">未参与</span>
+                    <% end %>
                 <% else %>
                     <%= format("%.1f", st.student_score) %>
                 <% end %>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 9b247f3d6..e99082377 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -69,7 +69,13 @@
   <% if @homework.anonymous_comment == 0%>
     <td class="hworkList70 <%= score_color student_work.student_score%> student_score_info pr">
       <% if student_work.student_score.nil? %>
-        <span title="该作品未被匿评">未参与</span>
+        <% if @homework.homework_detail_manual.comment_status == 2 && student_work.student_works_evaluation_distributions.count != 0 %>
+            <span title="该作品未被匿评">待匿评</span>
+        <% elsif @homework.homework_detail_manual.comment_status == 3 && student_work.student_works_evaluation_distributions.count != 0 %>
+            <span title="该作品未被匿评">缺评</span>
+        <% else %>
+            <span title="该作品未被匿评">未参与</span>
+        <% end %>
       <% else %>
         <%=format("%.1f",student_work.student_score) %>
       <% end %>