From e7da0d9be83609256420292bd2822a03e8ad20dd Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Wed, 10 Jul 2019 17:39:59 +0800
Subject: [PATCH] fixbug

---
 app/controllers/exercises_controller.rb |  2 +-
 app/helpers/exercises_helper.rb         | 30 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 4be76fc59..6af48dbd1 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1130,7 +1130,7 @@ class ExercisesController < ApplicationController
         @is_teacher_or = @user_course_identity < Course::STUDENT ? 1 : 0
         @student_status = 2
         # @exercise_answerer = User.find_by(id:@exercise_current_user_id)  #试卷回答者
-        @exercise_questions = @exercise.exercise_questions.order("question_number ASC")
+        @exercise_questions = @exercise.exercise_questions.includes(:exercise_shixun_challenges,:exercise_standard_answers,:exercise_answers,:exercise_shixun_answers).order("question_number ASC")
         @question_status = []
         get_exercise_status = @exercise.get_exercise_status(current_user)
         if @ex_user.present? && @is_teacher_or == 0
diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 018bc2c39..314a90403 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -34,7 +34,6 @@ module ExercisesHelper
         ques_score = answers_content.select(:score).pluck(:score).sum
       end
 
-
       if ques_score >= q.question_score  #满分作答为正确
         ques_score = q.question_score
         stand_answer = 1
@@ -663,6 +662,7 @@ module ExercisesHelper
     user_score = nil
     shixun_type = 0
     question_comment = []
+    # user_score_pre = nil
     if ques_type == 5
       exercise_answers = q.exercise_shixun_answers.search_shixun_answers("user_id",ex_answerer_id)
     else
@@ -670,10 +670,26 @@ module ExercisesHelper
     end
     if student_status == 2   #当前为老师，或为学生且已提交
       user_score_pre = exercise_answers.score_reviewed
-      if ques_type == 4 && user_score_pre.blank?  #主观题时，且没有大于0的分数时，为空
-        user_score = nil
-      else
+      if ques_type == 4  #主观题时，且没有大于0的分数时，为空
+        user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : nil
+      elsif ques_type == 5 || ques_type == 3
         user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : 0.0
+      else
+        if exercise_answers.present?   #判断题和选择题时，
+          answer_choice_array = []
+          exercise_answers.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  #答案一致,多选或单选才给分，答案不对不给分
+            user_score = q.question_score
+          else
+            user_score = 0.0
+          end
+        else
+          user_score = 0.0
+        end
       end
     end
 
@@ -681,9 +697,9 @@ module ExercisesHelper
       user_score = q.question_score
     end
     if ques_type <= 2
-      answered_content = exercise_answers.pluck(:exercise_choice_id)
+      answered_content = exercise_answers&.pluck(:exercise_choice_id)
     elsif ques_type == 3
-      exercise_answers.each do |a|
+      exercise_answers&.each do |a|
         u_answer = {
             "choice_id":a.exercise_choice_id,
             "answer_text": a.answer_text
@@ -691,7 +707,7 @@ module ExercisesHelper
         answered_content.push(u_answer)
       end
     elsif ques_type == 4
-      answered_content = exercise_answers.pluck(:answer_text)
+      answered_content = exercise_answers&.pluck(:answer_text)
     end
     if ques_type == 5  #存在实训题，及已经做了实训题的
       if ex_status == 3 || is_teacher_or == 1  #如果试卷已截止，则可以看到分数，否则不能查看分数