starting on new field in Sitting model to store all user answers in a sitting. This...

diff --git a/quiz/models.py b/quiz/models.py
index 373bcac5e01ff8a3ac882af63d034fb4c0b7f03f..c7541a71f7245407e92ade77de28ab81f4310cfc 100644 (file)
--- a/quiz/models.py
+++ b/quiz/models.py
@@ -327,6 +327,8 @@ class Sitting(models.Model):
 
     complete = models.BooleanField(default=False, blank=False)
 
+    user_answers = models.TextField(blank=True)
+
     objects = SittingManager()
 
     class Meta:
@@ -411,6 +413,9 @@ class Sitting(models.Model):
         else:
             return self.quiz.fail_text
 
+    def add_user_answer(self, question, guess):
+        pass
+
 
 class Question(models.Model):
     """

diff --git a/quiz/templates/question.html b/quiz/templates/question.html
index 325c37d94f0cd4430f3d6b74e693bfa660a722f6..d4327f3db307b3bc6ffed3736fd8ea4101ffeeed 100644 (file)
--- a/quiz/templates/question.html
+++ b/quiz/templates/question.html
@@ -7,7 +7,7 @@
 
 {% block content %}
 
-{% if previous %}
+{% if previous.answers %}
 
   <p class="muted"><small>The previous question:</small></p>
   <p>{{ previous.previous_question }}</p>

diff --git a/quiz/tests.py b/quiz/tests.py
index e4f8a7dae1899e65046e457aaef39c5c6d29631c..9d883c1f8fcebb85048ace532bacd602875ee74b 100644 (file)
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -244,6 +244,16 @@ class TestSitting(TestCase):
         self.sitting.mark_quiz_complete()
         self.assertEqual(self.sitting.complete, True)
 
+    def test_user_answers(self):
+        self.answer1 = Answer.objects.create(id=123,
+                                             question=self.question1,
+                                             content='bing',
+                                             correct=False)
+        guess = '123'
+        self.sitting.add_user_answer(self.question1, guess)
+
+        self.assertIn('123', self.sitting.user_answers)
+
 
 '''
 Tests relating to views

diff --git a/quiz/views.py b/quiz/views.py
index e5fbb51cd6136d5ede61189025ae2e4e012801db..5ed13d4584211ebeef17245f2ad39f6cdac811e9 100644 (file)
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -1,7 +1,6 @@
 import random
 
 from django.contrib.auth.decorators import login_required, permission_required
-from django.contrib.auth.models import User
 from django.shortcuts import get_object_or_404, render, render_to_response
 from django.template import RequestContext
 from django.utils.decorators import method_decorator