Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/helpers/exercises_helper.rb

@@ -86,7 +86,7 @@ module ExercisesHelper
   #试卷的统计结果页面计算各题的
   def exercise_commit_result(questions,user_ids)
     question_infos = []
-    percent = 0.0
+    # percent = 0.0
     questions.includes(:exercise_choices).each do |ex|
       ex_total_score = user_ids.count * ex&.question_score.to_f   #该试卷的已回答的总分
       # ex_answers = ex.exercise_answers
@@ -103,38 +103,42 @@ module ExercisesHelper
       end
 
       effictive_users_count = effictive_users.size #有效回答数，可能有重复的用户id，这里仅统计是否回答这个问题的全部人数
+      #
+      # if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
+      #   ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
+      #   percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
+      # end
 
-      if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
+      #全部题型按已提交学生的分数来计算
       ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
       percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
-      end
 
       question_answer_infos = []
       if ex.question_type <= Exercise::JUDGMENT  #选择题和判断题
         ex_choices = ex.exercise_choices
         standard_answer = ex.exercise_standard_answers.pluck(:exercise_choice_id).sort   #标准答案的位置
-        right_users_count = 0
+        # right_users_count = 0
         #该问题的正确率
-        if ex.question_type == Exercise::MULTIPLE  #多选题
-          right_user_ids = user_ids
-          standard_answer.each do |choice_position|
-            standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
-            right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
-          end
-          right_users_count = right_user_ids.size
-          # user_ids.each do |user_id|
-          #   ex_choice_ids = effictive_users.map{|e| e.exercise_choice_id if e.user_id == user_id}.reject(&:blank?).uniq
-          #   answer_choice_array = ex_choices.map{|a| a.choice_position if ex_choice_ids.include?(a.id)}.reject(&:blank?).uniq
-          #   if answer_choice_array.sort == standard_answer
-          #     right_users_count += 1
+        # if ex.question_type == Exercise::MULTIPLE  #多选题
+        #   right_user_ids = user_ids
+        #   standard_answer.each do |choice_position|
+        #     standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
+        #     right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
         #   end
+        #   right_users_count = right_user_ids.size
+        #   # user_ids.each do |user_id|
+        #   #   ex_choice_ids = effictive_users.map{|e| e.exercise_choice_id if e.user_id == user_id}.reject(&:blank?).uniq
+        #   #   answer_choice_array = ex_choices.map{|a| a.choice_position if ex_choice_ids.include?(a.id)}.reject(&:blank?).uniq
+        #   #   if answer_choice_array.sort == standard_answer
+        #   #     right_users_count += 1
+        #   #   end
+        #   # end
+        # else  #单选题和判断题
+        #   standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
+        #   right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
         # end
-        else  #单选题和判断题
-          standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
-          right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
-        end
 
-        percent = effictive_users_count > 0 ? (right_users_count / effictive_users_count.to_f).round(3)*100 : 0.0
+        # percent = effictive_users_count > 0 ? (right_users_count / effictive_users_count.to_f).round(3)*100 : 0.0
 
         #每个选项的正确率
         ex_choices.each do |c|
@@ -180,7 +184,7 @@ module ExercisesHelper
           all_user_count += user_count
           standard_answer_count += 1
         end
-        percent = effictive_users_count > 0 ? (all_user_count / effictive_users_count.to_f).round(3)*100 : 0.0
+        # percent = effictive_users_count > 0 ? (all_user_count / effictive_users_count.to_f).round(3)*100 : 0.0
         user_wrong_count = (effictive_users_count - all_user_count )
 
         if effictive_users_count > 0 && user_wrong_count >= 0