From e244cd285669d3de80a764d75eecbb46b6d3fd63 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 21 Mar 2018 12:00:27 +0530
Subject: Add condition to get quiz status if answerpaper is created

---
 yaksh/models.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'yaksh/models.py')

diff --git a/yaksh/models.py b/yaksh/models.py
index f065190..ea4efce 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -366,6 +366,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
+        )
+        if ans_ppr.exists():
+            status = "completed"
+        else:
+            status = "not attempted"
+        return status
+
     def __str__(self):
         desc = self.description or 'Quiz'
         return '%s: on %s for %d minutes' % (desc, self.start_date_time,
@@ -393,6 +407,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
-- 
cgit 


From bd2672ea701fb3f6270a3e7af41cc44568f7330b Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 10 Apr 2018 17:54:49 +0530
Subject: Get answerpaper status for quiz completion

---
 yaksh/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/models.py')

diff --git a/yaksh/models.py b/yaksh/models.py
index b13e19c..ecf7035 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -390,9 +390,9 @@ class Quiz(models.Model):
             qp = None
         ans_ppr = AnswerPaper.objects.filter(
             user=user, course=course, question_paper=qp
-        )
+        ).order_by("-attempt_number")
         if ans_ppr.exists():
-            status = "completed"
+            status = ans_ppr.first().status
         else:
             status = "not attempted"
         return status
-- 
cgit