diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index c8b5a20b0..981d44ce7 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/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? %>
<%= student_score.score.to_i %>
diff --git a/db/schema.rb b/db/schema.rb index 3fcec8abe..c6ca6a0ce 100644 --- a/db/schema.rb +++ b/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" diff --git a/lib/tasks/delete_evalution.rake b/lib/tasks/delete_evalution.rake index 6d01123e0..94075ae00 100644 --- a/lib/tasks/delete_evalution.rake +++ b/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 \ No newline at end of file diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index 84082eb9b..6be2d6a04 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/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 #开启匿评状态才可关闭匿评