Merge branch 'dev_hs' into dev_aliyun

app/controllers/exercise_questions_controller.rb

@@ -357,6 +357,36 @@ class ExerciseQuestionsController < ApplicationController
         #当试卷已发布时（试卷的总状态),当标准答案修改时，如有已提交的学生，需重新计算分数.
 
         if standard_answer_change && @exercise.exercise_status >= Exercise::PUBLISHED
+          # ex_users_committed = @exercise.exercise_users.exercise_user_committed
+          # if ex_users_committed.size > 0
+          #   ex_users_committed.each do |ex_user|
+          #     update_objective_score = update_single_score(@exercise_question,ex_user.user_id,standard_answer)
+          #     if update_objective_score != 0
+          #       objective_score = ex_user.objective_score
+          #       new_objective_score = objective_score + update_objective_score
+          #       total_score = ex_user.score + update_objective_score
+          #       total_score = total_score < 0.0 ? 0.0 : total_score
+          #       ex_user.update_attributes(objective_score:new_objective_score,score:total_score)
+          #     end
+          #   end
+          # end
+          normal_status(3,"修改了标准答案\n是否重新计算学生答题的成绩？")
+        else
+          normal_status(0,"试卷更新成功！")
+        end
+
+      rescue Exception => e
+        uid_logger_error(e.message)
+        tip_exception("页面调用失败！")
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+  def update_scores
+    ActiveRecord::Base.transaction do
+      begin
+        standard_answer = params[:standard_answers]
         ex_users_committed = @exercise.exercise_users.exercise_user_committed
         if ex_users_committed.size > 0
           ex_users_committed.each do |ex_user|
@@ -370,15 +400,10 @@ class ExerciseQuestionsController < ApplicationController
             end
           end
         end
-          normal_status(0,"试卷更新成功,因标准答案修改,需重新计算学生成绩!")
-        else
-          normal_status(0,"试卷更新成功！")
-        end
-
+        normal_status(0,"学生成绩更新成功")
       rescue Exception => e
         uid_logger_error(e.message)
-        tip_exception("页面调用失败！")
-        raise ActiveRecord::Rollback
+        tip_exception("答案删除失败！")
       end
     end
   end

app/helpers/exercises_helper.rb

@@ -461,6 +461,10 @@ module ExercisesHelper
           end
         elsif q.question_type == 5   #实训题时，主观题这里不评分
           q.exercise_shixun_challenges&.each do |exercise_cha|
+            user_shixun_score = exercise_cha&.exercise_shixun_answers&.where(user_id:user.id,exercise_question_id:q.id)
+            if user_shixun_score.present?
+              score5 += user_shixun_score&.first.score
+            else
               game = Game.user_games(user.id,exercise_cha.challenge_id)&.first  #当前用户的关卡
               if game.present?
                 exercise_cha_score = 0.0
@@ -503,6 +507,7 @@ module ExercisesHelper
               end
             end
           end
+        end
         user_scores = answers_content.blank? ? 0.0 : answers_content.score_reviewed.pluck(:score).sum
         if user_scores > 0.0
           stand_answer = 1

config/routes.rb

@@ -603,6 +603,7 @@ Rails.application.routes.draw do
         post :up_down
         post :delete_answer
         post :adjust_score
+        post :update_scores
       end
       resource :exercise_answers,only:[:create,:destroy]
     end

db/migrate/20190822022306_add_exercise_user_update.rb

@@ -1,10 +1,14 @@
 class AddExerciseUserUpdate < ActiveRecord::Migration[5.2]
-  include ExercisesHelper
-  def change
-    # exs = Exercise.all.is_exercise_published.where("publish_time > ?",(Time.now - 2.months)).includes(:exercise_questions,:exercise_users)
+
+  # include ExercisesHelper
+  # def change
+  #   #2019,8,22添加
+  #   two_months = Time.now - 2.months
+  #   exs = Exercise.all.is_exercise_published.where("publish_time > ?",two_months).includes(:exercise_questions,:exercise_users)
   #   exs.each do |ex|
-    #   ex_users = ex.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",(Time.now - 2.months))
-    #   if ex_users.present?
+  #     if ex.exercise_questions.where("created_at < ?",Time.now - 1.month).pluck(:question_type).include?(1)  #含有多选题,且是1个月前创建的才更新
+  #       ex_users = ex.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",two_months)
+  #       if ex_users.exists?
   #         ex_users.each do |ex_user|
   #           calculate_score = calculate_student_score(ex,ex_user.user)[:total_score]
   #           subjective_score = ex_user.subjective_score
@@ -15,5 +19,21 @@ class AddExerciseUserUpdate < ActiveRecord::Migration[5.2]
   #         end
   #       end
   #     end
-  end
+  #   end
+  #
+  #   #1936的试卷成绩有问题。
+  #   # #https://www.educoder.net/courses/2935/exercises/1936/users/pizfnr5ts
+  #   ex_special = Exercise.find_by_id(1936)
+  #   ex_special_users = ex_special.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",two_months)
+  #   if ex_special.present? && ex_special_users.exists?
+  #     ex_special_users.each do |ex_user|
+  #       calculate_score = calculate_student_score(ex_special,ex_user.user)[:total_score]
+  #       subjective_score = ex_user.subjective_score
+  #       total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+  #       total_score = calculate_score + total_score_subjective_score
+  #       ex_user.update_attributes(score:total_score,objective_score:calculate_score)
+  #       puts ex_user.id
+  #     end
+  #   end
+  # end
 end