From 8105df7623f050d5dd9fd7114de2f5280251aa15 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Thu, 12 Sep 2019 15:18:53 +0800
Subject: [PATCH] change answer_status

---
 app/helpers/exercises_helper.rb | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 1f421557e..98a580ecc 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -16,18 +16,26 @@ module ExercisesHelper
       end
 
       if q_type <= Exercise::JUDGMENT
-        if answers_content.present?   #学生有回答时
-          answer_choice_array = []
-          answers_content.each do |a|
-            answer_choice_array.push(a.exercise_choice.choice_position)  #学生答案的位置
-          end
-          user_answer_content = answer_choice_array.sort
-          standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
-          if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
-            ques_score = q.question_score
-          else
-            ques_score = 0.0
-          end
+        if answers_content.present?   #学生有回答时,分数已经全部存到exercise_answer 表，所以可以直接取第一个值
+          ques_score = answers_content.first.score
+          ques_score = ques_score < 0 ? 0.0 : ques_score
+          # answer_choice_array = []
+          # answers_content.each do |a|
+          #   answer_choice_array.push(a.exercise_choice.choice_position)  #学生答案的位置
+          # end
+          # user_answer_content = answer_choice_array.sort
+          # standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
+          # if q_type == Exercise::MULTIPLE && standard_answer.size == 1 # 老数据的问题
+          #   ques_score = answers_content.first.score
+          # else
+          #
+          # end
+
+          # if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
+          #   ques_score = q.question_score
+          # else
+          #   ques_score = 0.0
+          # end
         else
           ques_score = 0.0
         end
@@ -58,7 +66,6 @@ module ExercisesHelper
     exercise_sub_status.each do |s|
       sub_answer = s.exercise_answers.search_answer_users("user_id",user_id)  #主观题只有一个回答
       if sub_answer.present? && sub_answer.first.score >= 0.0
-
         if s.question_score <= sub_answer.first.score
           stand_status = 1
         else