summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprathamesh2014-06-27 12:03:18 +0530
committerprathamesh2014-06-27 12:03:18 +0530
commit3c82dd0faf2f1273cb590b360a9696a973b30720 (patch)
tree624b03be9921098aeffaea845b857cc357a66705
parentb61c62291424089478064af1fceb81c1ed4e5c54 (diff)
downloadonline_test-3c82dd0faf2f1273cb590b360a9696a973b30720.tar.gz
online_test-3c82dd0faf2f1273cb590b360a9696a973b30720.tar.bz2
online_test-3c82dd0faf2f1273cb590b360a9696a973b30720.zip
Made the minor change
-rw-r--r--testapp/exam/models.py14
-rw-r--r--testapp/exam/tests.py8
2 files changed, 11 insertions, 11 deletions
diff --git a/testapp/exam/models.py b/testapp/exam/models.py
index 62c707b..27d2987 100644
--- a/testapp/exam/models.py
+++ b/testapp/exam/models.py
@@ -248,8 +248,8 @@ class AnswerPaper(models.Model):
# Marks percent scored by the user
percent = models.FloatField(null=True, default=None)
- # Result of the quiz, pass if True.
- result = models.NullBooleanField()
+ # Result of the quiz, True if student passes the exam.
+ passed = models.NullBooleanField()
def current_question(self):
"""Returns the current active question to display."""
@@ -331,16 +331,16 @@ class AnswerPaper(models.Model):
percent = self.marks_obtained/self.question_paper.total_marks*100
self.percent = round(percent, 2)
- def update_result(self):
+ def update_passed(self):
"""
- Updates the result.
- It is either passed or failed, as per the quiz passing criteria
+ Checks whether student passed or failed, as per the quiz
+ passing criteria.
"""
if self.percent is not None:
if self.percent >= self.question_paper.quiz.pass_criteria:
- self.result = True
+ self.passed = True
else:
- self.result = False
+ self.passed = False
def get_question_answers(self):
"""
diff --git a/testapp/exam/tests.py b/testapp/exam/tests.py
index eb63ba4..d76e4f8 100644
--- a/testapp/exam/tests.py
+++ b/testapp/exam/tests.py
@@ -273,10 +273,10 @@ class AnswerPaperTestCases(unittest.TestCase):
self.answerpaper.update_percent()
self.assertEqual(self.answerpaper.percent, 33.33)
- def test_update_result(self):
- """ Test update_result() method of AnswerPaper"""
- self.answerpaper.update_result()
- self.assertFalse(self.answerpaper.result)
+ def test_update_passed(self):
+ """ Test update_passed method of AnswerPaper"""
+ self.answerpaper.update_passed()
+ self.assertFalse(self.answerpaper.passed)
def test_get_question_answer(self):
""" Test get_question_answer() method of Answer Paper"""