From 407af626541bd8d0c96c4bd760e73a16fc19ab83 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 3 May 2016 18:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_course_homework.html.erb | 4 ++--
 app/views/users/_course_homework.html.erb             | 4 ++--
 app/views/users/_user_homework_detail.html.erb        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 4ffaa93fb..33e2835dd 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -153,9 +153,9 @@
         <div>
           <% if activity.homework_type != 2 %>
               <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+              <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
           <% else %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+              <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").order("score desc") %>
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index b90b0368e..f598c7404 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -152,9 +152,9 @@
         <div>
           <% if activity.homework_type != 2 %>
             <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+            <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
           <% else %>
-            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+            <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").order("score desc") %>
           <% end %>
           <% student_works.includes(:user).each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 0678cffd1..ec71eec6c 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -157,9 +157,9 @@
         <div>
           <% if homework_common.homework_type != 2 %>
               <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+              <% student_works = homework_common.student_works.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
           <% else %>
-              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+              <% student_works = homework_common.student_works.select("student_works.*,student_works.work_score as score").order("score desc") %>
           <% end %>
           <% student_works.includes(:user).each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">