From 22d4499f8f7a7db48f02b4b0c8b04d1f14e068c1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 17 Sep 2015 10:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E8=AF=84=E3=80=81=E8=BF=9F=E4=BA=A4?=
 =?UTF-8?q?=E6=89=A3=E5=88=86=E8=BF=98=E6=98=AF=E6=94=B9=E4=B8=BA=20?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=A3=E5=A4=9A=E5=B0=91=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 4 ++--
 app/controllers/student_work_controller.rb    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 293346365..bab2cbf12 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -218,11 +218,11 @@ class HomeworkCommonController < ApplicationController
   #关闭匿评
   def stop_anonymous_comment
     @homework_detail_manual.update_column('comment_status', 3)
-    #计算缺评扣分---->计算缺评数量
+    #计算缺评扣分
     work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
     @homework.student_works.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count : 0
+      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
     end
 
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index a039038e2..cc51e5cf7 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -116,7 +116,7 @@ class StudentWorkController < ApplicationController
       render_attachment_warning_if_needed(student_work)
       #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-        student_work.late_penalty = 1
+        student_work.late_penalty = @homework.late_penalty
       else
         student_work.late_penalty = 0
       end