Merge branch 'develop' into szzh

app/views/layouts/base_courses.html.erb

@@ -240,11 +240,11 @@
       <% end %>
 
       <% hero_homework_scores = hero_homework_score(@course, "desc") %>
-      <% unless hero_homework_scores.map(&:score).detect{|s| s != nil}.nil? %>
+      <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
         <ul class="rankList">
           <h4>课程英雄榜</h4>
           <% hero_homework_scores.each do |student_score| %>
-              <% if student_score.score != 0 %>
+              <% if student_score.score.to_i != 0 %>
                   <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
                     <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
                     <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= student_score.score  %>"><%= student_score.score.to_i %></span></p>

db/schema.rb

@@ -970,7 +970,6 @@ ActiveRecord::Schema.define(:version => 20151130033906) do
     t.integer  "course_group_id",   :default => 0
   end
 
-  add_index "members", ["course_id"], :name => "index_members_on_course_id"
   add_index "members", ["project_id"], :name => "index_members_on_project_id"
   add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
   add_index "members", ["user_id"], :name => "index_members_on_user_id"

lib/tasks/delete_evalution.rake

@@ -2,12 +2,20 @@ namespace :delete_evalution do
   desc "delete evaluation"
   task :delete => :environment do
     homework = HomeworkCommon.where("id = 844").first
-    homework.homework_detail_manual.update_column('comment_status', 3)
+    homework_detail_manual = homework.homework_detail_manual
+    homework_detail_manual.update_column('comment_status', 3)
     student_work_score = StudentWorksScore.where("student_work_id = 28088 and user_id = 9263").first
     student_work_score.destroy
     student_work_9203 = StudentWork.where("id = 28088").first
     student_work_9263 = StudentWork.where("homework_common_id = 844 and user_id = 9263").first
     student_work_9203.update_column("student_score",91)
-    student_work_9263.update_column("absence_penalty",student_work_9263.absence_penalty+homework.homework_detail_manual.absence_penalty)
+    student_work_9203.update_column("final_score",91)
+    student_work_9263.update_column("absence_penalty",student_work_9263.absence_penalty+homework_detail_manual.absence_penalty)
+    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 * homework_detail_manual.absence_penalty : 0
+      student_work.save
+    end
   end
 end

lib/tasks/homework_evaluation.rake

@@ -52,7 +52,7 @@ namespace :homework_evaluation do
 
   #自动关闭匿评的任务
   task :end_evaluation => :environment do
-    homework_detail_manuals = HomeworkDetailManual.where("evaluation_end = '#{Date.today}'")
+    homework_detail_manuals = HomeworkDetailManual.where("evaluation_end <= '#{Date.today}'")
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评