Minor changes in Monitor

Author: CruiseDevice

yaksh/models.py

@@ -2118,12 +2118,20 @@ def get_user_all_attempts(self, questionpaper, user, course_id):
     def get_user_data(self, user, questionpaper_id, course_id,
                       attempt_number=None):
         if attempt_number is not None:
-            papers = self.filter(user_id=user.id,
-                                 question_paper_id__in=questionpaper_id,
-                                 course_id=course_id,
-                                 attempt_number=attempt_number)
+            papers = self.select_related(
+                'course', 'question_paper__quiz'
+            ).prefetch_related(
+                'answers', 'questions'
+            ).filter(user_id=user.id,
+                     question_paper_id__in=questionpaper_id,
+                     course_id=course_id,
+                     attempt_number=attempt_number)
         else:
-            papers = self.filter(
+            papers = self.select_related(
+                'course', 'question_paper__quiz'
+            ).prefetch_related(
+                'answers', 'questions'
+            ).filter(
                 user=user, question_paper_id=questionpaper_id,
                 course_id=course_id
             ).order_by("-attempt_number")

yaksh/views.py

@@ -1971,7 +1971,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None,
                 answer_paper__question_paper_id__in=questionpaper_id,
                 answer_paper__user_id=user_id
                 ).exists()
-            user = User.objects.get(id=user_id)
+            user = User.objects.select_related('profile').get(id=user_id)
             data = AnswerPaper.objects.get_user_data(
                 user, questionpaper_id, course_id, attempt_number
             )