summaryrefslogtreecommitdiff
path: root/yaksh/models.py
diff options
context:
space:
mode:
authorprathamesh2017-09-05 19:42:04 +0530
committerprathamesh2017-09-05 19:42:04 +0530
commit09c00608a215df7a44782ab3f7c97cb912664bfd (patch)
tree9c267b989382bf81542650b28b0f3f179bb8b090 /yaksh/models.py
parent7aac7a18e4e393b7e267d3687be73a7fdfb7b400 (diff)
parente3a43662d2aae8688039671d3de532e48fbdfda9 (diff)
downloadonline_test-09c00608a215df7a44782ab3f7c97cb912664bfd.tar.gz
online_test-09c00608a215df7a44782ab3f7c97cb912664bfd.tar.bz2
online_test-09c00608a215df7a44782ab3f7c97cb912664bfd.zip
Merge branch 'master' of https://github.com/FOSSEE/online_test into improve-code-server
Conflicts Resolved: yaksh/views.py
Diffstat (limited to 'yaksh/models.py')
-rw-r--r--yaksh/models.py43
1 files changed, 28 insertions, 15 deletions
diff --git a/yaksh/models.py b/yaksh/models.py
index 3697c78..d9e07fd 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -855,21 +855,34 @@ class QuestionPaper(models.Model):
def make_answerpaper(self, user, ip, attempt_num):
"""Creates an answer paper for the user to attempt the quiz"""
- ans_paper = AnswerPaper(
- user=user,
- user_ip=ip,
- attempt_number=attempt_num
- )
- ans_paper.start_time = timezone.now()
- ans_paper.end_time = ans_paper.start_time + \
- timedelta(minutes=self.quiz.duration)
- ans_paper.question_paper = self
- ans_paper.save()
- questions = self._get_questions_for_answerpaper()
- for question in questions:
- ans_paper.questions.add(question)
- for question in questions:
- ans_paper.questions_unanswered.add(question)
+ try:
+ ans_paper = AnswerPaper.objects.get(user=user,
+ attempt_number=attempt_num,
+ question_paper=self
+ )
+ except AnswerPaper.DoesNotExist:
+ ans_paper = AnswerPaper(
+ user=user,
+ user_ip=ip,
+ attempt_number=attempt_num
+ )
+ ans_paper.start_time = timezone.now()
+ ans_paper.end_time = ans_paper.start_time + \
+ timedelta(minutes=self.quiz.duration)
+ ans_paper.question_paper = self
+ ans_paper.save()
+ questions = self._get_questions_for_answerpaper()
+ for question in questions:
+ ans_paper.questions.add(question)
+ for question in questions:
+ ans_paper.questions_unanswered.add(question)
+ except AnswerPaper.MultipleObjectsReturned:
+ ans_paper = AnswerPaper.objects.get(user=user,
+ attempt_number=attempt_num,
+ question_paper=self
+ ).order_by('-id')
+ ans_paper = ans_paper[0]
+
return ans_paper
def _is_questionpaper_passed(self, user):