Merge pull request #17 from rockstarr-programmerr/dev

Dev

Author: rockstarr-programmerr

classroom/business/all/student_report.py

@@ -91,21 +91,40 @@ def passage_report(self, questions, answers, passage):
 
         score = 0
         details = []
+        related_answers = []
+        related_remains = 0
+
         for question in questions:
             detail = self.new_detail()
             answer = self.get_answer(answers, question)
+            possible_answers = question.get_answers_content()
 
             detail['question_number'] = question.number
-            detail['possible_answers'] = question.get_answers_content()
+            detail['possible_answers'] = possible_answers
+
+            is_related = len(possible_answers) > 1
+            if not is_related:
+                related_answers = []
+            elif not related_remains:
+                related_remains = len(possible_answers)
+                related_answers = []
 
+            is_correct = False
             if answer:
-                is_correct = question.check_answer(answer.content)
+                is_correct = question.check_answer(answer.content, related_answers=related_answers)
                 if is_correct:
                     score += 1
 
                 detail['submitted_answer'] = answer.content
                 detail['is_correct'] = is_correct
 
+            if related_remains:
+                related_remains -= 1
+                if not related_remains:
+                    related_answers = []
+                elif answer and is_correct:
+                    related_answers.append(answer.content)
+
             details.append(detail)
 
         return score, details

classroom/models/abstracts/question.py

@@ -68,7 +68,7 @@ def get_choices_content(self):
     def generate_choices_from_list(cls, choices):
         return cls._DELEMITER.join(choices)
 
-    def check_answer(self, answer):
+    def check_answer(self, answer, related_answers=None):
         # NOTE: don't use .values_list('content', flat=True) here,
         # because it will not utilize .prefetch_related('answers'),
         # which lead to more DB queries
@@ -78,7 +78,10 @@ def check_answer(self, answer):
         if self.is_fill_blank():
             return self.check_fill_blank(answer, possible_answers)
         else:
-            return answer in possible_answers
+            if related_answers:
+                return answer in possible_answers and answer not in related_answers
+            else:
+                return answer in possible_answers
 
     @staticmethod
     def check_fill_blank(answer, possible_answers):