From 379e721191d43978174634c67ce243aa5b7913a8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 10 Oct 2014 15:43:18 +0800
Subject: [PATCH] =?UTF-8?q?#1345=20=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E7=BB=BC=E8=AF=84=E4=BB=B7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_comprehensive_evaluation.html.erb        | 78 +++++++------------
 .../_teacher_evaluation.html.erb              |  8 ++
 config/locales/zh.yml                         |  2 +
 3 files changed, 37 insertions(+), 51 deletions(-)
 create mode 100644 app/views/homework_attach/_teacher_evaluation.html.erb

diff --git a/app/views/homework_attach/_comprehensive_evaluation.html.erb b/app/views/homework_attach/_comprehensive_evaluation.html.erb
index 59654c52c..ac1793271 100644
--- a/app/views/homework_attach/_comprehensive_evaluation.html.erb
+++ b/app/views/homework_attach/_comprehensive_evaluation.html.erb
@@ -1,55 +1,31 @@
 <% is_teacher = is_course_teacher User.current,homework.bid.courses.first %>
-<% if comprehensive_evaluation != nil && comprehensive_evaluation.count > 0 %>
-    <div style="height: <%= is_teacher ? 250 : 100%>px; padding-bottom: 10px">
-      <div style="font-size: 15px">
-        <strong>作业综评：</strong>
-        <% if teaher_score != "0.00" %>
-            <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-        <% end %>
-      </div>
-      <div style="font-size: 14px;">
-        <div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;"> <%= comprehensive_evaluation.first.notes%> </div>
+
+<div style="padding-bottom: 10px">
+  <div style="font-size: 15px">
+    <strong><%= l(:lable_teacher_evaluation)%>：</strong>
+    <% if teaher_score != "0.00" %>
+        <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
+    <% end %>
+    <div style="font-size: 14px;">
+      <div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;">
+        <%= comprehensive_evaluation.first.notes if !comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0%>
       </div>
-      <% if is_teacher %>
-          <%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
-          <div>
-            <%= render :partial => 'evaluation_add_jour',
-                       :locals => {:homework_attach => homework,
-                                   :sta => 0,
-                                   :is_comprehensive_evaluation => 1,
-                                   :comprehensive_evaluation => comprehensive_evaluation.first.notes} %>
-          </div>
-      <% end %>
     </div>
-<% else %>
-    <% if is_teacher %>
-        <div style="height: 200px; padding-bottom: 10px">
-          <div style="font-size: 15px">
-            <strong>作业综评：</strong>
-            <% if teaher_score != "0.00" %>
-                <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-            <% end %>
-          </div>
-          <%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
-          <div>
-            <%= render :partial => 'evaluation_add_jour',
-                       :locals => {:homework_attach => homework,
-                                   :sta => 0,
-                                   :is_comprehensive_evaluation => 1,
-                                   :comprehensive_evaluation => nil} %>
-          </div>
-        </div>
-    <% else %>
-        <div style="height: 80px; padding-bottom: 10px">
-          <div style="font-size: 15px">
-            <strong>作业综评：</strong>
-            <% if teaher_score != "0.00" %>
-                <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-            <% end %>
-          </div>
-          <% if teaher_score == "0.00" %>
-              <div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; "><strong>老师还未进行评价！</strong></div>
-          <% end %>
-        </div>
+    <% if(teaher_score == "0.00"  && !(!comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0))%>
+        <% if is_teacher %>
+            <%#= render :partial => 'teacher_evaluation',
+                       :locals => {:homework => homework, :comprehensive_evaluation => comprehensive_evaluation}  %>
+        <% else %>
+            <div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; ">
+              <strong><%= l(:lable_teacher_evaluation_no)  %></strong>
+            </div>
+        <% end %>
     <% end %>
-<% end %>
\ No newline at end of file
+  </div>
+</div>
+
+<div>
+  <% if is_teacher %>
+      <%= render :partial => 'teacher_evaluation',:locals => {:homework => homework}  %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/homework_attach/_teacher_evaluation.html.erb b/app/views/homework_attach/_teacher_evaluation.html.erb
new file mode 100644
index 000000000..485238416
--- /dev/null
+++ b/app/views/homework_attach/_teacher_evaluation.html.erb
@@ -0,0 +1,8 @@
+<%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
+<div>
+  <%= render :partial => 'evaluation_add_jour',
+             :locals => {:homework_attach => homework,
+                         :sta => 0,
+                         :is_comprehensive_evaluation => 1,
+                         :comprehensive_evaluation => l(:label_leave_a_message)} %>
+</div>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a3ec030c4..ce0222e52 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2146,3 +2146,5 @@ zh:
   lable_input_class: 在此输入课时
   lable_input_class_vilidate: 学时只能为整数
   lable_school_list: 学校列表
+  lable_teacher_evaluation_no: 老师还未进行评价
+  lable_teacher_evaluation: 作业综评