From efee984c4f80e87d78326437534e0bf84c4a95b7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 3 Dec 2016 11:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8500?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_un_group_member_work.html.erb  | 6 +++---
 app/views/student_work/_evaluation_un_work.html.erb         | 6 +++---
 2 files changed, 6 insertions(+), 6 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 4d38f60a2..709c7749b 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
@@ -23,12 +23,12 @@
       <div class="flex-container fl" style="width:340px;">
         <div class="flex-cell student_work_<%= st.id%>">
           <span class="<%= score_color (!score_open || st.teacher_score.nil? ? nil : st.teacher_score) %>">
-            <%= st.teacher_score.nil? ? "--" : (!score_open ? "**" || format("%.1f",st.teacher_score))%>
+            <%= st.teacher_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",st.teacher_score))%>
           </span>
         </div>
         <div class="flex-cell student_work_<%= st.id%>">
           <span class="<%= score_color (!score_open || st.teaching_asistant_score.nil? ? nil : st.teaching_asistant_score) %>">
-            <%= st.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" || format("%.1f",st.teaching_asistant_score))%>
+            <%= st.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",st.teaching_asistant_score))%>
           </span>
         </div>
         <% if @homework.anonymous_comment == 0 %>
@@ -72,7 +72,7 @@
         <div class="flex-cell">
           <% score = st.work_score %>
           <div class="<%= score_color (!score_open || score.nil? ? nil : score)%> student_final_scor_info pr" style="display: inline">
-            <%= score.nil? ? "--" : (!score_open ? "**" || format("%.1f",score<0 ? 0 : score))%>
+            <%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score))%>
             <% unless !score_open || score.nil?%>
                 <div class="score-tip none tl" style="line-height: 18px; top:-32px; right:-273px;">
                   <em></em>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 7cd1632a8..b060e2ddd 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -56,13 +56,13 @@
     <%= student_work.teacher_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.teacher_score))%>
   </td>
   <td class="hworkList70 <%= score_color (!score_open || student_work.teaching_asistant_score.nil? ? nil : student_work.teaching_asistant_score)%>">
-    <%= student_work.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" || format("%.1f",student_work.teaching_asistant_score))%>
+    <%= student_work.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.teaching_asistant_score)) %>
   </td>
 
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
       <td class="hworkList70 <%= score_color (!score_open || student_work.system_score.nil? ? nil : student_work.system_score)%>">
-        <%= student_work.system_score.nil? ? "--" : (!score_open ? "**" || format("%.1f",student_work.system_score))%>
+        <%= student_work.system_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.system_score))%>
       </td>
   <% end%>
 
@@ -109,7 +109,7 @@
     <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <% end %>
   <td class="hworkList70 <%= score_color (!score_open || score.nil? ? nil : score)%> student_final_scor_info pr">
-    <%= score.nil? ? "--" : (!score_open ? "**" || format("%.1f",score<0 ? 0 : score))%>
+    <%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score))%>
     <% unless !score_open || score.nil?%>
         <div class="score-tip none tl" style="line-height: 18px;">
           <em></em>