From 47cdf1231d8d748c6cdb78767666cb2995267265 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 17 Sep 2015 14:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E8=AF=84=E5=88=86=EF=BC=8C?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8F=90=E7=A4=BA=E6=A1=86=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_un_work.html.erb | 28 ++++++++++++++-----
 public/javascripts/course.js                  | 24 ++++------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 4a70015de..232edc908 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -41,13 +41,12 @@
         <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
       </li>
   <% end%>
-
-  <li class="hworkList50 <%= score_color student_work.student_score%>">
+  <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
     <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
-    <% unless student_work.student_score.nil? || student_work.homework_common.homework_type == 2%>
-                      <span class="linkBlue">
-                        (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
-                      </span>
+    <% unless student_work.student_score.nil?%>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+        </span>
         <div class="infoNi none">
           现共有
           <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
@@ -58,5 +57,20 @@
   </li>
 
   <!-- 成绩 -->
-  <li class="hworkList50 c_red">90</li>
+  <% score = student_work.respond_to?("score") ? student_work.score : student_work.final_score - student_work.absence_penalty - student_work.late_penalty%>
+  <li class="hworkList50 <%= score_color score%> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f",score)%>
+    <% unless score.nil?%>
+        <div class="info_ni">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
 </ul>
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index fc52ef87a..ea9501371 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -881,39 +881,27 @@ function goTopEx() {
 
 $(function(){
     //匿评评分提示
-    $(".student_score_info").bind("mouseover",function(e){
-         //alert($(this).html());
+    $(".student_score_info").live("mouseover",function(){
         $(this).find("div").show();
-        //$(this).find("div").css("top",e.pageY);
-        //$(this).find("div").css("left",e.pageX);
     });
-    $(".student_score_info").bind("mouseout",function(e){
-         //alert($(this).html());
+    $(".student_score_info").live("mouseout",function(){
         $(this).find("div").hide();
     });
     //最终成绩提示
-    $(".student_final_scor_info").bind("mouseover",function(e){
-        //alert($(this).html());
+    $(".student_final_scor_info").live("mouseover",function(){
         $(this).find("div").show();
-        //$(this).find("div").css("top",e.pageY);
-        //$(this).find("div").css("left",e.pageX);
     });
-    $(".student_final_scor_info").bind("mouseout",function(e){
-        //alert($(this).html());
+    $(".student_final_scor_info").live("mouseout",function(){
         $(this).find("div").hide();
     });
 
     $("#about_project label").eq(1).remove();
 
     //附件下载提示
-    $(".zip_download_alert").bind("mouseover",function(e){
-        //alert($(this).html());
+    $(".zip_download_alert").bind("mouseover",function(){
         $(this).next("div").show();
-        //$(this).next("div").css("top",e.pageY);
-        //$(this).next("div").css("left",e.pageX);
     });
-    $(".zip_download_alert").bind("mouseout",function(e){
-        //alert($(this).html());
+    $(".zip_download_alert").bind("mouseout",function(){
         $(this).next("div").hide();
     });
 });