Merge pull request #461 from adityacp/fix_quiz_completion

Quiz Completion Status

2 files changed, 24 insertions, 3 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index 3010a3c..1ca293b 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -387,6 +387,20 @@ class Quiz(models.Model):
                 course=course, passed=False
             ).values_list("user", flat=True).distinct().count()
 
+    def get_answerpaper_status(self, user, course):
+        try:
+            qp = self.questionpaper_set.get().id
+        except QuestionPaper.DoesNotExist:
+            qp = None
+        ans_ppr = AnswerPaper.objects.filter(
+            user=user, course=course, question_paper=qp
+        ).order_by("-attempt_number")
+        if ans_ppr.exists():
+            status = ans_ppr.first().status
+        else:
+            status = "not attempted"
+        return status
+
     def _create_quiz_copy(self, user):
         question_papers = self.questionpaper_set.all()
         new_quiz = self
@@ -425,6 +439,8 @@ class LearningUnit(models.Model):
         if course_status.exists():
             if self in course_status.first().completed_units.all():
                 state = "completed"
+            elif self.type == "quiz":
+                state = self.quiz.get_answerpaper_status(user, course)
             elif course_status.first().current_unit == self:
                 state = "inprogress"
         return state
diff --git a/yaksh/test_models.py b/yaksh/test_models.py
index 3bf8a00..bcd0434 100644
--- a/yaksh/test_models.py
+++ b/yaksh/test_models.py
@@ -210,10 +210,11 @@ class LearningModuleTestCases(unittest.TestCase):
         # Given
         module_status = 'not attempted'
         # When
+        self.learning_module.learning_unit.remove(self.learning_unit_two)
         status = self.learning_module.get_status(self.student, self.course)
         # Then
         self.assertEqual(status, module_status)
-
+        self.learning_module.learning_unit.add(self.learning_unit_two)
         # Module in progress
 
         # Given
@@ -723,6 +724,9 @@ class QuestionPaperTestCases(unittest.TestCase):
         self.trial_course = Course.objects.create_trial_course(self.user)
         self.trial_quiz = Quiz.objects.create_trial_quiz(self.user)
 
+    @classmethod
+    def tearDownClass(self):
+        self.quiz.questionpaper_set.all().delete()
 
     def test_get_question_bank(self):
         # Given
@@ -1053,9 +1057,10 @@ class AnswerPaperTestCases(unittest.TestCase):
         self.server_pool = server_pool
         self.server_thread = t = Thread(target=server_pool.run)
         t.start()
-    
+
     @classmethod
     def tearDownClass(self):
+        self.quiz.questionpaper_set.all().delete()
         self.server_pool.stop()
         self.server_thread.join()
         settings.code_evaluators['python']['standardtestcase'] = \
@@ -1726,7 +1731,7 @@ class CourseTestCases(unittest.TestCase):
             name="test_course", creator=self.creator, enrollment="open")
         percent = self.course.percent_completed(self.student1)
         self.assertEqual(percent, 0)
-
+        self.quiz1.questionpaper_set.all().delete()
         # for course with module but zero percent completed
         percent = self.course.percent_completed(self.student1)
         self.assertEqual(percent, 0)